More changes for microsoft#81574

alexdima · alexdima · commit ca81ca47db3f · 2019-11-15T18:02:35.000+01:00
diff --git a/src/vs/base/browser/globalMouseMoveMonitor.ts b/src/vs/base/browser/globalMouseMoveMonitor.ts
@@ -27,7 +27,7 @@ export interface IOnStopCallback {
 	(): void;
 }
 
-export function standardMouseMoveMerger(lastEvent: IStandardMouseMoveEventData, currentEvent: MouseEvent): IStandardMouseMoveEventData {
+export function standardMouseMoveMerger(lastEvent: IStandardMouseMoveEventData | null, currentEvent: MouseEvent): IStandardMouseMoveEventData {
 	let ev = new StandardMouseEvent(currentEvent);
 	ev.preventDefault();
 	return {
diff --git a/src/vs/editor/browser/editorExtensions.ts b/src/vs/editor/browser/editorExtensions.ts
@@ -307,7 +307,7 @@ export function registerEditorContribution<Services extends BrandedService[]>(id
 	EditorContributionRegistry.INSTANCE.registerEditorContribution(id, ctor);
 }
 
-export function registerDiffEditorContribution(id: string, ctor: IDiffEditorContributionCtor): void {
+export function registerDiffEditorContribution<Services extends BrandedService[]>(id: string, ctor: { new(editor: IDiffEditor, ...services: Services): IEditorContribution }): void {
 	EditorContributionRegistry.INSTANCE.registerDiffEditorContribution(id, ctor);
 }
 
@@ -363,7 +363,7 @@ class EditorContributionRegistry {
 		return this.editorContributions.slice(0);
 	}
 
-	public registerDiffEditorContribution(id: string, ctor: IDiffEditorContributionCtor): void {
+	public registerDiffEditorContribution<Services extends BrandedService[]>(id: string, ctor: { new(editor: IDiffEditor, ...services: Services): IEditorContribution }): void {
 		this.diffEditorContributions.push({ id, ctor });
 	}
 
diff --git a/src/vs/platform/remote/common/remoteAgentConnection.ts b/src/vs/platform/remote/common/remoteAgentConnection.ts
@@ -89,8 +89,8 @@ async function connectToRemoteExtensionHostAgent(options: ISimpleConnectionOptio
 			options.host,
 			options.port,
 			`reconnectionToken=${options.reconnectionToken}&reconnection=${options.reconnectionProtocol ? 'true' : 'false'}`,
-			(err: any, socket: ISocket) => {
-				if (err) {
+			(err: any, socket: ISocket | undefined) => {
+				if (err || !socket) {
 					options.logService.error(`${logPrefix} socketFactory.connect() failed. Error:`);
 					options.logService.error(err);
 					e(err);
diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts
@@ -185,8 +185,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 					}
 
 					return activeTextEditor.edit((edit: vscode.TextEditorEdit) => {
-						args.unshift(activeTextEditor, edit);
-						callback.apply(thisArg, args);
+						callback.apply(thisArg, [activeTextEditor, edit, ...args]);
 
 					}).then((result) => {
 						if (!result) {
diff --git a/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts b/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts
@@ -82,7 +82,7 @@ export interface ISuggestEnabledInputStyleOverrides extends IStyleOverrides {
 }
 
 type ISuggestEnabledInputStyles = {
-	[P in keyof ISuggestEnabledInputStyleOverrides]: Color;
+	[P in keyof ISuggestEnabledInputStyleOverrides]: Color | undefined;
 };
 
 export function attachSuggestEnabledInputBoxStyler(widget: IThemable, themeService: IThemeService, style?: ISuggestEnabledInputStyleOverrides): IDisposable {
diff --git a/src/vs/workbench/services/extensions/common/extensionHostProcessManager.ts b/src/vs/workbench/services/extensions/common/extensionHostProcessManager.ts
@@ -406,7 +406,10 @@ export class MeasureExtHostLatencyAction extends Action {
 		this._editorService.openEditor({ contents: measurements.map(MeasureExtHostLatencyAction._print).join('\n\n'), options: { pinned: true } } as IUntitledTextResourceInput);
 	}
 
-	private static _print(m: ExtHostLatencyResult): string {
+	private static _print(m: ExtHostLatencyResult | null): string {
+		if (!m) {
+			return '';
+		}
 		return `${m.remoteAuthority ? `Authority: ${m.remoteAuthority}\n` : ``}Roundtrip latency: ${m.latency.toFixed(3)}ms\nUp: ${MeasureExtHostLatencyAction._printSpeed(m.up)}\nDown: ${MeasureExtHostLatencyAction._printSpeed(m.down)}\n`;
 	}
 
diff --git a/src/vs/workbench/services/mode/common/workbenchModeService.ts b/src/vs/workbench/services/mode/common/workbenchModeService.ts
@@ -105,7 +105,7 @@ export class WorkbenchModeServiceImpl extends ModeServiceImpl {
 		this._configurationService = configurationService;
 		this._extensionService = extensionService;
 
-		languagesExtPoint.setHandler((extensions: IExtensionPointUser<IRawLanguageExtensionPoint[]>[]) => {
+		languagesExtPoint.setHandler((extensions: readonly IExtensionPointUser<IRawLanguageExtensionPoint[]>[]) => {
 			let allValidLanguages: ILanguageExtensionPoint[] = [];
 
 			for (let i = 0, len = extensions.length; i < len; i++) {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export interface IOnStopCallback {`
`27`	`27`	`(): void;`
`28`	`28`	`}`
`29`	`29`
`30`		`-export function standardMouseMoveMerger(lastEvent: IStandardMouseMoveEventData, currentEvent: MouseEvent): IStandardMouseMoveEventData {`
	`30`	`+export function standardMouseMoveMerger(lastEvent: IStandardMouseMoveEventData \| null, currentEvent: MouseEvent): IStandardMouseMoveEventData {`
`31`	`31`	`let ev = new StandardMouseEvent(currentEvent);`
`32`	`32`	`ev.preventDefault();`
`33`	`33`	`return {`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ export function registerEditorContribution<Services extends BrandedService[]>(id`
`307`	`307`	`EditorContributionRegistry.INSTANCE.registerEditorContribution(id, ctor);`
`308`	`308`	`}`
`309`	`309`
`310`		`-export function registerDiffEditorContribution(id: string, ctor: IDiffEditorContributionCtor): void {`
	`310`	`+export function registerDiffEditorContribution<Services extends BrandedService[]>(id: string, ctor: { new(editor: IDiffEditor, ...services: Services): IEditorContribution }): void {`
`311`	`311`	`EditorContributionRegistry.INSTANCE.registerDiffEditorContribution(id, ctor);`
`312`	`312`	`}`
`313`	`313`
`@@ -363,7 +363,7 @@ class EditorContributionRegistry {`
`363`	`363`	`return this.editorContributions.slice(0);`
`364`	`364`	`}`
`365`	`365`
`366`		`- public registerDiffEditorContribution(id: string, ctor: IDiffEditorContributionCtor): void {`
	`366`	`+ public registerDiffEditorContribution<Services extends BrandedService[]>(id: string, ctor: { new(editor: IDiffEditor, ...services: Services): IEditorContribution }): void {`
`367`	`367`	`this.diffEditorContributions.push({ id, ctor });`
`368`	`368`	`}`
`369`	`369`
Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`return activeTextEditor.edit((edit: vscode.TextEditorEdit) => {`
`188`		`- args.unshift(activeTextEditor, edit);`
`189`		`- callback.apply(thisArg, args);`
	`188`	`+ callback.apply(thisArg, [activeTextEditor, edit, ...args]);`
`190`	`189`
`191`	`190`	`}).then((result) => {`
`192`	`191`	`if (!result) {`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ export interface ISuggestEnabledInputStyleOverrides extends IStyleOverrides {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`type ISuggestEnabledInputStyles = {`
`85`		`- [P in keyof ISuggestEnabledInputStyleOverrides]: Color;`
	`85`	`+ [P in keyof ISuggestEnabledInputStyleOverrides]: Color \| undefined;`
`86`	`86`	`};`
`87`	`87`
`88`	`88`	`export function attachSuggestEnabledInputBoxStyler(widget: IThemable, themeService: IThemeService, style?: ISuggestEnabledInputStyleOverrides): IDisposable {`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,10 @@ export class MeasureExtHostLatencyAction extends Action {`
`406`	`406`	`this._editorService.openEditor({ contents: measurements.map(MeasureExtHostLatencyAction._print).join('\n\n'), options: { pinned: true } } as IUntitledTextResourceInput);`
`407`	`407`	`}`
`408`	`408`
`409`		`- private static _print(m: ExtHostLatencyResult): string {`
	`409`	`+ private static _print(m: ExtHostLatencyResult \| null): string {`
	`410`	`+ if (!m) {`
	`411`	`+ return '';`
	`412`	`+ }`
`410`	`413`	return `${m.remoteAuthority ? `Authority: ${m.remoteAuthority}\n` : ``}Roundtrip latency: ${m.latency.toFixed(3)}ms\nUp: ${MeasureExtHostLatencyAction._printSpeed(m.up)}\nDown: ${MeasureExtHostLatencyAction._printSpeed(m.down)}\n`;
`411`	`414`	`}`
`412`	`415`