Rebase against the upstream 745cb55

vscode-upstream-sha1: 745cb55

code/extensions/git/src/commands.ts

@@ -107,13 +107,24 @@ class BranchDeleteItem implements QuickPickItem {
 
 class MergeItem implements QuickPickItem {
 
-	get label(): string { return this.ref.name || ''; }
-	get description(): string { return this.ref.name || ''; }
+	private shortCommit: string;
 
-	constructor(protected ref: Ref) { }
+	get label(): string {
+		return this.ref.type === RefType.RemoteHead ?
+			`$(cloud) ${this.ref.name ?? this.shortCommit}` :
+			`${this.repository.isBranchProtected(this.ref) ? '$(lock)' : '$(git-branch)'} ${this.ref.name ?? this.shortCommit}`;
+	}
 
-	async run(repository: Repository): Promise<void> {
-		await repository.merge(this.ref.name! || this.ref.commit!);
+	get description(): string {
+		return this.ref.type === RefType.RemoteHead ? l10n.t('Remote branch at {0}', this.shortCommit) : this.shortCommit;
+	}
+
+	constructor(private readonly repository: Repository, private readonly ref: Ref) {
+		this.shortCommit = (this.ref.commit ?? '').substring(0, 8);
+	}
+
+	async run(): Promise<void> {
+		await this.repository.merge(this.ref.name ?? this.ref.commit!);
 	}
 }
 
@@ -2486,11 +2497,11 @@ export class CommandCenter {
 
 			const heads = refs.filter(ref => ref.type === RefType.Head)
 				.filter(ref => ref.name || ref.commit)
-				.map(ref => new MergeItem(ref as Branch));
+				.map(ref => new MergeItem(repository, ref as Branch));
 
 			const remoteHeads = (includeRemotes ? refs.filter(ref => ref.type === RefType.RemoteHead) : [])
 				.filter(ref => ref.name || ref.commit)
-				.map(ref => new MergeItem(ref as Branch));
+				.map(ref => new MergeItem(repository, ref as Branch));
 
 			return [...heads, ...remoteHeads];
 		};
@@ -2502,7 +2513,7 @@ export class CommandCenter {
 			return;
 		}
 
-		await choice.run(repository);
+		await choice.run();
 	}
 
 	@command('git.mergeAbort', { repository: true })
@@ -3264,18 +3275,21 @@ export class CommandCenter {
 	}
 
 	@command('git.stash', { repository: true })
-	async stash(repository: Repository): Promise<void> {
-		await this._stash(repository);
+	async stash(repository: Repository): Promise<boolean> {
+		const result = await this._stash(repository);
+		return result;
 	}
 
 	@command('git.stashStaged', { repository: true })
-	async stashStaged(repository: Repository): Promise<void> {
-		await this._stash(repository, false, true);
+	async stashStaged(repository: Repository): Promise<boolean> {
+		const result = await this._stash(repository, false, true);
+		return result;
 	}
 
 	@command('git.stashIncludeUntracked', { repository: true })
-	async stashIncludeUntracked(repository: Repository): Promise<void> {
-		await this._stash(repository, true);
+	async stashIncludeUntracked(repository: Repository): Promise<boolean> {
+		const result = await this._stash(repository, true);
+		return result;
 	}
 
 	@command('git.stashPop', { repository: true })

code/src/vs/editor/browser/controller/pointerHandler.ts

@@ -3,18 +3,19 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { BrowserFeatures } from 'vs/base/browser/canIUse';
 import * as dom from 'vs/base/browser/dom';
 import { EventType, Gesture, GestureEvent } from 'vs/base/browser/touch';
+import { mainWindow } from 'vs/base/browser/window';
 import { Disposable } from 'vs/base/common/lifecycle';
+import * as platform from 'vs/base/common/platform';
 import { IPointerHandlerHelper, MouseHandler } from 'vs/editor/browser/controller/mouseHandler';
+import { TextAreaSyntethicEvents } from 'vs/editor/browser/controller/textAreaInput';
+import { NavigationCommandRevealType } from 'vs/editor/browser/coreCommands';
 import { IMouseTarget, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { EditorMouseEvent, EditorPointerEventFactory } from 'vs/editor/browser/editorDom';
 import { ViewController } from 'vs/editor/browser/view/viewController';
 import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
-import { BrowserFeatures } from 'vs/base/browser/canIUse';
-import { TextAreaSyntethicEvents } from 'vs/editor/browser/controller/textAreaInput';
-import { NavigationCommandRevealType } from 'vs/editor/browser/coreCommands';
-import { mainWindow } from 'vs/base/browser/window';
 
 /**
  * Currently only tested on iOS 13/ iPadOS.
@@ -140,7 +141,8 @@ export class PointerHandler extends Disposable {
 
 	constructor(context: ViewContext, viewController: ViewController, viewHelper: IPointerHandlerHelper) {
 		super();
-		if (BrowserFeatures.pointerEvents) {
+		const isPhone = platform.isIOS || (platform.isAndroid && platform.isMobile);
+		if (isPhone && BrowserFeatures.pointerEvents) {
 			this.handler = this._register(new PointerEventHandler(context, viewController, viewHelper));
 		} else if (mainWindow.TouchEvent) {
 			this.handler = this._register(new TouchHandler(context, viewController, viewHelper));

code/src/vs/editor/browser/editorExtensions.ts

@@ -181,7 +181,7 @@ export abstract class Command {
 /**
  * Potential override for a command.
  *
- * @return `true` if the command was successfully run. This stops other overrides from being executed.
+ * @return `true` or a Promise if the command was successfully run. This stops other overrides from being executed.
  */
 export type CommandImplementation = (accessor: ServicesAccessor, args: unknown) => boolean | Promise<void>;
 

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

@@ -1714,7 +1714,7 @@ export class EditorFontLigatures extends BaseEditorOption<EditorOption.fontLigat
 			return this.defaultValue;
 		}
 		if (typeof input === 'string') {
-			if (input === 'false') {
+			if (input === 'false' || input.length === 0) {
 				return EditorFontLigatures.OFF;
 			}
 			if (input === 'true') {

code/src/vs/editor/contrib/clipboard/browser/clipboard.ts

@@ -14,6 +14,7 @@ import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 import { Handler } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+import { CopyPasteController } from 'vs/editor/contrib/dropOrPasteInto/browser/copyPasteController';
 import * as nls from 'vs/nls';
 import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
@@ -227,8 +228,10 @@ if (PasteAction) {
 		const focusedEditor = codeEditorService.getFocusedCodeEditor();
 		if (focusedEditor && focusedEditor.hasTextFocus()) {
 			const result = focusedEditor.getContainerDomNode().ownerDocument.execCommand('paste');
-			// Use the clipboard service if document.execCommand('paste') was not successful
-			if (!result && platform.isWeb) {
+			if (result) {
+				return CopyPasteController.get(focusedEditor).finishedPaste();
+			} else if (platform.isWeb) {
+				// Use the clipboard service if document.execCommand('paste') was not successful
 				return (async () => {
 					const clipboardText = await clipboardService.readText();
 					if (clipboardText !== '') {

code/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.ts

@@ -114,6 +114,10 @@ export class CopyPasteController extends Disposable implements IEditorContributi
 			&& !this._editor.getOption(EditorOption.readOnly);
 	}
 
+	public async finishedPaste(): Promise<void> {
+		await this._currentPasteOperation;
+	}
+
 	private handleCopy(e: ClipboardEvent) {
 		if (!this._editor.hasTextFocus()) {
 			return;

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

@@ -911,10 +911,6 @@ export class ContentHoverWidget extends ResizableContentWidget {
 	public goToBottom(): void {
 		this._hover.scrollbar.setScrollPosition({ scrollTop: this._hover.scrollbar.getScrollDimensions().scrollHeight });
 	}
-
-	public toggleLocked(locked: boolean): void {
-		this._hover.containerDomNode.classList.toggle('locked', locked);
-	}
 }
 
 export class EditorHoverStatusBar extends Disposable implements IEditorHoverStatusBar {

code/src/vs/editor/contrib/hover/browser/hover.css

@@ -14,10 +14,6 @@
 	border-radius: 3px;
 }
 
-.monaco-editor .monaco-hover.locked {
-	outline: 1px solid var(--vscode-editorHoverWidget-border);
-}
-
 .monaco-editor .monaco-hover a {
 	color: var(--vscode-textLink-foreground);
 }

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

@@ -46,7 +46,6 @@ interface IHoverSettings {
 
 interface IHoverState {
 	mouseDown: boolean;
-	locked: boolean;
 	// TODO @aiday-mar maybe not needed, investigate this
 	contentHoverFocused: boolean;
 	activatedByDecoratorClick: boolean;
@@ -67,7 +66,6 @@ export class HoverController extends Disposable implements IEditorContribution {
 	private _hoverSettings!: IHoverSettings;
 	private _hoverState: IHoverState = {
 		mouseDown: false,
-		locked: false,
 		contentHoverFocused: false,
 		activatedByDecoratorClick: false
 	};
@@ -112,7 +110,6 @@ export class HoverController extends Disposable implements IEditorContribution {
 			this._listenersStore.add(this._editor.onMouseUp(() => this._onEditorMouseUp()));
 			this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
 			this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
-			this._listenersStore.add(this._editor.onKeyUp((e: IKeyboardEvent) => this._onKeyUp(e)));
 		} else {
 			this._listenersStore.add(this._editor.onMouseMove((e: IEditorMouseEvent) => this._onEditorMouseMove(e)));
 			this._listenersStore.add(this._editor.onKeyDown((e: IKeyboardEvent) => this._onKeyDown(e)));
@@ -232,10 +229,6 @@ export class HoverController extends Disposable implements IEditorContribution {
 	private _onEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
 
 		this._mouseMoveEvent = mouseEvent;
-		if (this._hoverState.locked) {
-			// When the alt key is pressed, hover remains visible
-			return;
-		}
 		if (this._contentWidget?.isFocused || this._contentWidget?.isResizing) {
 			return;
 		}
@@ -319,7 +312,6 @@ export class HoverController extends Disposable implements IEditorContribution {
 		if (!this._editor.hasModel()) {
 			return;
 		}
-		this._toggleLockedState(e.altKey);
 
 		const resolvedKeyboardEvent = this._keybindingService.softDispatch(e, this._editor.getDomNode());
 
@@ -348,17 +340,6 @@ export class HoverController extends Disposable implements IEditorContribution {
 		this._hideWidgets();
 	}
 
-	private _onKeyUp(e: IKeyboardEvent): void {
-		this._toggleLockedState(!e.altKey);
-	}
-
-	private _toggleLockedState(locked: boolean) {
-		if (this._hoverState.locked !== locked) {
-			this._hoverState.locked = locked;
-			this._contentWidget?.widget.toggleLocked(this._hoverState.locked);
-		}
-	}
-
 	private _hideWidgets(): void {
 		if (_sticky) {
 			return;

code/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts

@@ -363,8 +363,14 @@ export class LiveStrategy extends EditModeStrategy {
 	}
 
 	private static _undoModelUntil(model: ITextModel, targetAltVersion: number): void {
-		while (targetAltVersion < model.getAlternativeVersionId() && model.canUndo()) {
+		let actualAltVersion = model.getAlternativeVersionId();
+		while (targetAltVersion < actualAltVersion && model.canUndo()) {
 			model.undo();
+			const newActualAltVersion = model.getAlternativeVersionId();
+			if (actualAltVersion === newActualAltVersion) {
+				break;
+			}
+			actualAltVersion = newActualAltVersion;
 		}
 	}
 
@@ -955,8 +961,14 @@ export class LiveStrategy3 extends EditModeStrategy {
 	}
 
 	private static _undoModelUntil(model: ITextModel, targetAltVersion: number): void {
-		while (targetAltVersion < model.getAlternativeVersionId() && model.canUndo()) {
+		let actualAltVersion = model.getAlternativeVersionId();
+		while (targetAltVersion < actualAltVersion && model.canUndo()) {
 			model.undo();
+			const newActualAltVersion = model.getAlternativeVersionId();
+			if (actualAltVersion === newActualAltVersion) {
+				break;
+			}
+			actualAltVersion = newActualAltVersion;
 		}
 	}