From c93f5e35601345b0696ba07174a388658cf9e13c Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 5 Mar 2019 17:19:01 -0800
Subject: [PATCH] Use regular expression to identify config file names instead
 of singe file name

---
 .../typescript-language-features/src/languageProvider.ts    | 2 +-
 .../src/utils/languageDescription.ts                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts
index 6f122fcb633..84dbb8e946d 100644
--- a/extensions/typescript-language-features/src/languageProvider.ts
+++ b/extensions/typescript-language-features/src/languageProvider.ts
@@ -90,7 +90,7 @@ export default class LanguageProvider extends Disposable {
 		}
 
 		const base = basename(resource.fsPath);
-		return !!base && base === this.description.configFile;
+		return !!base && (!!this.description.configFilePattern && this.description.configFilePattern.test(base));
 	}
 
 	private get id(): string {
diff --git a/extensions/typescript-language-features/src/utils/languageDescription.ts b/extensions/typescript-language-features/src/utils/languageDescription.ts
index 32cec300ebd..377c7c3b8e8 100644
--- a/extensions/typescript-language-features/src/utils/languageDescription.ts
+++ b/extensions/typescript-language-features/src/utils/languageDescription.ts
@@ -17,7 +17,7 @@ export interface LanguageDescription {
 	readonly diagnosticSource: string;
 	readonly diagnosticLanguage: DiagnosticLanguage;
 	readonly modeIds: string[];
-	readonly configFile?: string;
+	readonly configFilePattern?: RegExp;
 	readonly isExternal?: boolean;
 }
 
@@ -28,13 +28,13 @@ export const standardLanguageDescriptions: LanguageDescription[] = [
 		diagnosticSource: 'ts',
 		diagnosticLanguage: DiagnosticLanguage.TypeScript,
 		modeIds: [languageModeIds.typescript, languageModeIds.typescriptreact],
-		configFile: 'tsconfig.json'
+		configFilePattern: /tsconfig(\..*)?\.json/gi
 	}, {
 		id: 'javascript',
 		diagnosticOwner: 'typescript',
 		diagnosticSource: 'ts',
 		diagnosticLanguage: DiagnosticLanguage.JavaScript,
 		modeIds: [languageModeIds.javascript, languageModeIds.javascriptreact],
-		configFile: 'jsconfig.json'
+		configFilePattern: /jsconfig(\..*)?\.json/gi
 	}
 ];