From 4a79412f8234d7c4e3fbe8f44f1acf523ff8768e Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 2 Dec 2016 17:32:48 -0800 Subject: [PATCH] Fix null exception on runSelectedText Terminal Action for Webview Fixes #16421 Adds a nullcheck before attempting to grab text from the active editor. --- .../electron-browser/terminalActions.ts | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts index 5936be465d7..cbaacda3391 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts @@ -198,15 +198,17 @@ export class RunSelectedTextInTerminalAction extends Action { terminalInstance = this.terminalService.createInstance(); } let editor = this.codeEditorService.getFocusedCodeEditor(); - let selection = editor.getSelection(); - let text: string; - if (selection.isEmpty()) { - text = editor.getValue(); - } else { - let endOfLinePreference = os.EOL === '\n' ? EndOfLinePreference.LF : EndOfLinePreference.CRLF; - text = editor.getModel().getValueInRange(selection, endOfLinePreference); + if (editor) { + let selection = editor.getSelection(); + let text: string; + if (selection.isEmpty()) { + text = editor.getValue(); + } else { + let endOfLinePreference = os.EOL === '\n' ? EndOfLinePreference.LF : EndOfLinePreference.CRLF; + text = editor.getModel().getValueInRange(selection, endOfLinePreference); + } + terminalInstance.sendText(text, true); } - terminalInstance.sendText(text, true); return TPromise.as(void 0); } } -- GitLab