From 36e7f1871ad229146aeb48c00b742a74e9a8b565 Mon Sep 17 00:00:00 2001
From: Khaja Nizamuddin <khajanizamuddin@hotmail.com>
Date: Tue, 21 May 2019 16:31:54 +0530
Subject: [PATCH] Normalize tsconfig path (#73001)

Fixes #68812
---
 .../typescript-language-features/src/features/task.ts       | 6 ++++--
 .../src/utils/tsconfigProvider.ts                           | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extensions/typescript-language-features/src/features/task.ts b/extensions/typescript-language-features/src/features/task.ts
index 1b1d4d3bded..8c393ade672 100644
--- a/extensions/typescript-language-features/src/features/task.ts
+++ b/extensions/typescript-language-features/src/features/task.ts
@@ -96,6 +96,7 @@ class TscTaskProvider implements vscode.TaskProvider {
 				const uri = editor.document.uri;
 				return [{
 					path: uri.fsPath,
+					posixPath: uri.path,
 					workspaceFolder: vscode.workspace.getWorkspaceFolder(uri)
 				}];
 			}
@@ -121,6 +122,7 @@ class TscTaskProvider implements vscode.TaskProvider {
 			const folder = vscode.workspace.getWorkspaceFolder(uri);
 			return [{
 				path: normalizedConfigPath,
+				posixPath: uri.path,
 				workspaceFolder: folder
 			}];
 		}
@@ -232,9 +234,9 @@ class TscTaskProvider implements vscode.TaskProvider {
 
 	private getLabelForTasks(project: TSConfig): string {
 		if (project.workspaceFolder) {
-			return path.relative(project.workspaceFolder.uri.fsPath, project.path);
+			return path.posix.relative(project.workspaceFolder.uri.path, project.posixPath);
 		}
-		return project.path;
+		return project.posixPath;
 	}
 
 	private onConfigurationChanged(): void {
diff --git a/extensions/typescript-language-features/src/utils/tsconfigProvider.ts b/extensions/typescript-language-features/src/utils/tsconfigProvider.ts
index 7e2b85ef2d0..fe939032029 100644
--- a/extensions/typescript-language-features/src/utils/tsconfigProvider.ts
+++ b/extensions/typescript-language-features/src/utils/tsconfigProvider.ts
@@ -6,6 +6,7 @@ import * as vscode from 'vscode';
 
 export interface TSConfig {
 	readonly path: string;
+	readonly posixPath: string;
 	readonly workspaceFolder?: vscode.WorkspaceFolder;
 }
 
@@ -20,6 +21,7 @@ export default class TsConfigProvider {
 			if (root) {
 				configs.set(config.fsPath, {
 					path: config.fsPath,
+					posixPath: config.path,
 					workspaceFolder: root
 				});
 			}
-- 
GitLab