explorer: polish focusNoScroll

isidorn · isidorn · commit a06c753e0b7d · 2020-05-13T15:51:24.000+02:00
diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts
@@ -370,12 +370,12 @@ configurationRegistry.registerConfiguration({
 		},
 		'explorer.autoReveal': {
 			'type': ['boolean', 'string'],
-			'enum': [true, false, 'highlightNoScroll'],
+			'enum': [true, false, 'focusNoScroll'],
 			'default': true,
 			'enumDescriptions': [
 				nls.localize('autoReveal.on', 'Files will be revealed and selected.'),
 				nls.localize('autoReveal.off', 'Files will not be revealed and selected.'),
-				nls.localize('autoReveal.highlightNoScroll', 'Files will not be scrolled into view, but will still be selected.'),
+				nls.localize('autoReveal.focusNoScroll', 'Files will not be scrolled into view, but will still be focused.'),
 			],
 			'description': nls.localize('autoReveal', "Controls whether the explorer should automatically reveal and select files when opening them.")
 		},
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -146,7 +146,7 @@ export class ExplorerView extends ViewPane {
 	// Refresh is needed on the initial explorer open
 	private shouldRefresh = true;
 	private dragHandler!: DelayedDragHandler;
-	private autoReveal: boolean | string = false;
+	private autoReveal: boolean | 'focusNoScroll' = false;
 	private actions: IAction[] | undefined;
 	private decorationsProvider: ExplorerDecorationsProvider | undefined;
 
@@ -674,12 +674,9 @@ export class ExplorerView extends ViewPane {
 			}
 
 			try {
-				if (reveal) {
-					// Don't scroll to the item if it's already visible,
-					// or if set not to.
-					if (reveal !== 'highlightNoScroll' && this.tree.getRelativeTop(item) === null) {
-						this.tree.reveal(item, 0.5);
-					}
+				if (reveal === true && this.tree.getRelativeTop(item) === null) {
+					// Don't scroll to the item if it's already visible, or if set not to.
+					this.tree.reveal(item, 0.5);
 				}
 
 				this.tree.setFocus([item]);
diff --git a/src/vs/workbench/contrib/files/common/files.ts b/src/vs/workbench/contrib/files/common/files.ts
@@ -121,7 +121,7 @@ export interface IFilesConfiguration extends PlatformIFilesConfiguration, IWorkb
 		openEditors: {
 			visible: number;
 		};
-		autoReveal: boolean | string;
+		autoReveal: boolean | 'focusNoScroll';
 		enableDragAndDrop: boolean;
 		confirmDelete: boolean;
 		sortOrder: SortOrder;
