Bug 527807 - Search is broken on the latest Electron build (Version 1…

…6.0.889 (16.0.889.889))
eclipse · Dec 1, 2017 · 449ea93 · 449ea93
1 parent 311c61f
commit 449ea93
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js
@@ -693,6 +693,11 @@ define([
 					window.__electron.remote.dialog.showOpenDialog({properties: ['openDirectory']}, function(result) {
 						if (!result) return;
 						that.fileClient.changeWorkspace(result[0]).then(function() {
+							localStorage.removeItem("/inlineSearchOtherScope");
+							var searchClient = that.serviceRegistry.getService("orion.core.search.client");
+							if (searchClient) {
+								searchClient.setLocationOther(null);
+							}
 							delete sessionStorage.lastFile;
 						});			
 					});
@@ -719,6 +724,11 @@ define([
 									name: folderLocation,
 									callback: function() {
 										that.fileClient.changeWorkspace(folderLocation).then(function() {
+											localStorage.removeItem("/inlineSearchOtherScope");
+											var searchClient = that.serviceRegistry.getService("orion.core.search.client");
+											if (searchClient) {
+												searchClient.setLocationOther(null);
+											}
 											delete sessionStorage.lastFile;
 										});
 									}