Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-23 19:59:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use explicit empty authority for JS/TS resources (#149125)

Browse Source 
Fixes #149123

10c8c1c2cc made sure we sync over the authority of in-memory resources over to TS Server. However if a resource does not have an authority, this resulted in a url with `scheme//path` instead of `scheme/authority/path`

TS would then normalize the uri to `scheme/path`, resulting in us considering this a new resource

This fix adds an explicit empty authority that we use in this case instead
This commit is contained in:
Matt Bierner
2022-05-09 15:52:52 -07:00
committed by GitHub
parent d850919250
commit 3ba66bf24f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/typescript-language-features/src/typescriptServiceClient.ts
View File

@@ -95,6 +95,7 @@ namespace ServerState {
export default class TypeScriptServiceClient extends Disposable implements ITypeScriptServiceClient {
private readonly pathSeparator: string;
private readonly emptyAuthority = 'ts-nul-authority';
private readonly inMemoryResourcePrefix = '^';
private readonly workspaceState: vscode.Memento;
@@ -676,7 +677,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
{
return this.inMemoryResourcePrefix
+ '/' + resource.scheme
+ '/' + resource.authority
+ '/' + (resource.authority || this.emptyAuthority)
+ (resource.path.startsWith('/') ? resource.path : '/' + resource.path)
+ (resource.fragment ? '#' + resource.fragment : '');
}
@@ -724,9 +725,9 @@ export default class TypeScriptServiceClient extends Disposable implements IType
}
if (filepath.startsWith(this.inMemoryResourcePrefix)) {
const parts = filepath.match(/^\^\/([^\/]+)\/(.+)$/);
const parts = filepath.match(/^\^\/([^\/]+)\/([^\/]*)\/(.+)$/);
if (parts) {
const resource = vscode.Uri.parse(parts[1] + '://' + parts[2]);
const resource = vscode.Uri.parse(parts[1] + '://' + (parts[2] === this.emptyAuthority ? '' : parts[2]) + '/' + parts[3]);
return this.bufferSyncSupport.toVsCodeResource(resource);
}
}