fix strict null errors

jrieken · jrieken · commit ee9e463e60a3 · 2018-12-13T11:52:05.000+01:00
diff --git a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts
@@ -106,7 +106,7 @@ abstract class OccurenceAtPositionRequest implements IOccurenceAtPositionRequest
 
 class SemanticOccurenceAtPositionRequest extends OccurenceAtPositionRequest {
 	protected _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Promise<DocumentHighlight[]> {
-		return getOccurrencesAtPosition(model, selection.getPosition(), token);
+		return getOccurrencesAtPosition(model, selection.getPosition(), token).then(value => value || []);
 	}
 }
 
diff --git a/src/vs/platform/url/common/urlService.ts b/src/vs/platform/url/common/urlService.ts
@@ -20,7 +20,7 @@ export class URLService implements IURLService {
 
 	open(uri: URI): Promise<boolean> {
 		const handlers = Array.from(this.handlers);
-		return first(handlers.map(h => () => h.handleURL(uri)), undefined, false);
+		return first(handlers.map(h => () => h.handleURL(uri)), undefined, false).then(val => val || false);
 	}
 
 	registerHandler(handler: IURLHandler): IDisposable {

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ abstract class OccurenceAtPositionRequest implements IOccurenceAtPositionRequest`
`106`	`106`
`107`	`107`	`class SemanticOccurenceAtPositionRequest extends OccurenceAtPositionRequest {`
`108`	`108`	`protected _compute(model: ITextModel, selection: Selection, wordSeparators: string, token: CancellationToken): Promise<DocumentHighlight[]> {`
`109`		`- return getOccurrencesAtPosition(model, selection.getPosition(), token);`
	`109`	`+ return getOccurrencesAtPosition(model, selection.getPosition(), token).then(value => value \|\| []);`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ export class URLService implements IURLService {`
`20`	`20`
`21`	`21`	`open(uri: URI): Promise<boolean> {`
`22`	`22`	`const handlers = Array.from(this.handlers);`
`23`		`- return first(handlers.map(h => () => h.handleURL(uri)), undefined, false);`
	`23`	`+ return first(handlers.map(h => () => h.handleURL(uri)), undefined, false).then(val => val \|\| false);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`registerHandler(handler: IURLHandler): IDisposable {`