From 675844ac7e5c505603d20f8391051e7eee322565 Mon Sep 17 00:00:00 2001 From: bsorrentino Date: Mon, 4 Apr 2022 18:26:12 +0200 Subject: [PATCH] fix issue #2295 component: TypeScriptWorker (tsWorker.ts) - Enable 'skipEncoding' flag on Uri.toString invokation on getScriptFileNames() method - Compare 'fileName' argument provided to _getModel() method both with Uri encoded and not --- src/language/typescript/tsWorker.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/language/typescript/tsWorker.ts b/src/language/typescript/tsWorker.ts index b7465c8afe..79ab04fdfc 100644 --- a/src/language/typescript/tsWorker.ts +++ b/src/language/typescript/tsWorker.ts @@ -63,14 +63,15 @@ export class TypeScriptWorker implements ts.LanguageServiceHost, ITypeScriptWork getScriptFileNames(): string[] { const allModels = this._ctx.getMirrorModels().map((model) => model.uri); - const models = allModels.filter((uri) => !fileNameIsLib(uri)).map((uri) => uri.toString()); + const models = allModels.filter((uri) => !fileNameIsLib(uri)).map((uri) => uri.toString(true)); return models.concat(Object.keys(this._extraLibs)); } private _getModel(fileName: string): worker.IMirrorModel | null { let models = this._ctx.getMirrorModels(); for (let i = 0; i < models.length; i++) { - if (models[i].uri.toString() === fileName) { + const uri = models[i].uri; + if (uri.toString() === fileName || uri.toString(true) === fileName) { return models[i]; } }