Fixing a few more strict function type errors

mjbvz · mjbvz · commit 2f253d2ee837 · 2019-11-18T15:35:11.000-08:00
For microsoft#81574
diff --git a/src/vs/base/node/watcher.ts b/src/vs/base/node/watcher.ts
@@ -10,7 +10,7 @@ import { normalizeNFC } from 'vs/base/common/normalization';
 import { toDisposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { exists, readdir } from 'vs/base/node/pfs';
 
-export function watchFile(path: string, onChange: (type: 'changed' | 'deleted', path: string) => void, onError: (error: string) => void): IDisposable {
+export function watchFile(path: string, onChange: (type: 'added' | 'changed' | 'deleted', path: string) => void, onError: (error: string) => void): IDisposable {
 	return doWatchNonRecursive({ path, isDirectory: false }, onChange, onError);
 }
 
@@ -189,4 +189,4 @@ function doWatchNonRecursive(file: { path: string, isDirectory: boolean }, onCha
 
 		watcherDisposables = dispose(watcherDisposables);
 	});
-}
+}
diff --git a/src/vs/base/test/common/event.test.ts b/src/vs/base/test/common/event.test.ts
@@ -174,7 +174,7 @@ suite('Event', function () {
 	test('Debounce Event', function (done: () => void) {
 		let doc = new Samples.Document3();
 
-		let onDocDidChange = Event.debounce(doc.onDidChange, (prev: string[], cur) => {
+		let onDocDidChange = Event.debounce(doc.onDidChange, (prev: string[] | undefined, cur) => {
 			if (!prev) {
 				prev = [cur];
 			} else if (prev.indexOf(cur) < 0) {
diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts
@@ -580,7 +580,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		if (extension.assets.manifest) {
 			return this.getAsset(extension.assets.manifest, {}, token)
 				.then(asText)
-				.then(JSON.parse);
+				.then(text => text ? JSON.parse(text) : null);
 		}
 		return Promise.resolve(null);
 	}
@@ -590,7 +590,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		if (asset) {
 			return this.getAsset(asset[1])
 				.then(asText)
-				.then(JSON.parse);
+				.then(text => text ? JSON.parse(text) : null);
 		}
 		return Promise.resolve(null);
 	}
diff --git a/src/vs/platform/storage/node/storageIpc.ts b/src/vs/platform/storage/node/storageIpc.ts
@@ -83,7 +83,7 @@ export class GlobalStorageDatabaseChannel extends Disposable implements IServerC
 
 		// Listen for changes in global storage to send to listeners
 		// that are listening. Use a debouncer to reduce IPC traffic.
-		this._register(Event.debounce(this.storageMainService.onDidChangeStorage, (prev: IStorageChangeEvent[], cur: IStorageChangeEvent) => {
+		this._register(Event.debounce(this.storageMainService.onDidChangeStorage, (prev: IStorageChangeEvent[] | undefined, cur: IStorageChangeEvent) => {
 			if (!prev) {
 				prev = [cur];
 			} else {
@@ -161,7 +161,7 @@ export class GlobalStorageDatabaseChannelClient extends Disposable implements IS
 	}
 
 	private registerListeners(): void {
-		this.onDidChangeItemsOnMainListener = this.channel.listen('onDidChangeItems')((e: ISerializableItemsChangeEvent) => this.onDidChangeItemsOnMain(e));
+		this.onDidChangeItemsOnMainListener = this.channel.listen<ISerializableItemsChangeEvent>('onDidChangeItems')((e: ISerializableItemsChangeEvent) => this.onDidChangeItemsOnMain(e));
 	}
 
 	private onDidChangeItemsOnMain(e: ISerializableItemsChangeEvent): void {
diff --git a/src/vs/workbench/api/common/extHostQuickOpen.ts b/src/vs/workbench/api/common/extHostQuickOpen.ts
@@ -160,7 +160,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 	// ---- workspace folder picker
 
 	showWorkspaceFolderPick(options?: WorkspaceFolderPickOptions, token = CancellationToken.None): Promise<WorkspaceFolder | undefined> {
-		return this._commands.executeCommand('_workbench.pickWorkspaceFolder', [options]).then(async (selectedFolder: WorkspaceFolder) => {
+		return this._commands.executeCommand<WorkspaceFolder>('_workbench.pickWorkspaceFolder', [options]).then(async (selectedFolder: WorkspaceFolder) => {
 			if (!selectedFolder) {
 				return undefined;
 			}

Original file line number	Diff line number	Diff line change
`@@ -580,7 +580,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {`
`580`	`580`	`if (extension.assets.manifest) {`
`581`	`581`	`return this.getAsset(extension.assets.manifest, {}, token)`
`582`	`582`	`.then(asText)`
`583`		`- .then(JSON.parse);`
	`583`	`+ .then(text => text ? JSON.parse(text) : null);`
`584`	`584`	`}`
`585`	`585`	`return Promise.resolve(null);`
`586`	`586`	`}`
`@@ -590,7 +590,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {`
`590`	`590`	`if (asset) {`
`591`	`591`	`return this.getAsset(asset[1])`
`592`	`592`	`.then(asText)`
`593`		`- .then(JSON.parse);`
	`593`	`+ .then(text => text ? JSON.parse(text) : null);`
`594`	`594`	`}`
`595`	`595`	`return Promise.resolve(null);`
`596`	`596`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ export class GlobalStorageDatabaseChannel extends Disposable implements IServerC`
`83`	`83`
`84`	`84`	`// Listen for changes in global storage to send to listeners`
`85`	`85`	`// that are listening. Use a debouncer to reduce IPC traffic.`
`86`		`- this._register(Event.debounce(this.storageMainService.onDidChangeStorage, (prev: IStorageChangeEvent[], cur: IStorageChangeEvent) => {`
	`86`	`+ this._register(Event.debounce(this.storageMainService.onDidChangeStorage, (prev: IStorageChangeEvent[] \| undefined, cur: IStorageChangeEvent) => {`
`87`	`87`	`if (!prev) {`
`88`	`88`	`prev = [cur];`
`89`	`89`	`} else {`
`@@ -161,7 +161,7 @@ export class GlobalStorageDatabaseChannelClient extends Disposable implements IS`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`private registerListeners(): void {`
`164`		`- this.onDidChangeItemsOnMainListener = this.channel.listen('onDidChangeItems')((e: ISerializableItemsChangeEvent) => this.onDidChangeItemsOnMain(e));`
	`164`	`+ this.onDidChangeItemsOnMainListener = this.channel.listen<ISerializableItemsChangeEvent>('onDidChangeItems')((e: ISerializableItemsChangeEvent) => this.onDidChangeItemsOnMain(e));`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`private onDidChangeItemsOnMain(e: ISerializableItemsChangeEvent): void {`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {`
`160`	`160`	`// ---- workspace folder picker`
`161`	`161`
`162`	`162`	`showWorkspaceFolderPick(options?: WorkspaceFolderPickOptions, token = CancellationToken.None): Promise<WorkspaceFolder \| undefined> {`
`163`		`- return this._commands.executeCommand('_workbench.pickWorkspaceFolder', [options]).then(async (selectedFolder: WorkspaceFolder) => {`
	`163`	`+ return this._commands.executeCommand<WorkspaceFolder>('_workbench.pickWorkspaceFolder', [options]).then(async (selectedFolder: WorkspaceFolder) => {`
`164`	`164`	`if (!selectedFolder) {`
`165`	`165`	`return undefined;`
`166`	`166`	`}`