Browse Source

Use consistent casing, rerun import on top of master

Alex Dima 5 years ago
parent
commit
18f80838f6

+ 4 - 3
scripts/importTypescript.js

@@ -21,9 +21,10 @@ const TYPESCRIPT_LIB_DESTINATION = path.join(__dirname, '../src/lib');
 	const npmLsOutput = JSON.parse(child_process.execSync("npm ls typescript --depth=0 --json=true").toString());
 	const typeScriptDependencyVersion = npmLsOutput.dependencies.typescript.version;
 
-	fs.writeFileSync(path.join(TYPESCRIPT_LIB_DESTINATION, 'typescriptServicesMetadata.ts'),
-	`export const typeScriptVersion = "${typeScriptDependencyVersion}";
-`);
+	fs.writeFileSync(
+		path.join(TYPESCRIPT_LIB_DESTINATION, 'typescriptServicesMetadata.ts'),
+		`export const typescriptVersion = "${typeScriptDependencyVersion}";\n`
+	);
 
 	var tsServices = fs.readFileSync(path.join(TYPESCRIPT_LIB_SOURCE, 'typescriptServices.js')).toString();
 

+ 1 - 1
src/lib/typescriptServicesMetadata.ts

@@ -1 +1 @@
-export const typeScriptVersion = "3.3.3333";
+export const typescriptVersion = "3.5.1";

+ 2 - 2
src/monaco.contribution.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import * as mode from './tsMode';
-import { typeScriptVersion } from './lib/typescriptServicesMetadata'; // do not import the whole typescriptServices here
+import { typescriptVersion } from './lib/typescriptServicesMetadata'; // do not import the whole typescriptServices here
 
 import Emitter = monaco.Emitter;
 import IEvent = monaco.IEvent;
@@ -205,7 +205,7 @@ function createAPI(): typeof monaco.languages.typescript {
 		NewLineKind: NewLineKind,
 		ScriptTarget: ScriptTarget,
 		ModuleResolutionKind: ModuleResolutionKind,
-		typeScriptVersion,
+		typescriptVersion,
 		typescriptDefaults: typescriptDefaults,
 		javascriptDefaults: javascriptDefaults,
 		getTypeScriptWorker: getTypeScriptWorker,

+ 1 - 1
src/monaco.d.ts

@@ -166,7 +166,7 @@ declare module monaco.languages.typescript {
         setEagerModelSync(value: boolean): void;
     }
 
-    export var typeScriptVersion: string;
+    export var typescriptVersion: string;
 
     export var typescriptDefaults: LanguageServiceDefaults;
     export var javascriptDefaults: LanguageServiceDefaults;