Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-27 18:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Search viewlet doesn't get selected text from diff editor (fixes #25293)

Browse Source
This commit is contained in:
Benjamin Pasero
2017-05-29 11:07:57 +02:00
parent cf4f34d808
commit bcf8f55692
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/parts/search/browser/searchViewlet.ts
+10 -2
View File
@@ -9,7 +9,7 @@ import 'vs/css!./media/searchviewlet';
import nls = require('vs/nls');
import { TPromise } from 'vs/base/common/winjs.base';
import { Emitter, debounceEvent } from 'vs/base/common/event';
import { ICommonCodeEditor, isCommonCodeEditor } from 'vs/editor/common/editorCommon';
import { ICommonCodeEditor, isCommonCodeEditor, isCommonDiffEditor } from 'vs/editor/common/editorCommon';
import lifecycle = require('vs/base/common/lifecycle');
import errors = require('vs/base/common/errors');
import aria = require('vs/base/browser/ui/aria/aria');
@@ -797,7 +797,15 @@ export class SearchViewlet extends Viewlet {
return null;
}
let editorControl: any = this.editorService.getActiveEditor().getControl();
let editorControl = this.editorService.getActiveEditor().getControl();
if (isCommonDiffEditor(editorControl)) {
if (editorControl.getOriginalEditor().isFocused()) {
editorControl = editorControl.getOriginalEditor();
} else {
editorControl = editorControl.getModifiedEditor();
}
}
if (!isCommonCodeEditor(editorControl)) {
return null;
}