Merge branch 'main' into hediet/b/binding-sailfish

Author: hediet

.github/workflows/deep-classifier-runner.yml

@@ -47,6 +47,8 @@ jobs:
         with:
           configPath: classifier
           allowLabels: "info-needed|new release|error-telemetry|*english-please|translation-required"
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
-          manifestDbConnectionString: ${{secrets.MANIFEST_DB_CONNECTION_STRING}}
+          tenantId: ${{secrets.TOOLS_TENANT_ID}}
+          clientId: ${{secrets.TOOLS_CLIENT_ID}}
+          clientSecret: ${{secrets.TOOLS_CLIENT_SECRET}}
+          clientScope: ${{secrets.TOOLS_CLIENT_SCOPE}}
           token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}

src/vs/base/browser/ui/grid/gridview.ts

@@ -356,6 +356,13 @@ class BranchNode implements ISplitView<ILayoutContext>, IDisposable {
 	private _boundarySashes: IRelativeBoundarySashes = {};
 	get boundarySashes(): IRelativeBoundarySashes { return this._boundarySashes; }
 	set boundarySashes(boundarySashes: IRelativeBoundarySashes) {
+		if (this._boundarySashes.start === boundarySashes.start
+			&& this._boundarySashes.end === boundarySashes.end
+			&& this._boundarySashes.orthogonalStart === boundarySashes.orthogonalStart
+			&& this._boundarySashes.orthogonalEnd === boundarySashes.orthogonalEnd) {
+			return;
+		}
+
 		this._boundarySashes = boundarySashes;
 
 		this.splitview.orthogonalStartSash = boundarySashes.orthogonalStart;
@@ -498,65 +505,20 @@ class BranchNode implements ISplitView<ILayoutContext>, IDisposable {
 		index = validateIndex(index, this.children.length);
 
 		this.splitview.addView(node, size, index, skipLayout);
-		this._addChild(node, index);
-		this.onDidChildrenChange();
-	}
-
-	private _addChild(node: Node, index: number): void {
-		const first = index === 0;
-		const last = index === this.children.length;
 		this.children.splice(index, 0, node);
 
-		node.boundarySashes = {
-			start: this.boundarySashes.orthogonalStart,
-			end: this.boundarySashes.orthogonalEnd,
-			orthogonalStart: first ? this.boundarySashes.start : this.splitview.sashes[index - 1],
-			orthogonalEnd: last ? this.boundarySashes.end : this.splitview.sashes[index],
-		};
-
-		if (!first) {
-			this.children[index - 1].boundarySashes = {
-				...this.children[index - 1].boundarySashes,
-				orthogonalEnd: this.splitview.sashes[index - 1]
-			};
-		}
-
-		if (!last) {
-			this.children[index + 1].boundarySashes = {
-				...this.children[index + 1].boundarySashes,
-				orthogonalStart: this.splitview.sashes[index]
-			};
-		}
+		this.updateBoundarySashes();
+		this.onDidChildrenChange();
 	}
 
 	removeChild(index: number, sizing?: Sizing): void {
 		index = validateIndex(index, this.children.length);
 
 		this.splitview.removeView(index, sizing);
-		this._removeChild(index);
-		this.onDidChildrenChange();
-	}
+		this.children.splice(index, 1);
 
-	private _removeChild(index: number): Node {
-		const first = index === 0;
-		const last = index === this.children.length - 1;
-		const [child] = this.children.splice(index, 1);
-
-		if (!first) {
-			this.children[index - 1].boundarySashes = {
-				...this.children[index - 1].boundarySashes,
-				orthogonalEnd: this.splitview.sashes[index - 1]
-			};
-		}
-
-		if (!last) { // [0,1,2,3] (2) => [0,1,3]
-			this.children[index].boundarySashes = {
-				...this.children[index].boundarySashes,
-				orthogonalStart: this.splitview.sashes[Math.max(index - 1, 0)]
-			};
-		}
-
-		return child;
+		this.updateBoundarySashes();
+		this.onDidChildrenChange();
 	}
 
 	moveChild(from: number, to: number): void {
@@ -568,14 +530,13 @@ class BranchNode implements ISplitView<ILayoutContext>, IDisposable {
 		}
 
 		if (from < to) {
-			to--;
+			to -= 1;
 		}
 
 		this.splitview.moveView(from, to);
+		this.children.splice(to, 0, this.children.splice(from, 1)[0]);
 
-		const child = this._removeChild(from);
-		this._addChild(child, to);
-
+		this.updateBoundarySashes();
 		this.onDidChildrenChange();
 	}
 
@@ -649,6 +610,17 @@ class BranchNode implements ISplitView<ILayoutContext>, IDisposable {
 		return this.splitview.getViewCachedVisibleSize(index);
 	}
 
+	private updateBoundarySashes(): void {
+		for (let i = 0; i < this.children.length; i++) {
+			this.children[i].boundarySashes = {
+				start: this.boundarySashes.orthogonalStart,
+				end: this.boundarySashes.orthogonalEnd,
+				orthogonalStart: i === 0 ? this.boundarySashes.start : this.splitview.sashes[i - 1],
+				orthogonalEnd: i === this.children.length - 1 ? this.boundarySashes.end : this.splitview.sashes[i],
+			};
+		}
+	}
+
 	private onDidChildrenChange(): void {
 		this.updateChildrenEvents();
 		this._onDidChange.fire(undefined);

src/vs/base/browser/ui/sash/sash.ts

@@ -328,6 +328,10 @@ export class Sash extends Disposable {
 	 * The start of a vertical sash is its top-most position.
 	 */
 	set orthogonalStartSash(sash: Sash | undefined) {
+		if (this._orthogonalStartSash === sash) {
+			return;
+		}
+
 		this.orthogonalStartDragHandleDisposables.clear();
 		this.orthogonalStartSashDisposables.clear();
 
@@ -362,6 +366,10 @@ export class Sash extends Disposable {
 	 */
 
 	set orthogonalEndSash(sash: Sash | undefined) {
+		if (this._orthogonalEndSash === sash) {
+			return;
+		}
+
 		this.orthogonalEndDragHandleDisposables.clear();
 		this.orthogonalEndSashDisposables.clear();
 

src/vs/workbench/contrib/accessibility/browser/accessibleView.ts

@@ -16,6 +16,7 @@ import { AccessibilityHelpNLS } from 'vs/editor/common/standaloneStrings';
 import { LinkDetector } from 'vs/editor/contrib/links/browser/links';
 import { localize } from 'vs/nls';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IContextViewDelegate, IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -56,20 +57,23 @@ export interface IAccessibleViewOptions {
 	type: AccessibleViewType;
 }
 
+export const accessibilityHelpIsShown = new RawContextKey<boolean>('accessibilityHelpIsShown', false, true);
 class AccessibleView extends Disposable {
 	private _editorWidget: CodeEditorWidget;
+	private _accessiblityHelpIsShown: IContextKey<boolean>;
 	get editorWidget() { return this._editorWidget; }
 	private _editorContainer: HTMLElement;
 	private _keyListener: IDisposable | undefined;
-
 	constructor(
 		@IOpenerService private readonly _openerService: IOpenerService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@IModelService private readonly _modelService: IModelService,
-		@IContextViewService private readonly _contextViewService: IContextViewService
+		@IContextViewService private readonly _contextViewService: IContextViewService,
+		@IContextKeyService private readonly _contextKeyService: IContextKeyService
 	) {
 		super();
+		this._accessiblityHelpIsShown = accessibilityHelpIsShown.bindTo(this._contextKeyService);
 		this._editorContainer = document.createElement('div');
 		this._editorContainer.classList.add('accessible-view');
 		const codeEditorWidgetOptions: ICodeEditorWidgetOptions = {
@@ -96,9 +100,17 @@ class AccessibleView extends Disposable {
 			getAnchor: () => this._editorContainer,
 			render: (container) => {
 				return this._render(provider, container);
+			},
+			onHide: () => {
+				if (provider.options.type === AccessibleViewType.HelpMenu) {
+					this._accessiblityHelpIsShown.reset();
+				}
 			}
 		};
 		this._contextViewService.showContextView(delegate);
+		if (provider.options.type === AccessibleViewType.HelpMenu) {
+			this._accessiblityHelpIsShown.set(true);
+		}
 	}
 
 	private _render(provider: IAccessibleContentProvider, container: HTMLElement): IDisposable {

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

@@ -26,6 +26,8 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { AccessibilitySupport, IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
 import { TabFocus, TabFocusContext } from 'vs/editor/browser/config/tabFocus';
+import { accessibilityHelpIsShown } from 'vs/workbench/contrib/accessibility/browser/accessibleView';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 
 const CONTEXT_ACCESSIBILITY_WIDGET_VISIBLE = new RawContextKey<boolean>('accessibilityHelpWidgetVisible', false);
 
@@ -279,6 +281,11 @@ class ToggleScreenReaderMode extends Action2 {
 			id: 'editor.action.toggleScreenReaderAccessibilityMode',
 			title: { value: nls.localize('toggleScreenReaderMode', "Toggle Screen Reader Accessibility Mode"), original: 'Toggle Screen Reader Accessibility Mode' },
 			f1: true,
+			keybinding: {
+				primary: KeyMod.CtrlCmd | KeyCode.KeyE,
+				weight: KeybindingWeight.WorkbenchContrib + 10,
+				when: accessibilityHelpIsShown
+			}
 		});
 	}
 

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

@@ -47,7 +47,7 @@ const targetMenus = [
 class ShareWorkbenchContribution {
 	private static SHARE_ENABLED_SETTING = 'workbench.experimental.share.enabled';
 
-	private _disposables = new DisposableStore();
+	private _disposables: DisposableStore | undefined;
 
 	constructor(
 		@IShareService private readonly shareService: IShareService,
@@ -58,16 +58,22 @@ class ShareWorkbenchContribution {
 		}
 		this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(ShareWorkbenchContribution.SHARE_ENABLED_SETTING)) {
-				if (this.configurationService.getValue<boolean>(ShareWorkbenchContribution.SHARE_ENABLED_SETTING)) {
+				const settingValue = this.configurationService.getValue<boolean>(ShareWorkbenchContribution.SHARE_ENABLED_SETTING);
+				if (settingValue === true && this._disposables === undefined) {
 					this.registerActions();
-				} else {
-					this._disposables.clear();
+				} else if (settingValue === false && this._disposables !== undefined) {
+					this._disposables?.clear();
+					this._disposables = undefined;
 				}
 			}
 		});
 	}
 
 	private registerActions() {
+		if (!this._disposables) {
+			this._disposables = new DisposableStore();
+		}
+
 		this._disposables.add(
 			registerAction2(class ShareAction extends Action2 {
 				static readonly ID = 'workbench.action.share';