From 2425a0e46c694a1ecfa29d3e83fb532d61d5a892 Mon Sep 17 00:00:00 2001
From: isidor <inikolic@microsoft.com>
Date: Mon, 26 Mar 2018 18:30:57 +0200
Subject: [PATCH] explorer model: when merging ExplorerItems respect
 isSymbolicLink

fixes #46536
---
 src/vs/workbench/parts/files/common/explorerModel.ts             | 1 +
 .../workbench/parts/search/browser/searchViewLocationUpdater.ts  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/files/common/explorerModel.ts b/src/vs/workbench/parts/files/common/explorerModel.ts
index cac3eaf31c92..6abc54c895a8 100644
--- a/src/vs/workbench/parts/files/common/explorerModel.ts
+++ b/src/vs/workbench/parts/files/common/explorerModel.ts
@@ -177,6 +177,7 @@ export class ExplorerItem {
 		local.isDirectory = disk.isDirectory;
 		local.mtime = disk.mtime;
 		local.isDirectoryResolved = disk.isDirectoryResolved;
+		local._isSymbolicLink = disk.isSymbolicLink;
 
 		// Merge Children if resolved
 		if (mergingDirectories && disk.isDirectoryResolved) {
diff --git a/src/vs/workbench/parts/search/browser/searchViewLocationUpdater.ts b/src/vs/workbench/parts/search/browser/searchViewLocationUpdater.ts
index a7bc8a9babd8..851e30dc4e57 100644
--- a/src/vs/workbench/parts/search/browser/searchViewLocationUpdater.ts
+++ b/src/vs/workbench/parts/search/browser/searchViewLocationUpdater.ts
@@ -30,7 +30,6 @@ export class SearchViewLocationUpdater implements IWorkbenchContribution {
 		configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('search.location')) {
 				updateSearchViewLocation();
-
 			}
 		});