correct word

meganrogge · meganrogge · commit 38e6d7861d30 · 2023-07-18T08:36:16.000-07:00
diff --git a/src/vs/workbench/browser/actions/widgetNavigationCommands.ts b/src/vs/workbench/browser/actions/widgetNavigationCommands.ts
@@ -13,9 +13,9 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 
-/** INavigatableContainer represents a logical container composed of widgets that can
+/** INavigableContainer represents a logical container composed of widgets that can
 	be navigated back and forth with key shortcuts */
-interface INavigatableContainer {
+interface INavigableContainer {
 	/**
 	 * The container may coomposed of multiple parts that share no DOM ancestor
 	 * (e.g., the main body and filter box of MarkersView may be separated).
@@ -54,28 +54,28 @@ function handleFocusEventsGroup(group: readonly IFocusNotifier[], handler: (isFo
 	)));
 }
 
-const NavigatableContainerFocusedContextKey = new RawContextKey<boolean>('navigatableContainerFocused', false);
+const NavigableContainerFocusedContextKey = new RawContextKey<boolean>('navigableContainerFocused', false);
 
-class NavigatableContainerManager implements IDisposable {
-	private static INSTANCE: NavigatableContainerManager | undefined;
+class NavigableContainerManager implements IDisposable {
+	private static INSTANCE: NavigableContainerManager | undefined;
 
-	private readonly containers = new Set<INavigatableContainer>();
-	private lastContainer: INavigatableContainer | undefined;
+	private readonly containers = new Set<INavigableContainer>();
+	private lastContainer: INavigableContainer | undefined;
 	private focused: IContextKey<boolean>;
 
 
 	constructor(@IContextKeyService contextKeyService: IContextKeyService) {
-		this.focused = NavigatableContainerFocusedContextKey.bindTo(contextKeyService);
-		NavigatableContainerManager.INSTANCE = this;
+		this.focused = NavigableContainerFocusedContextKey.bindTo(contextKeyService);
+		NavigableContainerManager.INSTANCE = this;
 	}
 
 	dispose(): void {
 		this.containers.clear();
 		this.focused.reset();
-		NavigatableContainerManager.INSTANCE = undefined;
+		NavigableContainerManager.INSTANCE = undefined;
 	}
 
-	static register(container: INavigatableContainer): IDisposable {
+	static register(container: INavigableContainer): IDisposable {
 		const instance = this.INSTANCE;
 		if (!instance) {
 			return Disposable.None;
@@ -102,31 +102,31 @@ class NavigatableContainerManager implements IDisposable {
 		);
 	}
 
-	static getActive(): INavigatableContainer | undefined {
+	static getActive(): INavigableContainer | undefined {
 		return this.INSTANCE?.lastContainer;
 	}
 }
 
-export function registerNavigatableContainer(container: INavigatableContainer): IDisposable {
-	return NavigatableContainerManager.register(container);
+export function registerNavigableContainer(container: INavigableContainer): IDisposable {
+	return NavigableContainerManager.register(container);
 }
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
-	.registerWorkbenchContribution(NavigatableContainerManager, LifecyclePhase.Starting);
+	.registerWorkbenchContribution(NavigableContainerManager, LifecyclePhase.Starting);
 
 KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'widgetNavigation.focusPrevious',
 	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(
-		NavigatableContainerFocusedContextKey,
+		NavigableContainerFocusedContextKey,
 		ContextKeyExpr.or(
 			WorkbenchListFocusContextKey?.negate(),
 			WorkbenchListScrollAtTopContextKey,
 		)
 	),
 	primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
 	handler: () => {
-		const activeContainer = NavigatableContainerManager.getActive();
+		const activeContainer = NavigableContainerManager.getActive();
 		activeContainer?.focusPreviousWidget();
 	}
 });
@@ -135,15 +135,15 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	id: 'widgetNavigation.focusNext',
 	weight: KeybindingWeight.WorkbenchContrib,
 	when: ContextKeyExpr.and(
-		NavigatableContainerFocusedContextKey,
+		NavigableContainerFocusedContextKey,
 		ContextKeyExpr.or(
 			WorkbenchListFocusContextKey?.negate(),
 			WorkbenchListScrollAtBottomContextKey,
 		)
 	),
 	primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
 	handler: () => {
-		const activeContainer = NavigatableContainerManager.getActive();
+		const activeContainer = NavigableContainerManager.getActive();
 		activeContainer?.focusNextWidget();
 	}
 });
diff --git a/src/vs/workbench/contrib/comments/browser/commentsView.ts b/src/vs/workbench/contrib/comments/browser/commentsView.ts
@@ -42,7 +42,7 @@ import { ITreeElement } from 'vs/base/browser/ui/tree/tree';
 import { Iterable } from 'vs/base/common/iterator';
 import { CommentController } from 'vs/workbench/contrib/comments/browser/commentsController';
 import { Range } from 'vs/editor/common/core/range';
-import { registerNavigatableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
+import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
 
 const CONTEXT_KEY_HAS_COMMENTS = new RawContextKey<boolean>('commentsView.hasComments', false);
 const CONTEXT_KEY_SOME_COMMENTS_EXPANDED = new RawContextKey<boolean>('commentsView.someCommentsExpanded', false);
@@ -148,7 +148,7 @@ export class CommentsPanel extends FilterViewPane implements ICommentsView {
 
 	override render(): void {
 		super.render();
-		this._register(registerNavigatableContainer({
+		this._register(registerNavigableContainer({
 			focusNotifiers: [this, this.filterWidget],
 			focusNextWidget: () => {
 				if (this.filterWidget.hasFocus()) {
diff --git a/src/vs/workbench/contrib/debug/browser/repl.ts b/src/vs/workbench/contrib/debug/browser/repl.ts
@@ -68,7 +68,7 @@ import { CONTEXT_DEBUG_STATE, CONTEXT_IN_DEBUG_REPL, CONTEXT_MULTI_SESSION_REPL,
 import { Variable } from 'vs/workbench/contrib/debug/common/debugModel';
 import { ReplEvaluationResult, ReplGroup } from 'vs/workbench/contrib/debug/common/replModel';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { registerNavigatableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
+import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
 
 const $ = dom.$;
 
@@ -566,7 +566,7 @@ export class Repl extends FilterViewPane implements IHistoryNavigationWidget {
 
 	override render(): void {
 		super.render();
-		this._register(registerNavigatableContainer({
+		this._register(registerNavigableContainer({
 			focusNotifiers: [this, this.filterWidget],
 			focusNextWidget: () => {
 				if (this.filterWidget.hasFocus()) {
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
@@ -61,7 +61,7 @@ import { extractEditorsAndFilesDropData } from 'vs/platform/dnd/browser/dnd';
 import { extname } from 'vs/base/common/resources';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ILocalizedString } from 'vs/platform/action/common/action';
-import { registerNavigatableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
+import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
 
 export const DefaultViewsContext = new RawContextKey<boolean>('defaultExtensionViews', true);
 export const ExtensionsSortByContext = new RawContextKey<string>('extensionsSortByValue', '');
@@ -614,7 +614,7 @@ export class ExtensionsViewPaneContainer extends ViewPaneContainer implements IE
 
 		const focusTracker = this._register(trackFocus(this.root));
 		const isSearchBoxFocused = () => this.searchBox?.inputWidget.hasWidgetFocus();
-		this._register(registerNavigatableContainer({
+		this._register(registerNavigableContainer({
 			focusNotifiers: [focusTracker],
 			focusNextWidget: () => {
 				if (isSearchBoxFocused()) {
diff --git a/src/vs/workbench/contrib/markers/browser/markersView.ts b/src/vs/workbench/contrib/markers/browser/markersView.ts
@@ -54,7 +54,7 @@ import { ResourceListDnDHandler } from 'vs/workbench/browser/dnd';
 import { ITableContextMenuEvent, ITableEvent } from 'vs/base/browser/ui/table/table';
 import { MarkersTable } from 'vs/workbench/contrib/markers/browser/markersTable';
 import { Markers, MarkersContextKeys, MarkersViewMode } from 'vs/workbench/contrib/markers/common/markers';
-import { registerNavigatableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
+import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
 
 function createResourceMarkersIterator(resourceMarkers: ResourceMarkers): Iterable<ITreeElement<MarkerElement>> {
 	return Iterable.map(resourceMarkers.markers, m => {
@@ -184,7 +184,7 @@ export class MarkersView extends FilterViewPane implements IMarkersView {
 
 	override render(): void {
 		super.render();
-		this._register(registerNavigatableContainer({
+		this._register(registerNavigableContainer({
 			focusNotifiers: [this, this.filterWidget],
 			focusNextWidget: () => {
 				if (this.filterWidget.hasFocus()) {
diff --git a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts
@@ -56,7 +56,7 @@ import { CompletionItemKind } from 'vs/editor/common/languages';
 import { settingsTextInputBorder } from 'vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { AccessibilityVerbositySettingId } from 'vs/workbench/contrib/accessibility/browser/accessibilityContribution';
-import { registerNavigatableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
+import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
 
 const $ = DOM.$;
 
@@ -137,7 +137,7 @@ export class KeybindingsEditor extends EditorPane implements IKeybindingsEditorP
 
 	override create(parent: HTMLElement): void {
 		super.create(parent);
-		this._register(registerNavigatableContainer({
+		this._register(registerNavigableContainer({
 			focusNotifiers: [this],
 			focusNextWidget: () => {
 				if (this.searchWidget.hasFocus()) {
diff --git a/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts b/src/vs/workbench/contrib/testing/browser/testingExplorerView.ts
@@ -71,7 +71,7 @@ import { ITestingPeekOpener } from 'vs/workbench/contrib/testing/common/testingP
 import { cmpPriority, isFailedState, isStateWithResult } from 'vs/workbench/contrib/testing/common/testingStates';
 import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { registerNavigatableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
+import { registerNavigableContainer } from 'vs/workbench/browser/actions/widgetNavigationCommands';
 
 const enum LastFocusState {
 	Input,
@@ -251,7 +251,7 @@ export class TestingExplorerView extends ViewPane {
 
 	override render(): void {
 		super.render();
-		this._register(registerNavigatableContainer({
+		this._register(registerNavigableContainer({
 			focusNotifiers: [this],
 			focusNextWidget: () => {
 				if (!this.viewModel.tree.isDOMFocused()) {
