Merge branch 'main' into #163967-css-aliases

Author: SStranks

src/vs/platform/menubar/electron-main/menubar.ts

@@ -128,7 +128,7 @@ export class Menubar {
 		this.fallbackMenuHandlers['workbench.action.openWorkspace'] = (menuItem, win, event) => this.nativeHostMainService.pickWorkspaceAndOpen(undefined, { forceNewWindow: this.isOptionClick(event), telemetryExtraData: { from: telemetryFrom } });
 
 		// Recent Menu Items
-		this.fallbackMenuHandlers['workbench.action.clearRecentFiles'] = () => this.workspacesHistoryMainService.clearRecentlyOpened();
+		this.fallbackMenuHandlers['workbench.action.clearRecentFiles'] = () => this.workspacesHistoryMainService.clearRecentlyOpened({ confirm: true /* ask for confirmation */ });
 
 		// Help Menu Items
 		const youTubeUrl = this.productService.youTubeUrl;

src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts

@@ -377,10 +377,10 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		// Conpty could have the wrong cursor position at this point.
 		if (!this._cursorOnNextLine() || !prompt) {
 			this._windowsPromptPollingInProcess = true;
-			// Poll for 200ms until the cursor position is correct.
+			// Poll for 1000ms until the cursor position is correct.
 			let i = 0;
-			for (; i < 20; i++) {
-				await timeout(10);
+			for (; i < 50; i++) {
+				await timeout(20);
 				prompt = this._getWindowsPrompt();
 				if (this._store.isDisposed || !this._windowsPromptPollingInProcess || this._cursorOnNextLine() && prompt) {
 					if (!this._windowsPromptPollingInProcess) {
@@ -390,7 +390,7 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 				}
 			}
 			this._windowsPromptPollingInProcess = false;
-			if (i === 20) {
+			if (i >= 50) {
 				this._logService.debug('CommandDetectionCapability#_handleCommandStartWindows reached max attempts, ', this._cursorOnNextLine(), this._getWindowsPrompt());
 			} else if (prompt) {
 				// use the regex to set the position as it's possible input has occurred
@@ -428,9 +428,11 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 	private _cursorOnNextLine(): boolean {
 		const lastCommand = this.commands.at(-1);
 
+		// There is only a single command, so this check is unnecessary
 		if (!lastCommand) {
-			return false;
+			return true;
 		}
+
 		const cursorYAbsolute = this._terminal.buffer.active.baseY + this._terminal.buffer.active.cursorY;
 		// If the cursor position is within the last command, we should poll.
 		const lastCommandYAbsolute = (lastCommand.endMarker ? lastCommand.endMarker.line : lastCommand.marker?.line) ?? -1;
@@ -442,8 +444,26 @@ export class CommandDetectionCapability extends Disposable implements ICommandDe
 		if (!line) {
 			return;
 		}
-		// TODO: fine tune prompt regex to accomodate for unique configurtions.
-		return line.translateToString(true)?.match(/^(?<prompt>(\(.+\)\s)?(?:PS.+>\s)|(?:[A-Z]:\\.*>))/)?.groups?.prompt;
+		// TODO: fine tune prompt regex to accomodate for unique configurations.
+		const lineText = line.translateToString(true);
+		if (!lineText) {
+			return;
+		}
+
+		// PowerShell
+		const pwshMatch = lineText.match(/(?<prompt>(\(.+\)\s)?(?:PS.+>\s?))/);
+		if (pwshMatch) {
+			let prompt = pwshMatch?.groups?.prompt;
+			if (lineText === prompt && prompt.endsWith('>')) {
+				// Conpty may not 'render' the space at the end of the prompt
+				prompt += ' ';
+			}
+			return prompt;
+		}
+
+		// Command Prompt
+		const cmdMatch = lineText.match(/^(?<prompt>(\(.+\)\s)?(?:[A-Z]:\\.*>))/);
+		return cmdMatch?.groups?.prompt;
 	}
 
 	handleGenericCommand(options?: IHandleCommandOptions): void {

src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts

@@ -24,6 +24,7 @@ import { IRecent, IRecentFile, IRecentFolder, IRecentlyOpened, IRecentWorkspace,
 import { IWorkspaceIdentifier, WORKSPACE_EXTENSION } from 'vs/platform/workspace/common/workspace';
 import { IWorkspacesManagementMainService } from 'vs/platform/workspaces/electron-main/workspacesManagementMainService';
 import { ResourceMap } from 'vs/base/common/map';
+import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogMainService';
 
 export const IWorkspacesHistoryMainService = createDecorator<IWorkspacesHistoryMainService>('workspacesHistoryMainService');
 
@@ -36,7 +37,7 @@ export interface IWorkspacesHistoryMainService {
 	addRecentlyOpened(recents: IRecent[]): Promise<void>;
 	getRecentlyOpened(): Promise<IRecentlyOpened>;
 	removeRecentlyOpened(paths: URI[]): Promise<void>;
-	clearRecentlyOpened(): Promise<void>;
+	clearRecentlyOpened(options?: { confirm?: boolean }): Promise<void>;
 }
 
 export class WorkspacesHistoryMainService extends Disposable implements IWorkspacesHistoryMainService {
@@ -54,7 +55,8 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 		@ILogService private readonly logService: ILogService,
 		@IWorkspacesManagementMainService private readonly workspacesManagementMainService: IWorkspacesManagementMainService,
 		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
-		@IApplicationStorageMainService private readonly applicationStorageMainService: IApplicationStorageMainService
+		@IApplicationStorageMainService private readonly applicationStorageMainService: IApplicationStorageMainService,
+		@IDialogMainService private readonly dialogMainService: IDialogMainService
 	) {
 		super();
 
@@ -157,7 +159,24 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 		}
 	}
 
-	async clearRecentlyOpened(): Promise<void> {
+	async clearRecentlyOpened(options?: { confirm?: boolean }): Promise<void> {
+		if (options?.confirm) {
+			const { response } = await this.dialogMainService.showMessageBox({
+				type: 'warning',
+				buttons: [
+					localize({ key: 'clearButtonLabel', comment: ['&& denotes a mnemonic'] }, "&&Clear"),
+					localize({ key: 'cancel', comment: ['&& denotes a mnemonic'] }, "&&Cancel")
+				],
+				message: localize('confirmClearRecentsMessage', "Do you want to clear all recently opened files and workspaces?"),
+				detail: localize('confirmClearDetail', "This action is irreversible!"),
+				cancelId: 1
+			});
+
+			if (response !== 0) {
+				return;
+			}
+		}
+
 		await this.saveRecentlyOpened({ workspaces: [], files: [] });
 		app.clearRecentDocuments();
 

src/vs/workbench/browser/parts/editor/editor.contribution.ts

@@ -601,7 +601,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarRecentMenu, {
 	group: 'z_clear',
 	command: {
 		id: ClearRecentFilesAction.ID,
-		title: localize({ key: 'miClearRecentOpen', comment: ['&& denotes a mnemonic'] }, "&&Clear Recently Opened")
+		title: localize({ key: 'miClearRecentOpen', comment: ['&& denotes a mnemonic'] }, "&&Clear Recently Opened...")
 	},
 	order: 1
 });

src/vs/workbench/browser/parts/editor/editorActions.ts

@@ -1600,7 +1600,7 @@ export class ClearRecentFilesAction extends Action2 {
 	constructor() {
 		super({
 			id: ClearRecentFilesAction.ID,
-			title: { value: localize('clearRecentFiles', "Clear Recently Opened"), original: 'Clear Recently Opened' },
+			title: { value: localize('clearRecentFiles', "Clear Recently Opened..."), original: 'Clear Recently Opened...' },
 			f1: true,
 			category: Categories.File
 		});

src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts

@@ -89,7 +89,7 @@ class InputEditorDecorations extends Disposable {
 
 	private registerViewModelListeners(): void {
 		this.viewModelDisposables.value = this.widget.viewModel?.onDidChange(e => {
-			if (e?.kind === 'changePlaceholder') {
+			if (e?.kind === 'changePlaceholder' || e?.kind === 'initialize') {
 				this.updateInputEditorDecorations();
 			}
 		});
@@ -127,7 +127,6 @@ class InputEditorDecorations extends Disposable {
 
 	private async updateInputEditorDecorations() {
 		const inputValue = this.widget.inputEditor.getValue();
-		const slashCommands = await this.widget.getSlashCommands(); // TODO this async call can lead to a flicker of the placeholder text when switching editor tabs
 
 		const viewModel = this.widget.viewModel;
 		if (!viewModel) {
@@ -136,10 +135,7 @@ class InputEditorDecorations extends Disposable {
 
 		if (!inputValue) {
 			const viewModelPlaceholder = this.widget.viewModel?.inputPlaceholder;
-			const defaultPlaceholder = slashCommands?.length ?
-				localize('interactive.input.placeholderWithCommands', "Ask a question or type '@' or '/'") :
-				localize('interactive.input.placeholderNoCommands', "Ask a question");
-			const placeholder = viewModelPlaceholder ?? defaultPlaceholder;
+			const placeholder = viewModelPlaceholder ?? '';
 			const decoration: IDecorationOptions[] = [
 				{
 					range: {

src/vs/workbench/contrib/chat/browser/media/chat.css

@@ -109,7 +109,7 @@
 }
 
 .interactive-item-container .header .avatar .codicon {
-	color: var(--vscode-chat-avatarForeground);
+	color: var(--vscode-chat-avatarForeground) !important;
 	font-size: 14px;
 }
 

src/vs/workbench/contrib/chat/common/chatViewModel.ts

@@ -26,7 +26,7 @@ export function isWelcomeVM(item: unknown): item is IChatWelcomeMessageViewModel
 	return !!item && typeof item === 'object' && 'content' in item;
 }
 
-export type IChatViewModelChangeEvent = IChatAddRequestEvent | IChangePlaceholderEvent | null;
+export type IChatViewModelChangeEvent = IChatAddRequestEvent | IChangePlaceholderEvent | IChatSessionInitEvent | null;
 
 export interface IChatAddRequestEvent {
 	kind: 'addRequest';
@@ -36,6 +36,10 @@ export interface IChangePlaceholderEvent {
 	kind: 'changePlaceholder';
 }
 
+export interface IChatSessionInitEvent {
+	kind: 'initialize';
+}
+
 export interface IChatViewModel {
 	readonly initState: ChatModelInitState;
 	readonly providerId: string;
@@ -184,7 +188,10 @@ export class ChatViewModel extends Disposable implements IChatViewModel {
 				}
 			}
 
-			this._onDidChange.fire(e.kind === 'addRequest' ? { kind: 'addRequest' } : null);
+			const modelEventToVmEvent: IChatViewModelChangeEvent = e.kind === 'addRequest' ? { kind: 'addRequest' } :
+				e.kind === 'initialize' ? { kind: 'initialize' } :
+					null;
+			this._onDidChange.fire(modelEventToVmEvent);
 		}));
 	}
 

src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.ts

@@ -29,7 +29,7 @@ import { ACTIVE_GROUP, IEditorService, SIDE_GROUP } from 'vs/workbench/services/
 import { ITextQueryBuilderOptions, QueryBuilder } from 'vs/workbench/services/search/common/queryBuilder';
 import { IPatternInfo, ITextQuery, VIEW_ID } from 'vs/workbench/services/search/common/search';
 
-export const TEXT_SEARCH_QUICK_ACCESS_PREFIX = '% ';
+export const TEXT_SEARCH_QUICK_ACCESS_PREFIX = '%';
 
 const DEFAULT_TEXT_QUERY_BUILDER_OPTIONS: ITextQueryBuilderOptions = {
 	_reason: 'quickAccessSearch',

src/vs/workbench/contrib/terminalContrib/accessibility/browser/textAreaSyncAddon.ts

@@ -6,10 +6,11 @@
 import { Disposable, DisposableStore, MutableDisposable } from 'vs/base/common/lifecycle';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { ITerminalCapabilityStore, TerminalCapability } from 'vs/platform/terminal/common/capabilities/capabilities';
-import { ITerminalLogService } from 'vs/platform/terminal/common/terminal';
+import { ITerminalLogService, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
 import type { Terminal, ITerminalAddon } from 'xterm';
 import { debounce } from 'vs/base/common/decorators';
 import { addDisposableListener } from 'vs/base/browser/dom';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 export interface ITextAreaData {
 	content: string;
@@ -24,19 +25,20 @@ export class TextAreaSyncAddon extends Disposable implements ITerminalAddon {
 
 	activate(terminal: Terminal): void {
 		this._terminal = terminal;
-		if (this._accessibilityService.isScreenReaderOptimized()) {
+		if (this._shouldBeActive()) {
 			this._registerSyncListeners();
 		}
 	}
 
 	constructor(
 		private readonly _capabilities: ITerminalCapabilityStore,
 		@IAccessibilityService private readonly _accessibilityService: IAccessibilityService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 		@ITerminalLogService private readonly _logService: ITerminalLogService
 	) {
 		super();
 		this._register(this._accessibilityService.onDidChangeScreenReaderOptimized(() => {
-			if (this._accessibilityService.isScreenReaderOptimized()) {
+			if (this._shouldBeActive()) {
 				this._syncTextArea();
 				this._registerSyncListeners();
 			} else {
@@ -46,14 +48,18 @@ export class TextAreaSyncAddon extends Disposable implements ITerminalAddon {
 	}
 
 	private _registerSyncListeners(): void {
-		if (this._accessibilityService.isScreenReaderOptimized() && this._terminal?.textarea) {
+		if (this._shouldBeActive() && this._terminal?.textarea) {
 			this._listeners.value = new DisposableStore();
 			this._listeners.value.add(this._terminal.onCursorMove(() => this._syncTextArea()));
 			this._listeners.value.add(this._terminal.onData(() => this._syncTextArea()));
 			this._listeners.value.add(addDisposableListener(this._terminal.textarea, 'focus', () => this._syncTextArea()));
 		}
 	}
 
+	private _shouldBeActive(): boolean {
+		return this._accessibilityService.isScreenReaderOptimized() || this._configurationService.getValue(TerminalSettingId.DevMode);
+	}
+
 	@debounce(50)
 	private _syncTextArea(): void {
 		this._logService.debug('TextAreaSyncAddon#syncTextArea');