Merge branch 'main' into robo/enable_wco_macOS

Author: bpasero

.eslint-plugin-local/vscode-dts-region-comments.ts

@@ -268,7 +268,6 @@ export default tseslint.config(
 			'local/vscode-dts-cancellation': 'warn',
 			'local/vscode-dts-use-export': 'warn',
 			'local/vscode-dts-use-thenable': 'warn',
-			'local/vscode-dts-region-comments': 'warn',
 			'local/vscode-dts-vscode-in-comments': 'warn',
 			'local/vscode-dts-provider-naming': [
 				'warn',

eslint.config.js

@@ -408,6 +408,10 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, FileDec
 		const references: SourceControlHistoryItemRef[] = [];
 
 		for (const ref of commit.refNames) {
+			if (ref === 'refs/remotes/origin/HEAD') {
+				continue;
+			}
+
 			switch (true) {
 				case ref.startsWith('HEAD -> refs/heads/'):
 					references.push({

extensions/git/src/historyProvider.ts

@@ -116,7 +116,7 @@ export async function activate(context: vscode.ExtensionContext) {
 			}
 
 			if (result.cwd && (result.filesRequested || result.foldersRequested)) {
-				return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, cwd: result.cwd, pathSeparator: isWindows ? '\\' : '/', env: terminal.shellIntegration?.env });
+				return new vscode.TerminalCompletionList(result.items, { filesRequested: result.filesRequested, foldersRequested: result.foldersRequested, cwd: result.cwd, env: terminal.shellIntegration?.env });
 			}
 			return result.items;
 		}

extensions/terminal-suggest/src/terminalSuggestMain.ts

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.98.0",
-  "distro": "4e8c47ac95d95aa744f78305db0f163dcd407126",
+  "distro": "41de7f370f100ee0374fe780e73a995803da6a9c",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -237,4 +237,4 @@
   "optionalDependencies": {
     "windows-foreground-love": "0.5.0"
   }
-}
+}

package.json

@@ -95,8 +95,6 @@ export interface IProductConfiguration {
 
 	readonly extensionsGallery?: {
 		readonly serviceUrl: string;
-		readonly servicePPEUrl?: string;
-		readonly searchUrl?: string;
 		readonly itemUrl: string;
 		readonly publisherUrl: string;
 		readonly resourceUrlTemplate: string;

src/vs/base/common/product.ts

@@ -202,10 +202,9 @@ export function assertOneOf<TType, TSubtype extends TType>(
 }
 
 /**
- * Simple compile-time type check function to validate a type of
- * a provided object.
+ * Compile-time type check of a variable.
  */
-export function typeCheck<T extends unknown>(_thing: T): asserts _thing is T { }
+export function typeCheck<T = never>(_thing: NoInfer<T>): void { }
 
 const hasOwnProperty = Object.prototype.hasOwnProperty;
 

src/vs/base/common/types.ts

@@ -50,7 +50,7 @@ export class DefaultExtensionsInitializer extends Disposable {
 			return;
 		}
 
-		const vsixs = stat.children.filter(child => child.name.endsWith('.vsix'));
+		const vsixs = stat.children.filter(child => child.name.toLowerCase().endsWith('.vsix'));
 		if (vsixs.length === 0) {
 			this.logService.debug('There are no default extensions to initialize', extensionsLocation.toString());
 			return;

src/vs/code/electron-utility/sharedProcess/contrib/defaultExtensionsInitializer.ts

@@ -26,7 +26,9 @@ import { ManagedHoverWidget } from './updatableHoverWidget.js';
 import { timeout, TimeoutTimer } from '../../../../base/common/async.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { isNumber } from '../../../../base/common/types.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 
 export class HoverService extends Disposable implements IHoverService {
 	declare readonly _serviceBrand: undefined;
@@ -41,6 +43,9 @@ export class HoverService extends Disposable implements IHoverService {
 
 	private _lastFocusedElementBeforeOpen: HTMLElement | undefined;
 
+	private readonly _delayedHovers = new Map<HTMLElement, { show: (focus: boolean) => void }>();
+	private readonly _managedHovers = new Map<HTMLElement, IManagedHover>();
+
 	constructor(
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
@@ -53,6 +58,14 @@ export class HoverService extends Disposable implements IHoverService {
 
 		this._register(contextMenuService.onDidShowContextMenu(() => this.hideHover()));
 		this._contextViewHandler = this._register(new ContextViewHandler(this._layoutService));
+
+		this._register(KeybindingsRegistry.registerCommandAndKeybindingRule({
+			id: 'workbench.action.showHover',
+			weight: KeybindingWeight.WorkbenchContrib - 1,
+			when: EditorContextKeys.editorTextFocus.negate(),
+			primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyI),
+			handler: () => { this._showAndFocusHoverForActiveElement(); },
+		}));
 	}
 
 	showHover(options: IHoverOptions, focus?: boolean, skipLastFocusedUpdate?: boolean, dontShow?: boolean): IHoverWidget | undefined {
@@ -160,6 +173,10 @@ export class HoverService extends Disposable implements IHoverService {
 				}
 			}));
 		}
+
+		this._delayedHovers.set(target, { show: (focus: boolean) => { this.showHover(resolveHoverOptions(), focus); } });
+		store.add(toDisposable(() => this._delayedHovers.delete(target)));
+
 		return store;
 	}
 
@@ -301,6 +318,21 @@ export class HoverService extends Disposable implements IHoverService {
 		this.showHover(this._lastHoverOptions, true, true);
 	}
 
+	private _showAndFocusHoverForActiveElement(): void {
+		// TODO: if hover is visible, focus it to avoid flickering
+
+		let activeElement = getActiveElement() as HTMLElement | null;
+		while (activeElement) {
+			const hover = this._delayedHovers.get(activeElement) ?? this._managedHovers.get(activeElement);
+			if (hover) {
+				hover.show(true);
+				return;
+			}
+
+			activeElement = activeElement.parentElement;
+		}
+	}
+
 	private _keyDown(e: KeyboardEvent, hover: HoverWidget, hideOnKeyDown: boolean) {
 		if (e.key === 'Alt') {
 			hover.isLocked = true;
@@ -328,8 +360,6 @@ export class HoverService extends Disposable implements IHoverService {
 		}
 	}
 
-	private readonly _managedHovers = new Map<HTMLElement, IManagedHover>();
-
 	// TODO: Investigate performance of this function. There seems to be a lot of content created
 	//       and thrown away on start up
 	setupManagedHover(hoverDelegate: IHoverDelegate, targetElement: HTMLElement, content: IManagedHoverContentOrFactory, options?: IManagedHoverOptions | undefined): IManagedHover {

src/vs/editor/browser/services/hoverService/hoverService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import './hover.css';
-import { DisposableStore, MutableDisposable } from '../../../../base/common/lifecycle.js';
+import { DisposableStore, MutableDisposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { Event, Emitter } from '../../../../base/common/event.js';
 import * as dom from '../../../../base/browser/dom.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
@@ -165,7 +165,7 @@ export class HoverWidget extends Widget implements IHoverWidget {
 				{ codeBlockFontFamily: this._configurationService.getValue<IEditorOptions>('editor').fontFamily || EDITOR_FONT_DEFAULTS.fontFamily }
 			);
 
-			const { element } = mdRenderer.render(markdown, {
+			const { element, dispose } = mdRenderer.render(markdown, {
 				actionHandler: {
 					callback: (content) => this._linkHandler(content),
 					disposables: this._messageListeners
@@ -178,6 +178,7 @@ export class HoverWidget extends Widget implements IHoverWidget {
 				}
 			});
 			contentsElement.appendChild(element);
+			this._register(toDisposable(dispose));
 		}
 		rowElement.appendChild(contentsElement);
 		this._hover.contentsDomNode.appendChild(rowElement);
@@ -188,15 +189,15 @@ export class HoverWidget extends Widget implements IHoverWidget {
 			options.actions.forEach(action => {
 				const keybinding = this._keybindingService.lookupKeybinding(action.commandId);
 				const keybindingLabel = keybinding ? keybinding.getLabel() : null;
-				HoverAction.render(actionsElement, {
+				this._register(HoverAction.render(actionsElement, {
 					label: action.label,
 					commandId: action.commandId,
 					run: e => {
 						action.run(e);
 						this.dispose();
 					},
 					iconClass: action.iconClass
-				}, keybindingLabel);
+				}, keybindingLabel));
 			});
 			statusBarElement.appendChild(actionsElement);
 			this._hover.containerDomNode.appendChild(statusBarElement);

src/vs/editor/browser/services/hoverService/hoverWidget.ts

@@ -245,7 +245,7 @@ class DiffToolBar extends Disposable implements IGutterItemView {
 				},
 				overflowBehavior: { maxItems: this._isSmall.read(reader) ? 1 : 3 },
 				hiddenItemStrategy: HiddenItemStrategy.Ignore,
-				actionRunner: new ActionRunnerWithContext(() => {
+				actionRunner: store.add(new ActionRunnerWithContext(() => {
 					const item = this._item.get();
 					const mapping = item.mapping;
 					return {
@@ -254,7 +254,7 @@ class DiffToolBar extends Disposable implements IGutterItemView {
 						originalUri: item.originalUri,
 						modifiedUri: item.modifiedUri,
 					} satisfies DiffEditorSelectionHunkToolbarContext;
-				}),
+				})),
 				menuOptions: {
 					shouldForwardArgs: true,
 				},

src/vs/editor/browser/widget/diffEditor/features/gutterFeature.ts

@@ -306,7 +306,8 @@
 
 (rest_pattern) @keyword.operator.rest
 
-(spread_element) @keyword.operator.spread
+(spread_element
+  ("...") @keyword.operator.spread)
 
 ; Language constants
 

src/vs/editor/common/languages/highlights/typescript.scm

@@ -271,9 +271,8 @@ export class TreeSitterParseResult implements IDisposable, ITreeSitterParseResul
 					}
 					return c?.hasChanges;
 				});
-				if (changedChildren.length >= 1) {
-					next = gotoNthChild(indexChangedChildren[0]);
-				} else if (changedChildren.length === 0) {
+				// If we have changes and we *had* an error, the whole node should be refreshed.
+				if ((changedChildren.length === 0) || oldCursor.currentNode.hasError) {
 					// walk up again until we get to the first one that's named as unnamed nodes can be too granular
 					while (newCursor.currentNode.parent && !newCursor.currentNode.isNamed && next) {
 						next = gotoParent();
@@ -293,6 +292,8 @@ export class TreeSitterParseResult implements IDisposable, ITreeSitterParseResul
 
 					changedRanges.push({ newStartPosition, newEndPosition, oldStartIndex, oldEndIndex, newNodeId: newNode.id, newStartIndex, newEndIndex: newNode.endIndex });
 					next = nextSiblingOrParentSibling();
+				} else if (changedChildren.length >= 1) {
+					next = gotoNthChild(indexChangedChildren[0]);
 				}
 			} else {
 				next = nextSiblingOrParentSibling();

src/vs/editor/common/services/treeSitter/treeSitterParserService.ts

@@ -160,6 +160,10 @@ export class StandaloneQuickInputService implements IQuickInputService {
 	setAlignment(alignment: 'top' | 'center' | { top: number; left: number }): void {
 		return this.activeService.setAlignment(alignment);
 	}
+
+	toggleHover(): void {
+		return this.activeService.toggleHover();
+	}
 }
 
 export class QuickInputEditorContribution implements IEditorContribution {

src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.ts

@@ -468,7 +468,7 @@ export class DropdownWithDefaultActionViewItem extends BaseActionViewItem {
 			...options,
 			menuAsChild: options?.menuAsChild ?? true,
 			classNames: options?.classNames ?? ['codicon', 'codicon-chevron-down'],
-			actionRunner: options?.actionRunner ?? new ActionRunner(),
+			actionRunner: options?.actionRunner ?? this._register(new ActionRunner()),
 		};
 
 		this._dropdown = new DropdownMenuActionViewItem(submenuAction, submenuAction.actions, this._contextMenuService, dropdownOptions);

src/vs/platform/actions/browser/menuEntryActionViewItem.ts

@@ -81,7 +81,7 @@ export class ContextMenuHandler {
 
 				const menuDisposables = new DisposableStore();
 
-				const actionRunner = delegate.actionRunner || new ActionRunner();
+				const actionRunner = delegate.actionRunner || menuDisposables.add(new ActionRunner());
 				actionRunner.onWillRun(evt => this.onActionRun(evt, !delegate.skipTelemetry), this, menuDisposables);
 				actionRunner.onDidRun(this.onDidActionRun, this, menuDisposables);
 				menu = new Menu(container, actions, {