Merge branch 'main' into fix/terminal-suggestion-positioning

microsoft · Nov 28, 2023 · 98eb658 · 98eb658
2 parents ddf6e96 + 1501e97
commit 98eb658
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/extensions/microsoft-authentication/src/AADHelper.ts b/extensions/microsoft-authentication/src/AADHelper.ts
@@ -536,7 +536,7 @@ export class AzureActiveDirectoryService {
 			scope: scopeData.scopeStr,
 			sessionId,
 			account: {
-				label: claims.email ?? claims.preferred_username ?? claims.unique_name ?? 'user@example.com',
+				label: claims.preferred_username ?? claims.email ?? claims.unique_name ?? 'user@example.com',
 				id,
 				type: claims.tid === MSA_TID || claims.tid === MSA_PASSTHRU_TID ? MicrosoftAccountType.MSA : MicrosoftAccountType.AAD
 			}

diff --git a/product.json b/product.json
@@ -50,8 +50,8 @@
 		},
 		{
 			"name": "ms-vscode.js-debug",
-			"version": "1.84.0",
-			"sha256": "a57691eb4440e549edba7472c0313e94f24d46ebe1ede18784b552fc5d11e596",
+			"version": "1.85.0",
+			"sha256": "85a97d373a6f92359f5db7bfc5a2fa6c5763b22c6ad07c962dfe32c84a079f3b",
 			"repo": "https://github.com/microsoft/vscode-js-debug",
 			"metadata": {
 				"id": "25629058-ddac-4e17-abba-74678e126c5d",
@@ -66,8 +66,8 @@
 		},
 		{
 			"name": "ms-vscode.vscode-js-profile-table",
-			"version": "1.0.7",
-			"sha256": "76924898456e45c1071a0ac4d31990bb740b689177665df915f3d39c7b767ba7",
+			"version": "1.0.8",
+			"sha256": "ca30069e21fbf576b49638ff8ff7c316b028c2faca924c23526737c65b8762bf",
 			"repo": "https://github.com/microsoft/vscode-js-profile-visualizer",
 			"metadata": {
 				"id": "7e52b41b-71ad-457b-ab7e-0620f1fc4feb",

diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
@@ -55,7 +55,7 @@ import { mainWindow } from 'vs/base/browser/window';
 interface ILayoutRuntimeState {
 	activeContainerId: number;
 	fullscreen: boolean;
-	maximized: Set<number>;
+	readonly maximized: Set<number>;
 	hasFocus: boolean;
 	mainWindowBorder: boolean;
 	readonly menuBar: {
@@ -538,6 +538,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		const activeBorder = theme.getColor(WINDOW_ACTIVE_BORDER);
 		const inactiveBorder = theme.getColor(WINDOW_INACTIVE_BORDER);
 
+		const didHaveMainWindowBorder = this.hasMainWindowBorder();
+
 		for (const container of this.containers) {
 			const isMainContainer = container === this.mainContainer;
 			const isActiveContainer = this.activeContainer === container;
@@ -559,7 +561,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 			container.classList.toggle(LayoutClasses.WINDOW_BORDER, windowBorder);
 		}
 
-		if (!skipLayout) {
+		if (!skipLayout && didHaveMainWindowBorder !== this.hasMainWindowBorder()) {
 			this.layout();
 		}
 	}

diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -258,6 +258,8 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
 		'scm.inputMaxLines': {
 			type: 'number',
 			markdownDescription: localize('inputMaxLines', "Controls the maximum number of lines that the input will auto-grow to."),
+			minimum: 1,
+			maximum: 50,
 			default: 10
 		},
 		'scm.alwaysShowRepositories': {

diff --git a/src/vs/workbench/contrib/scm/browser/scmViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmViewPane.ts
@@ -103,6 +103,7 @@ import { foreground, listActiveSelectionForeground, registerColor, transparent }
 import { IMenuWorkbenchToolBarOptions, WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
 import { DropdownWithPrimaryActionViewItem } from 'vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
+import { clamp } from 'vs/base/common/numbers';
 
 // type SCMResourceTreeNode = IResourceNode<ISCMResource, ISCMResourceGroup>;
 // type SCMHistoryItemChangeResourceTreeNode = IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement>;
@@ -2465,7 +2466,8 @@ class SCMInputWidget {
 	}
 
 	private getInputEditorMaxLines(): number {
-		return this.configurationService.getValue<number>('scm.inputMaxLines');
+		const inputMaxLines = this.configurationService.getValue('scm.inputMaxLines');
+		return typeof inputMaxLines === 'number' ? clamp(inputMaxLines, 1, 50) : 10;
 	}
 
 	private getInputEditorMaxHeight(): number {

diff --git a/src/vs/workbench/services/host/browser/browserHostService.ts b/src/vs/workbench/services/host/browser/browserHostService.ts
@@ -147,15 +147,15 @@ export class BrowserHostService extends Disposable implements IHostService {
 			const focusTracker = disposables.add(trackFocus(window));
 			const visibilityTracker = disposables.add(new DomEmitter(window.document, 'visibilitychange'));
 
-			Event.latch(Event.any(
+			Event.any(
 				Event.map(focusTracker.onDidFocus, () => this.hasFocus, disposables),
 				Event.map(focusTracker.onDidBlur, () => this.hasFocus, disposables),
 				Event.map(visibilityTracker.event, () => this.hasFocus, disposables),
 				Event.map(this.onDidChangeActiveWindow, () => this.hasFocus, disposables),
-			), undefined, disposables)(focus => emitter.fire(focus));
+			)(focus => emitter.fire(focus));
 		}, { window: mainWindow, disposables: this._store }));
 
-		return emitter.event;
+		return Event.latch(emitter.event, undefined, this._store);
 	}
 
 	get hasFocus(): boolean {