From 1a8f9c015c8a7dc6dd016b0be2d0f84f013791b9 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 31 Oct 2016 15:48:49 +0100 Subject: [PATCH] Fix #14741 --- .../workbench/parts/search/browser/replaceService.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/parts/search/browser/replaceService.ts b/src/vs/workbench/parts/search/browser/replaceService.ts index f251f932502..af14b817175 100644 --- a/src/vs/workbench/parts/search/browser/replaceService.ts +++ b/src/vs/workbench/parts/search/browser/replaceService.ts @@ -52,10 +52,12 @@ class EditorInputCache { if (editorInputPromise) { editorInputPromise.done(() => { if (reloadFromSource) { - this.editorService.resolveEditorModel({ resource: fileMatch.resource() }).then(value => { - let replaceResource = this.getReplaceResource(fileMatch.resource()); - this.modelService.getModel(replaceResource).setValue(value.textEditorModel.getValue()); - this.replaceService.replace(fileMatch, null, replaceResource); + this.editorService.resolveEditorModel({ resource: fileMatch.resource() }).then(editorModel => { + if (editorModel.textEditorModel) { + let replaceResource = this.getReplaceResource(fileMatch.resource()); + this.modelService.getModel(replaceResource).setValue(editorModel.textEditorModel.getValue()); + this.replaceService.replace(fileMatch, null, replaceResource); + } }); } else { let replaceResource = this.getReplaceResource(fileMatch.resource()); -- GitLab