h

Merge branch 'main' into merogge/problem-marker

extensions/git/package.json

@@ -1893,26 +1893,6 @@
           "default": [],
           "scope": "resource"
         },
-        "git.branchProtectionIndicator": {
-          "type": "object",
-          "additionalProperties": false,
-          "description": "%config.branchProtectionIndicator%",
-          "properties": {
-            "quickOpen": {
-              "type": "boolean",
-              "description": "%config.branchProtectionIndicator.quickOpen%"
-            },
-            "statusBar": {
-              "type": "boolean",
-              "description": "%config.branchProtectionIndicator.statusBar%"
-            }
-          },
-          "default": {
-            "quickOpen": true,
-            "statusBar": true
-          },
-          "scope": "resource"
-        },
         "git.branchProtectionPrompt": {
           "type": "string",
           "description": "%config.branchProtectionPrompt%",

extensions/git/package.nls.json

@@ -122,9 +122,6 @@
 	"config.checkoutType.remote": "Remote branches",
 	"config.branchPrefix": "Prefix used when creating a new branch.",
 	"config.branchProtection": "List of protected branches. By default, a prompt is shown before changes are committed to a protected branch. The prompt can be controlled using the `#git.branchProtectionPrompt#`  setting.",
-	"config.branchProtectionIndicator": "Controls whether an indicator is being displayed for a protected branch.",
-	"config.branchProtectionIndicator.quickOpen": "Display an indicator in the quick open.",
-	"config.branchProtectionIndicator.statusBar": "Display an indicator in the status bar.",
 	"config.branchProtectionPrompt": "Controls whether a prompt is being before changes are committed to a protected branch.",
 	"config.branchProtectionPrompt.alwaysCommit": "Always commit changes to the protected branch.",
 	"config.branchProtectionPrompt.alwaysCommitToNewBranch": "Always commit changes to a new branch.",

extensions/git/src/commands.ts

@@ -26,7 +26,7 @@ const localize = nls.loadMessageBundle();
 class CheckoutItem implements QuickPickItem {
 
 	protected get shortCommit(): string { return (this.ref.commit || '').substr(0, 8); }
-	get label(): string { return this.ref.name ? `${this.ref.name}${this.repository.isBranchProtected(this.ref.name, 'quickOpen') ? ' $(lock-small)' : ''}` : this.shortCommit; }
+	get label(): string { return this.ref.name ? `${this.ref.name}${this.repository.isBranchProtected(this.ref.name) ? ' $(lock-small)' : ''}` : this.shortCommit; }
 	get description(): string { return this.shortCommit; }
 
 	constructor(protected repository: Repository, protected ref: Ref) { }

extensions/git/src/repository.ts

@@ -942,7 +942,6 @@ export class Repository implements Disposable {
 
 		filterEvent(workspace.onDidChangeConfiguration, e =>
 			e.affectsConfiguration('git.branchProtection', root)
-			|| e.affectsConfiguration('git.branchProtectionIndicator', root)
 			|| e.affectsConfiguration('git.branchSortOrder', root)
 			|| e.affectsConfiguration('git.untrackedChanges', root)
 			|| e.affectsConfiguration('git.ignoreSubmodules', root)
@@ -2230,17 +2229,7 @@ export class Repository implements Disposable {
 		}
 	}
 
-	public isBranchProtected(name: string = this.HEAD?.name ?? '', indicator?: 'quickOpen' | 'statusBar'): boolean {
-		if (indicator) {
-			const scopedConfig = workspace.getConfiguration('git', Uri.file(this.repository.root));
-			const branchProtectionIndicator = scopedConfig.get<{ quickOpen: boolean; statusBar: boolean }>('branchProtectionIndicator', { quickOpen: true, statusBar: true });
-
-			if ((indicator === 'quickOpen' && !branchProtectionIndicator.quickOpen) ||
-				(indicator === 'statusBar' && !branchProtectionIndicator.statusBar)) {
-				return false;
-			}
-		}
-
+	public isBranchProtected(name: string = this.HEAD?.name ?? ''): boolean {
 		return this.isBranchProtectedMatcher ? this.isBranchProtectedMatcher(name) : false;
 	}
 

extensions/git/src/statusbar.ts

@@ -24,7 +24,7 @@ class CheckoutStatusBar {
 
 	get command(): Command | undefined {
 		const rebasing = !!this.repository.rebaseCommit;
-		const isBranchProtected = this.repository.isBranchProtected(undefined, 'statusBar');
+		const isBranchProtected = this.repository.isBranchProtected();
 		const title = `${isBranchProtected ? '$(lock)' : '$(git-branch)'} ${this.repository.headLabel}${rebasing ? ` (${localize('rebasing', 'Rebasing')})` : ''}`;
 
 		return {

src/vs/base/common/console.ts

@@ -11,7 +11,7 @@ export interface IRemoteConsoleLog {
 	arguments: string;
 }
 
-interface IStackArgument {
+export interface IStackArgument {
 	__$stack: string;
 }
 

src/vs/code/electron-main/app.ts

@@ -710,7 +710,7 @@ export class CodeApplication extends Disposable {
 		mainProcessElectronServer.registerChannel(LOCAL_FILE_SYSTEM_CHANNEL_NAME, fileSystemProviderChannel);
 		sharedProcessClient.then(client => client.registerChannel(LOCAL_FILE_SYSTEM_CHANNEL_NAME, fileSystemProviderChannel));
 
-		// Profiles
+		// User Data Profiles
 		const userDataProfilesService = ProxyChannel.fromService(accessor.get(IUserDataProfilesMainService));
 		mainProcessElectronServer.registerChannel('userDataProfiles', userDataProfilesService);
 		sharedProcessClient.then(client => client.registerChannel('userDataProfiles', userDataProfilesService));

src/vs/editor/browser/config/domFontInfo.ts

@@ -3,21 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as browser from 'vs/base/browser/browser';
 import { FastDomNode } from 'vs/base/browser/fastDomNode';
-import { EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 import { BareFontInfo } from 'vs/editor/common/config/fontInfo';
 
 export function applyFontInfo(domNode: FastDomNode<HTMLElement> | HTMLElement, fontInfo: BareFontInfo): void {
 	if (domNode instanceof FastDomNode) {
-		domNode.setFontFamily(fontInfo.getMassagedFontFamily(browser.isSafari ? EDITOR_FONT_DEFAULTS.fontFamily : null));
+		domNode.setFontFamily(fontInfo.getMassagedFontFamily());
 		domNode.setFontWeight(fontInfo.fontWeight);
 		domNode.setFontSize(fontInfo.fontSize);
 		domNode.setFontFeatureSettings(fontInfo.fontFeatureSettings);
 		domNode.setLineHeight(fontInfo.lineHeight);
 		domNode.setLetterSpacing(fontInfo.letterSpacing);
 	} else {
-		domNode.style.fontFamily = fontInfo.getMassagedFontFamily(browser.isSafari ? EDITOR_FONT_DEFAULTS.fontFamily : null);
+		domNode.style.fontFamily = fontInfo.getMassagedFontFamily();
 		domNode.style.fontWeight = fontInfo.fontWeight;
 		domNode.style.fontSize = fontInfo.fontSize + 'px';
 		domNode.style.fontFeatureSettings = fontInfo.fontFeatureSettings;

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

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as platform from 'vs/base/common/platform';
-import { EditorOptions, EditorOption, FindComputedEditorOptionValueById } from 'vs/editor/common/config/editorOptions';
+import { EditorOptions, EditorOption, FindComputedEditorOptionValueById, EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 import { EditorZoom } from 'vs/editor/common/config/editorZoom';
 
 /**
@@ -125,7 +125,8 @@ export class BareFontInfo {
 	/**
 	 * @internal
 	 */
-	public getMassagedFontFamily(fallbackFontFamily: string | null): string {
+	public getMassagedFontFamily(): string {
+		const fallbackFontFamily = EDITOR_FONT_DEFAULTS.fontFamily;
 		const fontFamily = BareFontInfo._wrapInQuotes(this.fontFamily);
 		if (fallbackFontFamily && this.fontFamily !== fallbackFontFamily) {
 			return `${fontFamily}, ${fallbackFontFamily}`;

src/vs/editor/contrib/hover/browser/contentHover.ts

@@ -31,12 +31,12 @@ export class ContentHoverController extends Disposable {
 
 	private readonly _participants: IEditorHoverParticipant[];
 	private readonly _widget = this._register(this._instantiationService.createInstance(ContentHoverWidget, this._editor));
-	private readonly _decorations = this._editor.createDecorationsCollection();
 	private readonly _computer: ContentHoverComputer;
 	private readonly _hoverOperation: HoverOperation<IHoverPart>;
 
 	private _messages: IHoverPart[];
 	private _messagesAreComplete: boolean;
+	private _isChangingDecorations: boolean = false;
 
 	constructor(
 		private readonly _editor: ICodeEditor,
@@ -61,7 +61,12 @@ export class ContentHoverController extends Disposable {
 		this._register(this._hoverOperation.onResult((result) => {
 			this._withResult(result.value, result.isComplete, result.hasLoadingMessage);
 		}));
-		this._register(this._decorations.onDidChange(() => this._onModelDecorationsChanged()));
+		this._register(this._editor.onDidChangeModelDecorations(() => {
+			if (this._isChangingDecorations) {
+				return;
+			}
+			this._onModelDecorationsChanged();
+		}));
 		this._register(dom.addStandardDisposableListener(this._widget.getDomNode(), 'keydown', (e) => {
 			if (e.equals(KeyCode.Escape)) {
 				this.hide();
@@ -225,12 +230,23 @@ export class ContentHoverController extends Disposable {
 
 		if (fragment.hasChildNodes()) {
 			if (highlightRange) {
-				this._decorations.set([{
-					range: highlightRange,
-					options: ContentHoverController._DECORATION_OPTIONS
-				}]);
+				const highlightDecoration = this._editor.createDecorationsCollection();
+				try {
+					this._isChangingDecorations = true;
+					highlightDecoration.set([{
+						range: highlightRange,
+						options: ContentHoverController._DECORATION_OPTIONS
+					}]);
+				} finally {
+					this._isChangingDecorations = false;
+				}
 				disposables.add(toDisposable(() => {
-					this._decorations.clear();
+					try {
+						this._isChangingDecorations = true;
+						highlightDecoration.clear();
+					} finally {
+						this._isChangingDecorations = false;
+					}
 				}));
 			}
 

src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.ts

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isSafari } from 'vs/base/browser/browser';
 import * as dom from 'vs/base/browser/dom';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { Codicon } from 'vs/base/common/codicons';
@@ -12,7 +11,7 @@ import { MarkdownString } from 'vs/base/common/htmlContent';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { MarkdownRenderer } from 'vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
 import { ICodeEditor, IOverlayWidget } from 'vs/editor/browser/editorBrowser';
-import { EditorOption, EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
+import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { ResizableHTMLElement } from 'vs/editor/contrib/suggest/browser/resizable';
 import * as nls from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -84,7 +83,7 @@ export class SuggestDetailsWidget {
 	private _configureFont(): void {
 		const options = this._editor.getOptions();
 		const fontInfo = options.get(EditorOption.fontInfo);
-		const fontFamily = fontInfo.getMassagedFontFamily(isSafari ? EDITOR_FONT_DEFAULTS.fontFamily : null);
+		const fontFamily = fontInfo.getMassagedFontFamily();
 		const fontSize = options.get(EditorOption.suggestFontSize) || fontInfo.fontSize;
 		const lineHeight = options.get(EditorOption.suggestLineHeight) || fontInfo.lineHeight;
 		const fontWeight = fontInfo.fontWeight;

src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.ts

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isSafari } from 'vs/base/browser/browser';
 import { $, append, hide, show } from 'vs/base/browser/dom';
 import { IconLabel, IIconLabelValueOptions } from 'vs/base/browser/ui/iconLabel/iconLabel';
 import { IListRenderer } from 'vs/base/browser/ui/list/list';
@@ -13,7 +12,7 @@ import { createMatches } from 'vs/base/common/filters';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorOption, EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
+import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { CompletionItemKind, CompletionItemKinds, CompletionItemTag } from 'vs/editor/common/languages';
 import { getIconClasses } from 'vs/editor/common/services/getIconClasses';
 import { IModelService } from 'vs/editor/common/services/model';
@@ -130,7 +129,7 @@ export class ItemRenderer implements IListRenderer<CompletionItem, ISuggestionTe
 		const configureFont = () => {
 			const options = this._editor.getOptions();
 			const fontInfo = options.get(EditorOption.fontInfo);
-			const fontFamily = fontInfo.getMassagedFontFamily(isSafari ? EDITOR_FONT_DEFAULTS.fontFamily : null);
+			const fontFamily = fontInfo.getMassagedFontFamily();
 			const fontFeatureSettings = fontInfo.fontFeatureSettings;
 			const fontSize = options.get(EditorOption.suggestFontSize) || fontInfo.fontSize;
 			const lineHeight = options.get(EditorOption.suggestLineHeight) || fontInfo.lineHeight;