Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-23 03:39:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use regular expression to identify config file names instead of singe file name

Browse Source
This commit is contained in:
Matt Bierner
2019-03-05 17:19:01 -08:00
parent 6da595150d
commit c93f5e3560
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/typescript-language-features/src/languageProvider.ts
View File

@@ -90,7 +90,7 @@ export default class LanguageProvider extends Disposable {
} }
const base = basename(resource.fsPath); 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 { private get id(): string {

6
extensions/typescript-language-features/src/utils/languageDescription.ts
View File

@@ -17,7 +17,7 @@ export interface LanguageDescription {
readonly diagnosticSource: string; readonly diagnosticSource: string;
readonly diagnosticLanguage: DiagnosticLanguage; readonly diagnosticLanguage: DiagnosticLanguage;
readonly modeIds: string[]; readonly modeIds: string[];
readonly configFile?: string; readonly configFilePattern?: RegExp;
readonly isExternal?: boolean; readonly isExternal?: boolean;
} }
@@ -28,13 +28,13 @@ export const standardLanguageDescriptions: LanguageDescription[] = [
diagnosticSource: 'ts', diagnosticSource: 'ts',
diagnosticLanguage: DiagnosticLanguage.TypeScript, diagnosticLanguage: DiagnosticLanguage.TypeScript,
modeIds: [languageModeIds.typescript, languageModeIds.typescriptreact], modeIds: [languageModeIds.typescript, languageModeIds.typescriptreact],
configFile: 'tsconfig.json' configFilePattern: /tsconfig(\..*)?\.json/gi
}, { }, {
id: 'javascript', id: 'javascript',
diagnosticOwner: 'typescript', diagnosticOwner: 'typescript',
diagnosticSource: 'ts', diagnosticSource: 'ts',
diagnosticLanguage: DiagnosticLanguage.JavaScript, diagnosticLanguage: DiagnosticLanguage.JavaScript,
modeIds: [languageModeIds.javascript, languageModeIds.javascriptreact], modeIds: [languageModeIds.javascript, languageModeIds.javascriptreact],
configFile: 'jsconfig.json' configFilePattern: /jsconfig(\..*)?\.json/gi
} }
]; ];