Support inferred TS/JS project per root

Fixes #30414
microsoft · Aug 23, 2017 · 949b9f1 · 949b9f1
1 parent 8d9778b
commit 949b9f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts
@@ -331,7 +331,12 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 
 				const args: string[] = [];
 				if (this.apiVersion.has206Features()) {
-					args.push('--useSingleInferredProject');
+					if (this.apiVersion.has250Features()) {
+						args.push('--useInferredProjectPerProjectRoot');
+					} else {
+						args.push('--useSingleInferredProject');
+					}
+
 					if (this.configuration.disableAutomaticTypeAcquisition) {
 						args.push('--disableAutomaticTypingAcquisition');
 					}
@@ -614,7 +619,7 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
 
 		if (resource.scheme === 'file' || resource.scheme === 'untitled') {
 			for (const root of roots.sort((a, b) => a.uri.fsPath.length - b.uri.fsPath.length)) {
-				if (resource.fsPath.startsWith(root.uri.fsPath)) {
+				if (resource.fsPath.startsWith(root.uri.fsPath + path.sep)) {
 					return root.uri.fsPath;
 				}
 			}

diff --git a/extensions/typescript/src/utils/api.ts b/extensions/typescript/src/utils/api.ts
@@ -65,4 +65,8 @@ export default class API {
 	public has240Features(): boolean {
 		return semver.gte(this.version, '2.4.0');
 	}
+
+	public has250Features(): boolean {
+		return semver.gte(this.version, '2.5.0');
+	}
 }