enable strictFunctionTypes in VS Code codebase microsoft#81574

aeschli · aeschli · commit efe0e246b7eb · 2019-11-15T10:58:55.000+01:00
diff --git a/src/vs/base/common/path.ts b/src/vs/base/common/path.ts
@@ -69,11 +69,11 @@ function validateString(value: string, name: string) {
 	}
 }
 
-function isPathSeparator(code: number) {
+function isPathSeparator(code: number | undefined) {
 	return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
 }
 
-function isPosixPathSeparator(code: number) {
+function isPosixPathSeparator(code: number | undefined) {
 	return code === CHAR_FORWARD_SLASH;
 }
 
diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts
@@ -423,7 +423,7 @@ export class FoldingController extends Disposable implements IEditorContribution
 					if (iconClicked || isCollapsed) {
 						let toToggle = [region];
 						if (e.event.middleButton || e.event.shiftKey) {
-							toToggle.push(...foldingModel.getRegionsInside(region, r => r.isCollapsed === isCollapsed));
+							toToggle.push(...foldingModel.getRegionsInside(region, (r: FoldingRegion) => r.isCollapsed === isCollapsed));
 						}
 						foldingModel.toggleCollapseState(toToggle);
 						this.reveal({ lineNumber, column: 1 });
diff --git a/src/vs/editor/contrib/folding/foldingModel.ts b/src/vs/editor/contrib/folding/foldingModel.ts
@@ -204,7 +204,7 @@ export class FoldingModel {
 		return null;
 	}
 
-	getRegionsInside(region: FoldingRegion | null, filter?: (r: FoldingRegion, level?: number) => boolean): FoldingRegion[] {
+	getRegionsInside(region: FoldingRegion | null, filter?: RegionFilter | RegionFilterWithLevel): FoldingRegion[] {
 		let result: FoldingRegion[] = [];
 		let index = region ? region.regionIndex + 1 : 0;
 		let endLineNumber = region ? region.endLineNumber : Number.MAX_VALUE;
@@ -229,7 +229,7 @@ export class FoldingModel {
 			for (let i = index, len = this._regions.length; i < len; i++) {
 				let current = this._regions.toRegion(i);
 				if (this._regions.getStartLineNumber(i) < endLineNumber) {
-					if (!filter || filter(current)) {
+					if (!filter || (filter as RegionFilter)(current)) {
 						result.push(current);
 					}
 				} else {
@@ -242,6 +242,10 @@ export class FoldingModel {
 
 }
 
+type RegionFilter = (r: FoldingRegion) => boolean;
+type RegionFilterWithLevel = (r: FoldingRegion, level: number) => boolean;
+
+
 /**
  * Collapse or expand the regions at the given locations
  * @param levels The number of levels. Use 1 to only impact the regions at the location, use Number.MAX_VALUE for all levels.
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionTipsService.ts b/src/vs/workbench/contrib/extensions/browser/extensionTipsService.ts
@@ -1124,7 +1124,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				if (context.res.statusCode !== 200) {
 					return Promise.resolve(undefined);
 				}
-				return asJson(context).then((result: { [key: string]: any }) => {
+				return asJson(context).then((result: { [key: string]: any } | null) => {
 					if (!result) {
 						return;
 					}

Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,11 @@ function validateString(value: string, name: string) {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`-function isPathSeparator(code: number) {`
	`72`	`+function isPathSeparator(code: number \| undefined) {`
`73`	`73`	`return code === CHAR_FORWARD_SLASH \|\| code === CHAR_BACKWARD_SLASH;`
`74`	`74`	`}`
`75`	`75`
`76`		`-function isPosixPathSeparator(code: number) {`
	`76`	`+function isPosixPathSeparator(code: number \| undefined) {`
`77`	`77`	`return code === CHAR_FORWARD_SLASH;`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ export class FoldingController extends Disposable implements IEditorContribution`
`423`	`423`	`if (iconClicked \|\| isCollapsed) {`
`424`	`424`	`let toToggle = [region];`
`425`	`425`	`if (e.event.middleButton \|\| e.event.shiftKey) {`
`426`		`- toToggle.push(...foldingModel.getRegionsInside(region, r => r.isCollapsed === isCollapsed));`
	`426`	`+ toToggle.push(...foldingModel.getRegionsInside(region, (r: FoldingRegion) => r.isCollapsed === isCollapsed));`
`427`	`427`	`}`
`428`	`428`	`foldingModel.toggleCollapseState(toToggle);`
`429`	`429`	`this.reveal({ lineNumber, column: 1 });`
Original file line number	Diff line number	Diff line change
`@@ -1124,7 +1124,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe`
`1124`	`1124`	`if (context.res.statusCode !== 200) {`
`1125`	`1125`	`return Promise.resolve(undefined);`
`1126`	`1126`	`}`
`1127`		`- return asJson(context).then((result: { [key: string]: any }) => {`
	`1127`	`+ return asJson(context).then((result: { [key: string]: any } \| null) => {`
`1128`	`1128`	`if (!result) {`
`1129`	`1129`	`return;`
`1130`	`1130`	`}`