SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 11:35:40 +01:00
Code Issues Projects Releases Packages Activity

Fixed creating the LanguageServiceDefaultsImpl twice

Browse source
This commit is contained in:
placatus 2019-02-22 17:29:43 +02:00
parent 357f54c652
commit 292108c5ee
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/monaco.contribution.ts
View file

@ -196,8 +196,21 @@ function setupLanguageServiceDefaults(languageId, isTypescript) {
languageDefaults[languageId] = new LanguageServiceDefaultsImpl(languageId, languageOptions.compilerOptions, languageOptions.diagnosticsOptions);
}
setupLanguageServiceDefaults("typescript", true);
setupLanguageServiceDefaults("javascript", false);
setupNamedLanguage({
id: 'typescript',
extensions: ['.ts', '.tsx'],
aliases: ['TypeScript', 'ts', 'typescript'],
mimetypes: ['text/typescript']
}, true, true);
setupNamedLanguage({
id: 'javascript',
extensions: ['.js', '.es6', '.jsx'],
firstLine: '^#!.*\\bnode',
filenames: ['jakefile'],
aliases: ['JavaScript', 'javascript', 'js'],
mimetypes: ['text/javascript'],
}, false, true);
function getTypeScriptWorker(): Promise<any> {
return getLanguageWorker("typescript");
@ -255,19 +268,3 @@ monaco.languages.typescript = createAPI();
function getMode(): Promise<typeof mode> {
return import('./tsMode');
}
setupNamedLanguage({
id: 'typescript',
extensions: ['.ts', '.tsx'],
aliases: ['TypeScript', 'ts', 'typescript'],
mimetypes: ['text/typescript']
}, true);
setupNamedLanguage({
id: 'javascript',
extensions: ['.js', '.es6', '.jsx'],
firstLine: '^#!.*\\bnode',
filenames: ['jakefile'],
aliases: ['JavaScript', 'javascript', 'js'],
mimetypes: ['text/javascript'],
}, false);