Build VSCode using TS 2.4 (#30473)

* Build VSCode using TS 2.4.1 Fixes #28643 a * Reformat a few files for 2.4 * Fix compile errors in jsoneditingservice
microsoft · Jul 12, 2017 · 5da27ba · 5da27ba
1 parent a5f3583
commit 5da27ba
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 30 deletions.
diff --git a/build/monaco/package.json b/build/monaco/package.json
@@ -48,7 +48,7 @@
     "sinon": "^1.17.2",
     "source-map": "^0.4.4",
     "tslint": "^4.3.1",
-    "typescript": "2.3.2",
+    "typescript": "2.4.1",
     "typescript-formatter": "4.0.1",
     "underscore": "^1.8.2",
     "vinyl": "^0.4.5",

diff --git a/build/package.json b/build/package.json
@@ -13,7 +13,7 @@
     "documentdb": "^1.11.0",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
-    "typescript": "2.3.4",
+    "typescript": "2.4.1",
     "xml2js": "^0.4.17"
   },
   "scripts": {

diff --git a/build/tfs/common/publish.ts b/build/tfs/common/publish.ts
@@ -131,9 +131,11 @@ async function doesAssetExist(blobService: azure.BlobService, quality: string, b
 }
 
 async function uploadBlob(blobService: azure.BlobService, quality: string, blobName: string, file: string): Promise<void> {
-	const blobOptions = {
-		contentType: mime.lookup(file),
-		cacheControl: 'max-age=31536000, public'
+	const blobOptions: azure.BlobService.CreateBlockBlobRequestOptions = {
+		contentSettings: {
+			contentType: mime.lookup(file),
+			cacheControl: 'max-age=31536000, public'
+		}
 	};
 
 	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));

diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
     "gulp-replace": "^0.5.4",
     "gulp-shell": "^0.5.2",
     "gulp-sourcemaps": "^1.11.0",
-    "gulp-tsb": "^2.0.3",
+    "gulp-tsb": "^2.0.4",
     "gulp-tslint": "^7.0.1",
     "gulp-uglify": "^3.0.0",
     "gulp-util": "^3.0.6",
@@ -107,7 +107,7 @@
     "sinon": "^1.17.2",
     "source-map": "^0.4.4",
     "tslint": "^4.3.1",
-    "typescript": "2.3.3",
+    "typescript": "2.4.1",
     "typescript-formatter": "4.0.1",
     "uglify-es": "^3.0.18",
     "underscore": "^1.8.2",

diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts
@@ -67,7 +67,7 @@ interface IETextRange {
 
 declare var IETextRange: {
 	prototype: IETextRange;
-	new (): IETextRange;
+	new(): IETextRange;
 };
 
 interface IHitTestResult {

diff --git a/src/vs/editor/common/editorCommonExtensions.ts b/src/vs/editor/common/editorCommonExtensions.ts
@@ -94,7 +94,7 @@ export interface IContributionCommandOptions<T> extends ICommandOptions {
 	handler: (controller: T) => void;
 }
 export interface EditorControllerCommand<T extends editorCommon.IEditorContribution> {
-	new (opts: IContributionCommandOptions<T>): EditorCommand;
+	new(opts: IContributionCommandOptions<T>): EditorCommand;
 }
 export abstract class EditorCommand extends Command {
 
@@ -202,11 +202,11 @@ export abstract class EditorAction extends EditorCommand {
 
 // --- Registration of commands and actions
 
-export function editorAction(ctor: { new (): EditorAction; }): void {
+export function editorAction(ctor: { new(): EditorAction; }): void {
 	CommonEditorRegistry.registerEditorAction(new ctor());
 }
 
-export function editorCommand(ctor: { new (): EditorCommand }): void {
+export function editorCommand(ctor: { new(): EditorCommand }): void {
 	registerEditorCommand(new ctor());
 }
 

diff --git a/src/vs/platform/instantiation/common/instantiation.ts b/src/vs/platform/instantiation/common/instantiation.ts
@@ -25,39 +25,39 @@ export namespace _util {
 // --- interfaces ------
 
 export interface IConstructorSignature0<T> {
-	new (...services: { _serviceBrand: any; }[]): T;
+	new(...services: { _serviceBrand: any; }[]): T;
 }
 
 export interface IConstructorSignature1<A1, T> {
-	new (first: A1, ...services: { _serviceBrand: any; }[]): T;
+	new(first: A1, ...services: { _serviceBrand: any; }[]): T;
 }
 
 export interface IConstructorSignature2<A1, A2, T> {
-	new (first: A1, second: A2, ...services: { _serviceBrand: any; }[]): T;
+	new(first: A1, second: A2, ...services: { _serviceBrand: any; }[]): T;
 }
 
 export interface IConstructorSignature3<A1, A2, A3, T> {
-	new (first: A1, second: A2, third: A3, ...services: { _serviceBrand: any; }[]): T;
+	new(first: A1, second: A2, third: A3, ...services: { _serviceBrand: any; }[]): T;
 }
 
 export interface IConstructorSignature4<A1, A2, A3, A4, T> {
-	new (first: A1, second: A2, third: A3, fourth: A4, ...services: { _serviceBrand: any; }[]): T;
+	new(first: A1, second: A2, third: A3, fourth: A4, ...services: { _serviceBrand: any; }[]): T;
 }
 
 export interface IConstructorSignature5<A1, A2, A3, A4, A5, T> {
-	new (first: A1, second: A2, third: A3, fourth: A4, fifth: A5, ...services: { _serviceBrand: any; }[]): T;
+	new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, ...services: { _serviceBrand: any; }[]): T;
 }
 
 export interface IConstructorSignature6<A1, A2, A3, A4, A5, A6, T> {
-	new (first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, ...services: { _serviceBrand: any; }[]): T;
+	new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, ...services: { _serviceBrand: any; }[]): T;
 }
 
 export interface IConstructorSignature7<A1, A2, A3, A4, A5, A6, A7, T> {
-	new (first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, seventh: A7, ...services: { _serviceBrand: any; }[]): T;
+	new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, seventh: A7, ...services: { _serviceBrand: any; }[]): T;
 }
 
 export interface IConstructorSignature8<A1, A2, A3, A4, A5, A6, A7, A8, T> {
-	new (first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, seventh: A7, eigth: A8, ...services: { _serviceBrand: any; }[]): T;
+	new(first: A1, second: A2, third: A3, fourth: A4, fifth: A5, sixth: A6, seventh: A7, eigth: A8, ...services: { _serviceBrand: any; }[]): T;
 }
 
 export interface ServicesAccessor {

diff --git a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
@@ -678,8 +678,8 @@ suite('TelemetryService', () => {
 				_serviceBrand: undefined,
 				getConfiguration() {
 					return {
-						enableTelemetry
-					};
+						enableTelemetry: enableTelemetry
+					} as any;
 				},
 				getConfigurationData(): any {
 					return null;

diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -708,7 +708,7 @@ export class ExtHostLanguageFeatures extends ExtHostLanguageFeaturesShape {
 		return ExtHostLanguageFeatures._handlePool++;
 	}
 
-	private _withAdapter<A, R>(handle: number, ctor: { new (...args: any[]): A }, callback: (adapter: A) => TPromise<R>): TPromise<R> {
+	private _withAdapter<A, R>(handle: number, ctor: { new(...args: any[]): A }, callback: (adapter: A) => TPromise<R>): TPromise<R> {
 		let adapter = this._adapter.get(handle);
 		if (!(adapter instanceof ctor)) {
 			return TPromise.wrapError<R>(new Error('no adapter found'));

diff --git a/src/vs/workbench/parts/views/browser/views.ts b/src/vs/workbench/parts/views/browser/views.ts
@@ -48,7 +48,7 @@ export interface IViewOptions {
 
 export interface IViewConstructorSignature {
 
-	new (options: IViewOptions, ...services: { _serviceBrand: any; }[]): IView;
+	new(options: IViewOptions, ...services: { _serviceBrand: any; }[]): IView;
 
 }
 

diff --git a/src/vs/workbench/services/configuration/node/configurationEditingService.ts b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
@@ -253,7 +253,7 @@ export class ConfigurationEditingService implements IConfigurationEditingService
 				if (checkDirty && this.textFileService.isDirty(operation.resource)) {
 					return this.wrapError(ConfigurationEditingErrorCode.ERROR_CONFIGURATION_FILE_DIRTY, target);
 				}
-				return reference;
+				return TPromise.wrap(reference);
 			});
 	}
 

diff --git a/src/vs/workbench/services/configuration/node/jsonEditingService.ts b/src/vs/workbench/services/configuration/node/jsonEditingService.ts
@@ -104,20 +104,20 @@ export class JSONEditingService implements IJSONEditingService {
 				const model = reference.object.textEditorModel;
 
 				if (this.hasParseErrors(model)) {
-					return this.wrapError(JSONEditingErrorCode.ERROR_INVALID_FILE);
+					return this.wrapError<IReference<ITextEditorModel>>(JSONEditingErrorCode.ERROR_INVALID_FILE);
 				}
 
 				// Target cannot be dirty if not writing into buffer
 				if (checkDirty && this.textFileService.isDirty(resource)) {
-					return this.wrapError(JSONEditingErrorCode.ERROR_FILE_DIRTY);
+					return this.wrapError<IReference<ITextEditorModel>>(JSONEditingErrorCode.ERROR_FILE_DIRTY);
 				}
 				return reference;
 			});
 	}
 
-	private wrapError(code: JSONEditingErrorCode): TPromise<never> {
+	private wrapError<T>(code: JSONEditingErrorCode): TPromise<T> {
 		const message = this.toErrorMessage(code);
-		return TPromise.wrapError<never>(new JSONEditingError(message, code));
+		return TPromise.wrapError<T>(new JSONEditingError(message, code));
 	}
 
 	private toErrorMessage(error: JSONEditingErrorCode): string {

diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts
@@ -88,7 +88,7 @@ export class SearchService implements IRawSearchService {
 		return this.doTextSearch(engine, SearchService.BATCH_SIZE);
 	}
 
-	public doFileSearch(EngineClass: { new (config: IRawSearch): ISearchEngine<IRawFileMatch>; }, config: IRawSearch, batchSize?: number): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem> {
+	public doFileSearch(EngineClass: { new(config: IRawSearch): ISearchEngine<IRawFileMatch>; }, config: IRawSearch, batchSize?: number): PPromise<ISerializedSearchComplete, ISerializedSearchProgressItem> {
 
 		if (config.sortByScore) {
 			let sortedSearch = this.trySortedSearchFromCache(config);
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ export interface IViewOptions { @@
     export interface IViewConstructorSignature {
-    	new (options: IViewOptions, ...services: { _serviceBrand: any; }[]): IView;
+    	new(options: IViewOptions, ...services: { _serviceBrand: any; }[]): IView;
     }
@@ Expand Down @@