提交 82ca1dec 编写于 作者: S Sandeep Somavarapu

fix #8602

上级 f32b435e
......@@ -173,7 +173,7 @@ export class SearchRenderer extends ActionsRenderer {
elements.push(strings.escape(preview.before));
let input= <SearchResult>tree.getInput();
let showReplaceText= input.isReplaceActive() && !!input.replaceText;
let showReplaceText= input.hasReplaceText();
elements.push('</span><span class="' + (showReplaceText ? 'replace ' : '') + 'findInFileMatch">');
elements.push(strings.escape(preview.inside));
if (showReplaceText) {
......
......@@ -948,7 +948,7 @@ export class SearchViewlet extends Viewlet {
this.telemetryService.publicLog('searchResultChosen');
return this.viewModel.isReplaceActive() ? this.openReplacePreviewEditor(lineMatch, preserveFocus, sideBySide, pinned) : this.open(lineMatch, preserveFocus, sideBySide, pinned);
return this.viewModel.hasReplaceText() ? this.openReplacePreviewEditor(lineMatch, preserveFocus, sideBySide, pinned) : this.open(lineMatch, preserveFocus, sideBySide, pinned);
}
public open(element: FileMatchOrMatch, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): TPromise<any> {
......
......@@ -268,6 +268,14 @@ export class SearchResult extends EventEmitter {
this._replace= replace;
}
/**
* Return true if replace is enabled and replace text is not empty, otherwise false.
* This is necessary in cases handling empty replace text when replace is active.
*/
public hasReplaceText():boolean {
return this.isReplaceActive() && !!this.replaceText;
}
private _onModelAdded(model: IModel): void {
let resource = model.uri,
fileMatch = this._matches[resource.toString()];
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册