fix(language-server): add support of URI fragments in UriConverter (#276)

Igorbek · web-flow · commit 327a1a17f3f1 · 2025-07-09T17:42:34.000+08:00
diff --git a/.github/workflows/auto-fix.yml b/.github/workflows/auto-fix.yml
@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: pnpm
 
       - run: pnpm install
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18]
+        node-version: [22]
         os: [macos-latest, windows-latest, ubuntu-latest]
 
     steps:
diff --git a/packages/language-server/lib/project/typescriptProject.ts b/packages/language-server/lib/project/typescriptProject.ts
@@ -274,6 +274,7 @@ export function createTypeScriptProject(
 export function createUriConverter(rootFolders: URI[]) {
 	const encodeds = new Map<string, URI>();
 	const isFileScheme = rootFolders.every(folder => folder.scheme === 'file');
+	const fragmentPrefix = '/' + encodeURIComponent('#');
 
 	return {
 		asFileName,
@@ -291,7 +292,8 @@ export function createUriConverter(rootFolders: URI[]) {
 		}
 		const encoded = encodeURIComponent(`${parsed.scheme}://${parsed.authority}`);
 		encodeds.set(encoded, parsed);
-		return `/${encoded}${parsed.path}`;
+		const fragment = parsed.fragment ? fragmentPrefix + encodeURIComponent(parsed.fragment) : '';
+		return `/${encoded}${parsed.path}${fragment}`;
 	}
 
 	function asUri(fileName: string) {
@@ -308,7 +310,7 @@ export function createUriConverter(rootFolders: URI[]) {
 					return URI.from({
 						scheme: uri.scheme,
 						authority: uri.authority,
-						path: fileName.substring(prefix.length),
+						...getComponents(fileName, prefix.length),
 					});
 				}
 			}
@@ -317,7 +319,7 @@ export function createUriConverter(rootFolders: URI[]) {
 					return URI.from({
 						scheme: uri.scheme,
 						authority: uri.authority,
-						path: fileName.substring(prefix.length),
+						...getComponents(fileName, prefix.length),
 					});
 				}
 			}
@@ -329,6 +331,22 @@ export function createUriConverter(rootFolders: URI[]) {
 		}
 		return URI.file(fileName);
 	}
+
+	function getComponents(fileName: string, prefixLength: number) {
+		// Fragment is present when the fileName contains the fragment prefix and is not followed by a slash.
+		const fragmentPosition = fileName.lastIndexOf(fragmentPrefix);
+		if (fragmentPosition >= prefixLength) {
+			if (fileName.indexOf('/', fragmentPosition + fragmentPrefix.length) < 0) {
+				return {
+					path: fileName.substring(prefixLength, fragmentPosition),
+					fragment: decodeURIComponent(fileName.substring(fragmentPosition + fragmentPrefix.length)),
+				};
+			}
+		}
+		return {
+			path: fileName.substring(prefixLength),
+		};
+	}
 }
 
 export function sortTSConfigs(file: string, a: string, b: string) {
diff --git a/packages/language-server/tests/uri.spec.ts b/packages/language-server/tests/uri.spec.ts
@@ -12,6 +12,9 @@ describe('URI', () => {
 			'file:///c:/a/b/c',
 			'file:///C:/a/b/c',
 			'untitled:Untitled-1',
+			'vscode-notebook-cell:///a/b/c.one.ts',
+			'vscode-notebook-cell:///a/b/c.one.ts#xdf4Gt6/a',
+			'vscode-notebook-cell:///a/b/c.one.ts##a/%/v',
 		];
 
 		for (const uri of cases) {
@@ -26,6 +29,7 @@ describe('URI', () => {
 
 		expect(uriConverter.asFileName(URI.parse('http://a/b'))).toBe('/b');
 		expect(uriConverter.asFileName(URI.parse('https://a/b'))).toBe('/https%3A%2F%2Fa/b');
+		expect(uriConverter.asFileName(URI.parse('https://a/b/##a/%/v'))).toBe('/https%3A%2F%2Fa/b//%23%23a%2F%25%2Fv');
 
 		expect(uriConverter.asUri('/b').toString()).toBe('http://a/b');
 		expect(uriConverter.asUri('/c').toString()).toBe('http://a/c');
