Fix handling of non-file URIs (#1167)

Author: jakebailey

internal/ls/converters.go

@@ -81,34 +81,30 @@ func LanguageKindToScriptKind(languageID lsproto.LanguageKind) core.ScriptKind {
 }
 
 func DocumentURIToFileName(uri lsproto.DocumentUri) string {
-	parsed := core.Must(url.Parse(string(uri)))
-	if parsed.Scheme == "file" {
+	if strings.HasPrefix(string(uri), "file://") {
+		parsed := core.Must(url.Parse(string(uri)))
 		if parsed.Host != "" {
 			return "//" + parsed.Host + parsed.Path
 		}
 		return fixWindowsURIPath(parsed.Path)
 	}
 
-	authority := parsed.Host
-	if authority == "" {
-		authority = "ts-nul-authority"
-	}
-	path := parsed.Path
-	if path == "" {
-		path = parsed.Opaque
-	}
-	if !strings.HasPrefix(path, "/") {
-		path = "/" + path
-	}
-	path = fixWindowsURIPath(path)
-	if !strings.HasPrefix(path, "/") {
-		path = "/" + path
+	// Leave all other URIs escaped so we can round-trip them.
+
+	scheme, path, ok := strings.Cut(string(uri), ":")
+	if !ok {
+		panic(fmt.Sprintf("invalid URI: %s", uri))
 	}
-	fragment := parsed.Fragment
-	if fragment != "" {
-		fragment = "#" + fragment
+
+	authority := "ts-nul-authority"
+	if rest, ok := strings.CutPrefix(path, "//"); ok {
+		authority, path, ok = strings.Cut(rest, "/")
+		if !ok {
+			panic(fmt.Sprintf("invalid URI: %s", uri))
+		}
 	}
-	return fmt.Sprintf("^/%s/%s%s%s", parsed.Scheme, authority, path, fragment)
+
+	return "^/" + scheme + "/" + authority + "/" + path
 }
 
 func fixWindowsURIPath(path string) string {
@@ -154,7 +150,18 @@ var extraEscapeReplacer = strings.NewReplacer(
 
 func FileNameToDocumentURI(fileName string) lsproto.DocumentUri {
 	if strings.HasPrefix(fileName, "^/") {
-		return lsproto.DocumentUri(strings.Replace(fileName[2:], "/ts-nul-authority/", ":", 1))
+		scheme, rest, ok := strings.Cut(fileName[2:], "/")
+		if !ok {
+			panic("invalid file name: " + fileName)
+		}
+		authority, path, ok := strings.Cut(rest, "/")
+		if !ok {
+			panic("invalid file name: " + fileName)
+		}
+		if authority == "ts-nul-authority" {
+			return lsproto.DocumentUri(scheme + ":" + path)
+		}
+		return lsproto.DocumentUri(scheme + "://" + authority + "/" + path)
 	}
 
 	volume, fileName, _ := splitVolumePath(fileName)

internal/ls/converters_test.go

@@ -34,7 +34,8 @@ func TestDocumentURIToFileName(t *testing.T) {
 		{"untitled:Untitled-1", "^/untitled/ts-nul-authority/Untitled-1"},
 		{"untitled:Untitled-1#fragment", "^/untitled/ts-nul-authority/Untitled-1#fragment"},
 		{"untitled:c:/Users/jrieken/Code/abc.txt", "^/untitled/ts-nul-authority/c:/Users/jrieken/Code/abc.txt"},
-		{"untitled:C:/Users/jrieken/Code/abc.txt", "^/untitled/ts-nul-authority/c:/Users/jrieken/Code/abc.txt"},
+		{"untitled:C:/Users/jrieken/Code/abc.txt", "^/untitled/ts-nul-authority/C:/Users/jrieken/Code/abc.txt"},
+		{"untitled://wsl%2Bubuntu/home/jabaile/work/TypeScript-go/newfile.ts", "^/untitled/wsl%2Bubuntu/home/jabaile/work/TypeScript-go/newfile.ts"},
 	}
 
 	for _, test := range tests {
@@ -70,6 +71,7 @@ func TestFileNameToDocumentURI(t *testing.T) {
 
 		{"^/untitled/ts-nul-authority/Untitled-1", "untitled:Untitled-1"},
 		{"^/untitled/ts-nul-authority/c:/Users/jrieken/Code/abc.txt", "untitled:c:/Users/jrieken/Code/abc.txt"},
+		{"^/untitled/ts-nul-authority///wsl%2Bubuntu/home/jabaile/work/TypeScript-go/newfile.ts", "untitled://wsl%2Bubuntu/home/jabaile/work/TypeScript-go/newfile.ts"},
 	}
 
 	for _, test := range tests {