Move Data Explorer action bar actions to Editor Actions and the Edito…

…r Action Bar (#6000)

src/vs/editor/common/config/editorOptions.ts

@@ -3149,8 +3149,10 @@ class EditorActionBar extends BaseEditorOption<EditorOption.actionBar, IEditorAc
 				'editor.actionBar.enabled': {
 					type: 'boolean',
 					default: defaults.enabled,
-					description: nls.localize('actionBar.enabled', "Controls whether the action bar is shown."),
-
+					description: nls.localize(
+						'actionBar.enabled',
+						"Controls whether the action bar is shown."
+					),
 				}
 			}
 		);

src/vs/platform/action/common/action.ts

@@ -96,6 +96,14 @@ export interface ICommandAction {
 	 * or define toggle-info including an icon and a title that goes well with a checkmark.
 	 */
 	toggled?: ContextKeyExpression | ICommandActionToggleInfo;
+
+	// --- Start Positron
+	/**
+	 * Gets or sets a value which indicates whether to display the title for the action when it
+	 * appears on an action bar.
+	 */
+	displayTitleOnActionBar?: boolean;
+	// --- End Positron
 }
 
 export type ISerializableCommandAction = UriDto<ICommandAction>;

src/vs/platform/actions/common/actions.ts

@@ -513,6 +513,14 @@ export class MenuItemAction implements IAction {
 	readonly enabled: boolean;
 	readonly checked?: boolean;
 
+	// --- Start Positron ---
+	/**
+	 * Gets a value which indicates whether to display the title for the action when it appears on
+	 * an action bar.
+	 */
+	readonly displayTitleOnActionBar?: boolean;
+	// --- End Positron ---
+
 	constructor(
 		item: ICommandAction,
 		alt: ICommandAction | undefined,
@@ -528,6 +536,10 @@ export class MenuItemAction implements IAction {
 		this.enabled = !item.precondition || contextKeyService.contextMatchesRules(item.precondition);
 		this.checked = undefined;
 
+		// --- Start Positron ---
+		this.displayTitleOnActionBar = item.displayTitleOnActionBar;
+		// --- End Positron ---
+
 		let icon: ThemeIcon | undefined;
 
 		if (item.toggled) {

src/vs/platform/positronActionBar/browser/components/actionBarActionButton.tsx

@@ -143,6 +143,11 @@ export const ActionBarActionButton = (props: ActionBarActionButtonProps) => {
 				action,
 				!useAlternativeAction
 			),
+			text: action instanceof MenuItemAction ?
+				action.displayTitleOnActionBar ?
+					action.label :
+					undefined :
+				undefined,
 			disabled: !action.enabled,
 			onMouseEnter: () => setMouseInside(true),
 			onMouseLeave: () => setMouseInside(false),

src/vs/platform/positronActionBar/browser/components/actionBarButton.css

@@ -63,6 +63,10 @@
 	text-overflow: ellipsis;
 }
 
+.disabled .action-bar-button-text {
+	color: var(--positronActionBar-disabledForeground);
+}
+
 .action-bar-button-icon {
 	padding: 0 6px;
 	align-items: center;

src/vs/workbench/browser/parts/editor/editorActionBarControl.tsx

@@ -31,7 +31,7 @@ import { IAccessibilityService } from '../../../../platform/accessibility/common
  * Constants.
  */
 const EDITOR_ACTION_BAR_HEIGHT = 32;
-const CONFIGURATION_SETTING = 'editor.actionBar.enabled';
+export const EDITOR_ACTION_BAR_CONFIGURATION_SETTING = 'editor.actionBar.enabled';
 
 /**
  * EditorActionBarControl class.
@@ -212,7 +212,7 @@ export class EditorActionBarControlFactory {
 		@IInstantiationService private readonly _instantiationService: IInstantiationService
 	) {
 		// Check if the configuration setting is enabled. If so, create the control.
-		if (this._configurationService.getValue<boolean>(CONFIGURATION_SETTING)) {
+		if (this._configurationService.getValue<boolean>(EDITOR_ACTION_BAR_CONFIGURATION_SETTING)) {
 			this.createControl();
 		}
 
@@ -227,9 +227,9 @@ export class EditorActionBarControlFactory {
 		// configuration setting.
 		this._disposables.add(this._configurationService.onDidChangeConfiguration(e => {
 			// Check if the configuration setting has changed.
-			if (e.affectsConfiguration(CONFIGURATION_SETTING)) {
+			if (e.affectsConfiguration(EDITOR_ACTION_BAR_CONFIGURATION_SETTING)) {
 				// Process the change.
-				if (this._configurationService.getValue(CONFIGURATION_SETTING)) {
+				if (this._configurationService.getValue(EDITOR_ACTION_BAR_CONFIGURATION_SETTING)) {
 					// Create the control, if it doesn't exist.
 					if (!this._control) {
 						this.createControl();

src/vs/workbench/browser/parts/editor/editorActionBarFactory.tsx

@@ -194,19 +194,17 @@ export class EditorActionBarFactory extends Disposable {
 		];
 
 		// Splice the move editor to new window command button into the right action bar elements.
-		if (auxiliaryWindow !== undefined) {
-			rightActionBarElements.splice(
-				rightActionBarElements.length - 1,
-				0,
-				<ActionBarCommandButton
-					disabled={auxiliaryWindow}
-					iconId='positron-open-in-new-window'
-					tooltip={positronMoveIntoNewWindowTooltip}
-					ariaLabel={positronMoveIntoNewWindowAriaLabel}
-					commandId='workbench.action.moveEditorToNewWindow'
-				/>
-			);
-		}
+		rightActionBarElements.splice(
+			rightActionBarElements.length - 1,
+			0,
+			<ActionBarCommandButton
+				disabled={auxiliaryWindow}
+				iconId='positron-open-in-new-window'
+				tooltip={positronMoveIntoNewWindowTooltip}
+				ariaLabel={positronMoveIntoNewWindowAriaLabel}
+				commandId='workbench.action.moveEditorToNewWindow'
+			/>
+		);
 
 		// Return the action bar.
 		return (

src/vs/workbench/browser/positronDataExplorer/components/dataExplorerPanel/dataExplorerPanel.css

@@ -9,6 +9,5 @@
 	min-width: 0;
 	min-height: 0;
 	display: grid;
-	grid-row: data-explorer-panel / end;
 	grid-template-rows: [filter-bar] min-content [data-explorer] 1fr [status-bar] 24px [end];
 }

src/vs/workbench/browser/positronDataExplorer/positronDataExplorer.css

@@ -8,9 +8,7 @@
 	height: 100%;
 	min-width: 0;
 	min-height: 0;
-	display: grid;
 	position: relative;
 	color: var(--vscode-positronDataExplorer-foreground);
 	background-color: var(--vscode-positronDataExplorer-background);
-	grid-template-rows: [action-bar] 32px [data-explorer-panel] 1fr [end];
 }

src/vs/workbench/browser/positronDataExplorer/positronDataExplorer.tsx

@@ -12,12 +12,11 @@ import React, { PropsWithChildren, useEffect, useState } from 'react';
 // Other dependencies.
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { ILayoutService } from '../../../platform/layout/browser/layoutService.js';
+import { PositronDataExplorerContextProvider } from './positronDataExplorerContext.js';
+import { DataExplorerPanel } from './components/dataExplorerPanel/dataExplorerPanel.js';
 import { IClipboardService } from '../../../platform/clipboard/common/clipboardService.js';
 import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
-import { ActionBar } from './components/actionBar/actionBar.js';
 import { PositronActionBarServices } from '../../../platform/positronActionBar/browser/positronActionBarState.js';
-import { PositronDataExplorerContextProvider } from './positronDataExplorerContext.js';
-import { DataExplorerPanel } from './components/dataExplorerPanel/dataExplorerPanel.js';
 import { IPositronDataExplorerInstance } from '../../services/positronDataExplorer/browser/interfaces/positronDataExplorerInstance.js';
 import { PositronDataExplorerClosed, PositronDataExplorerClosedStatus } from './components/dataExplorerClosed/positronDataExplorerClosed.js';
 
@@ -89,7 +88,6 @@ export const PositronDataExplorer = (props: PropsWithChildren<PositronDataExplor
 	return (
 		<PositronDataExplorerContextProvider {...props}>
 			<div className='positron-data-explorer'>
-				<ActionBar />
 				<DataExplorerPanel />
 				{closed && (
 					<PositronDataExplorerClosed

src/vs/workbench/browser/positronDataGrid/classes/dataGridInstance.tsx

@@ -741,6 +741,11 @@ export abstract class DataGridInstance extends Disposable {
 	 */
 	protected readonly _onDidUpdateEmitter = this._register(new Emitter<void>);
 
+	/**
+	 * The onDidChangeColumnSorting event emitter.
+	 */
+	protected readonly _onDidChangeColumnSortingEmitter = this._register(new Emitter<boolean>);
+
 	//#endregion Protected Events
 
 	//#region Constructor & Dispose
@@ -1178,6 +1183,13 @@ export abstract class DataGridInstance extends Disposable {
 		return this._cursorRowIndex;
 	}
 
+	/**
+	 * Gets a value which indicates whether column sorting is active.
+	 */
+	get isColumnSorting() {
+		return this._columnSortKeys.size > 0;
+	}
+
 	//#endregion Public Properties
 
 	//#region Public Events
@@ -1187,6 +1199,11 @@ export abstract class DataGridInstance extends Disposable {
 	 */
 	readonly onDidUpdate = this._onDidUpdateEmitter.event;
 
+	/**
+	 * onDidChangeColumnSorting event.
+	 */
+	readonly onDidChangeColumnSorting = this._onDidChangeColumnSortingEmitter.event;
+
 	//#endregion Public Events
 
 	//#region Public Methods
@@ -1433,25 +1450,22 @@ export abstract class DataGridInstance extends Disposable {
 				columnIndex,
 				new ColumnSortKeyDescriptor(this._columnSortKeys.size, columnIndex, ascending)
 			);
-
-			// Fire the onDidUpdate event.
-			this._onDidUpdateEmitter.fire();
-
-			// Sort the data.
-			await this.doSortData();
+		} else if (ascending !== columnSortKey.ascending) {
+			// Update the column sort key.
+			columnSortKey.ascending = ascending;
 		} else {
-			// If the sort order has changed, update the column sort key.
-			if (ascending !== columnSortKey.ascending) {
-				// Update the sort order.
-				columnSortKey.ascending = ascending;
+			// Sorting has not unchanged. Do nothing.
+			return;
+		}
 
-				// Fire the onDidUpdate event.
-				this._onDidUpdateEmitter.fire();
+		// Fire the onDidChangeColumnSorting event.
+		this._onDidChangeColumnSortingEmitter.fire(true);
 
-				// Sort the data.
-				await this.doSortData();
-			}
-		}
+		// Fire the onDidUpdate event.
+		this._onDidUpdateEmitter.fire();
+
+		// Sort the data.
+		await this.doSortData();
 	}
 
 	/**
@@ -1476,6 +1490,9 @@ export abstract class DataGridInstance extends Disposable {
 				}
 			});
 
+			// Fire the onDidChangeColumnSorting event.
+			this._onDidChangeColumnSortingEmitter.fire(this._columnSortKeys.size > 0);
+
 			// Fire the onDidUpdate event.
 			this._onDidUpdateEmitter.fire();
 
@@ -1492,6 +1509,9 @@ export abstract class DataGridInstance extends Disposable {
 		// Clear column sort keys.
 		this._columnSortKeys.clear();
 
+		// Fire the onDidChangeColumnSorting event.
+		this._onDidChangeColumnSortingEmitter.fire(false);
+
 		// Fire the onDidUpdate event.
 		this._onDidUpdateEmitter.fire();
 

src/vs/workbench/browser/workbench.ts

@@ -49,6 +49,11 @@ import { AccessibilityProgressSignalScheduler } from '../../platform/accessibili
 import { setProgressAcccessibilitySignalScheduler } from '../../base/browser/ui/progressbar/progressAccessibilitySignal.js';
 import { AccessibleViewRegistry } from '../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { NotificationAccessibleView } from './parts/notifications/notificationAccessibleView.js';
+// --- Start Positron ---
+// eslint-disable-next-line no-duplicate-imports
+import { LayoutSettings, EditorActionsLocation } from '../services/layout/browser/layoutService.js';
+import { EDITOR_ACTION_BAR_CONFIGURATION_SETTING } from './parts/editor/editorActionBarControl.js';
+// --- End Positron ---
 
 export interface IWorkbenchOptions {
 
@@ -218,6 +223,27 @@ export class Workbench extends Layout {
 		// Configuration changes
 		this._register(configurationService.onDidChangeConfiguration(e => this.updateFontAliasing(e, configurationService)));
 
+		// --- Start Positron ---
+		// Add a onDidChangeConfiguration event listener to listen for changes to the editor action
+		// bar configuration setting. This is a temporary workaround that hides editor actions when
+		// the user has configured the editor action bar to be enabled. Eventually, editor actions
+		// will be replaced by the editor action bar. This approach allows testers to use both the
+		// editor actions and the editor action bar by adjusting the editor actions location after
+		// enabling the editor action bar.
+		this._register(configurationService.onDidChangeConfiguration(async e => {
+			// Check whether the editor action bar configuration setting has changed.
+			if (e.affectsConfiguration(EDITOR_ACTION_BAR_CONFIGURATION_SETTING)) {
+				// Process the editor action bar configuration setting.
+				await configurationService.updateValue(
+					LayoutSettings.EDITOR_ACTIONS_LOCATION,
+					configurationService.getValue(EDITOR_ACTION_BAR_CONFIGURATION_SETTING) ?
+						EditorActionsLocation.HIDDEN :
+						EditorActionsLocation.DEFAULT
+				);
+			}
+		}));
+		// --- End Positron ---
+
 		// Font Info
 		if (isNative) {
 			this._register(storageService.onWillSaveState(e => {

src/vs/workbench/contrib/codeEditor/browser/codeEditor.contribution.ts

@@ -14,6 +14,7 @@ import './inspectEditorTokens/inspectEditorTokens.js';
 import './quickaccess/gotoLineQuickAccess.js';
 import './quickaccess/gotoSymbolQuickAccess.js';
 import './saveParticipants.js';
+import './toggleActionBar.js';
 import './toggleColumnSelection.js';
 import './toggleMinimap.js';
 import './toggleMultiCursorModifier.js';

src/vs/workbench/contrib/codeEditor/browser/toggleActionBar.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { localize, localize2 } from '../../../../nls.js';
-import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { Action2, MenuId, registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
@@ -27,8 +27,8 @@ export class ToggleActionBarAction extends Action2 {
 		super({
 			id: ToggleActionBarAction.ID,
 			title: {
-				...localize2('toggleActionBar', "Toggle Editor Action Bar"),
-				mnemonicTitle: localize({ key: 'miActionBar', comment: ['&& denotes a mnemonic'] }, "&&Editor Action Bar"),
+				...localize2('toggleActionBar', "Toggle Action Bar"),
+				mnemonicTitle: localize({ key: 'miActionBar', comment: ['&& denotes a mnemonic'] }, "&&Action Bar"),
 			},
 			category: Categories.View,
 			f1: true,
@@ -49,8 +49,8 @@ export class ToggleActionBarAction extends Action2 {
 		// Get the configuration service.
 		const configurationService = accessor.get(IConfigurationService);
 
-		// Update the value.
-		return configurationService.updateValue(
+		// Update the action bar enabled state.
+		await configurationService.updateValue(
 			'editor.actionBar.enabled',
 			!configurationService.getValue('editor.actionBar.enabled')
 		);
@@ -60,5 +60,4 @@ export class ToggleActionBarAction extends Action2 {
 /**
  * Registers the action.
  */
-// At the moment, do not register the ToggleActionBarAction because it is still experimental.
-// registerAction2(ToggleActionBarAction);
+registerAction2(ToggleActionBarAction);