explorer model: when merging ExplorerItems respect isSymbolicLink

fixes #46536
microsoft · Mar 26, 2018 · 2425a0e · 2425a0e
1 parent a9704b5
commit 2425a0e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git 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
@@ -30,7 +30,6 @@ export class SearchViewLocationUpdater implements IWorkbenchContribution {
 		configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('search.location')) {
 				updateSearchViewLocation();
-
 			}
 		});
-Original file line number
+Diff line change
@@ Expand Up @@
     		configurationService.onDidChangeConfiguration(e => {
     			if (e.affectsConfiguration('search.location')) {
     				updateSearchViewLocation();
     			}
     		});
@@ Expand Down @@