From 292108c5ee680df61aa87a79319caf4713aa6e36 Mon Sep 17 00:00:00 2001
From: placatus <placatus@ptc.com>
Date: Fri, 22 Feb 2019 17:29:43 +0200
Subject: [PATCH] Fixed creating the LanguageServiceDefaultsImpl twice

---
 src/monaco.contribution.ts | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/monaco.contribution.ts b/src/monaco.contribution.ts
index 67318e89..ee5972d2 100644
--- a/src/monaco.contribution.ts
+++ b/src/monaco.contribution.ts
@@ -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);
\ No newline at end of file