From 9e4f0afdabeadec7cc38127f358e5ddf1be9d266 Mon Sep 17 00:00:00 2001 From: Tom van Ommeren Date: Mon, 16 Oct 2017 08:18:11 +0200 Subject: [PATCH 1/2] fix: Use uri2path to get windows path out of TS's normalized path --- src/typescript-service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/typescript-service.ts b/src/typescript-service.ts index 2be507a9e..fb5b413be 100644 --- a/src/typescript-service.ts +++ b/src/typescript-service.ts @@ -1242,7 +1242,9 @@ export class TypeScriptService { return this.projectManager.ensureOwnFiles(span) .concat(Observable.defer(() => { - const configuration = this.projectManager.getConfiguration(fileTextChanges[0].fileName) + // Configuration lookup uses Windows paths, FileTextChanges uses unix paths. Convert to backslashes. + const firstChangedFile = uri2path(path2uri(fileTextChanges[0].fileName)) + const configuration = this.projectManager.getConfiguration(firstChangedFile) configuration.ensureBasicFiles(span) const changes: {[uri: string]: TextEdit[]} = {} From 967f9bdfbdaa9f0de9367fcee16b2b17828d01a8 Mon Sep 17 00:00:00 2001 From: Tom van Ommeren Date: Wed, 25 Oct 2017 00:08:39 +0200 Subject: [PATCH 2/2] fix: don't abuse uri functions to get windows path --- src/typescript-service.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/typescript-service.ts b/src/typescript-service.ts index d757cc5cf..4f99419a4 100644 --- a/src/typescript-service.ts +++ b/src/typescript-service.ts @@ -1246,7 +1246,11 @@ export class TypeScriptService { return this.projectManager.ensureOwnFiles(span) .concat(Observable.defer(() => { // Configuration lookup uses Windows paths, FileTextChanges uses unix paths. Convert to backslashes. - const firstChangedFile = uri2path(path2uri(fileTextChanges[0].fileName)) + const unixFilePath = fileTextChanges[0].fileName + const firstChangedFile = /^[a-z]:\//i.test(unixFilePath) ? + unixFilePath.replace(/\//g, '\\') : + unixFilePath + const configuration = this.projectManager.getConfiguration(firstChangedFile) configuration.ensureBasicFiles(span)