Fix microsoft#60456 - null check

roblourens · roblourens · commit 6eb6654d7409 · 2018-10-10T11:59:57.000-07:00
diff --git a/src/vs/workbench/parts/search/browser/searchView.ts b/src/vs/workbench/parts/search/browser/searchView.ts
@@ -1429,7 +1429,11 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {
 				this.viewModel.searchResult.rangeHighlightDecorations.removeHighlightRange();
 			}
 
-			return this.editorGroupsService.activateGroup(editor.group);
+			if (editor) {
+				return this.editorGroupsService.activateGroup(editor.group);
+			} else {
+				return TPromise.wrap(null);
+			}
 		}, errors.onUnexpectedError);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1429,7 +1429,11 @@ export class SearchView extends Viewlet implements IViewlet, IPanel {`
`1429`	`1429`	`this.viewModel.searchResult.rangeHighlightDecorations.removeHighlightRange();`
`1430`	`1430`	`}`
`1431`	`1431`
`1432`		`- return this.editorGroupsService.activateGroup(editor.group);`
	`1432`	`+ if (editor) {`
	`1433`	`+ return this.editorGroupsService.activateGroup(editor.group);`
	`1434`	`+ } else {`
	`1435`	`+ return TPromise.wrap(null);`
	`1436`	`+ }`
`1433`	`1437`	`}, errors.onUnexpectedError);`
`1434`	`1438`	`}`
`1435`	`1439`