fix parse windows driver and wsl path

95833 · 95833 · commit 1a37796fbb62 · 2024-12-08T01:19:59.000+08:00
diff --git a/clang-tools-extra/clangd/PathMapping.cpp b/clang-tools-extra/clangd/PathMapping.cpp
@@ -150,11 +150,11 @@ llvm::Expected<std::string> parsePath(llvm::StringRef Path) {
   if (path::is_absolute(Path, path::Style::posix)) {
     return std::string(Path);
   }
-  if (path::is_absolute(Path, path::Style::windows)) {
-    std::string Converted = path::convert_to_slash(Path, path::Style::windows);
-    if (Converted.front() != '/')
-      Converted = "/" + Converted;
-    return Converted;
+  llvm::StringRef Root = path::root_name(Path, path::Style::windows);
+  if (!Root.empty()) {
+    std::string Converted = "/";
+    return Converted.append(Root)
+          .append(path::convert_to_slash(Path.substr(Root.size()), path::Style::windows));
   }
   return error("Path not absolute: {0}", Path);
 }

Original file line number	Diff line number	Diff line change
`@@ -150,11 +150,11 @@ llvm::Expected<std::string> parsePath(llvm::StringRef Path) {`
`150`	`150`	`if (path::is_absolute(Path, path::Style::posix)) {`
`151`	`151`	`return std::string(Path);`
`152`	`152`	`}`
`153`		`- if (path::is_absolute(Path, path::Style::windows)) {`
`154`		`- std::string Converted = path::convert_to_slash(Path, path::Style::windows);`
`155`		`- if (Converted.front() != '/')`
`156`		`- Converted = "/" + Converted;`
`157`		`- return Converted;`
	`153`	`+ llvm::StringRef Root = path::root_name(Path, path::Style::windows);`
	`154`	`+ if (!Root.empty()) {`
	`155`	`+ std::string Converted = "/";`
	`156`	`+ return Converted.append(Root)`
	`157`	`+ .append(path::convert_to_slash(Path.substr(Root.size()), path::Style::windows));`
`158`	`158`	`}`
`159`	`159`	`return error("Path not absolute: {0}", Path);`
`160`	`160`	`}`