From e23aa19a6521d6bb08f8d652b7087c3f056bb5b4 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 7 Mar 2016 09:16:39 +0100 Subject: [PATCH] Cannot read property 'saveViewState' of null (fixes #3728) --- .../workbench/parts/quickopen/browser/markersHandler.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/quickopen/browser/markersHandler.ts b/src/vs/workbench/parts/quickopen/browser/markersHandler.ts index 87eb5740b7d..7b2a4bbc6c2 100644 --- a/src/vs/workbench/parts/quickopen/browser/markersHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/markersHandler.ts @@ -16,6 +16,7 @@ import {PathLabelProvider} from 'vs/base/common/labels'; import {ITree, IElementCallback} from 'vs/base/parts/tree/browser/tree'; import Severity from 'vs/base/common/severity'; import {QuickOpenHandler} from 'vs/workbench/browser/quickopen'; +import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor'; import {QuickOpenAction} from 'vs/workbench/browser/actions/quickOpenAction'; import {Mode, IContext, IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen'; import {QuickOpenEntryItem, QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel'; @@ -164,7 +165,8 @@ export class MarkersHandler extends QuickOpenHandler { @IMarkerService markerService: IMarkerService, @IWorkbenchEditorService editorService: IWorkbenchEditorService, @ICodeEditorService codeEditorService: ICodeEditorService, - @IWorkspaceContextService contextService: IWorkspaceContextService) { + @IWorkspaceContextService contextService: IWorkspaceContextService + ) { super(); this._markerService = markerService; @@ -189,8 +191,8 @@ export class MarkersHandler extends QuickOpenHandler { // 2nd viewstate const editor = this._editorService.getActiveEditor(); let viewState: IEditorViewState; - if (editor) { - viewState = (editor.getControl()).saveViewState(); + if (editor instanceof BaseTextEditor) { + viewState = editor.getControl().saveViewState(); } this._activeSession = [model, viewState]; -- GitLab