Merge branch 'main' into joh/systematic-mockingbird

Author: jrieken

.github/commands.json

@@ -538,5 +538,62 @@
 		"addLabel": "info-needed",
 		"removeLabel": "~confirmation-needed",
 		"comment": "Please diagnose the root cause of the issue by running the command `F1 > Help: Troubleshoot Issue` and following the instructions. Once you have done that, please update the issue with the results.\n\nHappy Coding!"
+	},
+		{
+		"type": "label",
+		"name": "~chat-rate-limiting",
+		"removeLabel": "~chat-rate-limiting",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/2627. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
+	},
+	{
+		"type": "label",
+		"name": "~chat-request-failed",
+		"removeLabel": "~chat-request-failed",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/4332. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
+	},
+	{
+		"type": "label",
+		"name": "~chat-rai-content-filters",
+		"removeLabel": "~chat-rai-content-filters",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/2625. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
+	},
+	{
+		"type": "label",
+		"name": "~chat-public-code-blocking",
+		"removeLabel": "~chat-public-code-blocking",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/2626. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
+	},
+	{
+		"type": "label",
+		"name": "~chat-lm-unavailable",
+		"removeLabel": "~chat-lm-unavailable",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "This issue is a duplicate of https://github.com/microsoft/vscode-copilot-release/issues/2116. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
+	},
+	{
+		"type": "label",
+		"name": "~chat-authentication",
+		"removeLabel": "~chat-authentication",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode-copilot-release/issues/11078, if the bug you are experiencing is not there, please comment on this closed issue thread so we can re-open it.",
+		"assign": ["TylerLeonhardt"]
+	},
+	{
+		"type": "label",
+		"name": "~chat-no-response-returned",
+		"removeLabel": "~chat-no-response-returned",
+		"action": "close",
+		"reason": "not_planned",
+		"comment": "Please look at the following meta issue: https://github.com/microsoft/vscode-copilot-release/issues/7034. Please refer to that issue for updates and discussions. Feel free to open a new issue if you think this is a different problem."
 	}
 ]

.vscode/launch.json

@@ -254,6 +254,7 @@
 				"VSCODE_SKIP_PRELAUNCH": "1",
 			},
 			"cleanUp": "wholeBrowser",
+			"killBehavior": "polite",
 			"runtimeArgs": [
 				"--inspect-brk=5875",
 				"--no-cached-data",

build/lib/stylelint/vscode-known-variables.json

@@ -320,6 +320,7 @@
 		"--vscode-editorPane-background",
 		"--vscode-editorRuler-foreground",
 		"--vscode-editorStickyScroll-background",
+		"--vscode-editorStickyScrollGutter-background",
 		"--vscode-editorStickyScroll-border",
 		"--vscode-editorStickyScroll-shadow",
 		"--vscode-editorStickyScrollHover-background",
@@ -562,6 +563,7 @@
 		"--vscode-peekViewEditor-matchHighlightBorder",
 		"--vscode-peekViewEditorGutter-background",
 		"--vscode-peekViewEditorStickyScroll-background",
+		"--vscode-peekViewEditorStickyScrollGutter-background",
 		"--vscode-peekViewResult-background",
 		"--vscode-peekViewResult-fileForeground",
 		"--vscode-peekViewResult-lineForeground",

extensions/terminal-suggest/src/fig/figInterface.ts

@@ -31,12 +31,11 @@ export async function getFigSuggestions(
 	specs: Fig.Spec[],
 	terminalContext: { commandLine: string; cursorPosition: number },
 	availableCommands: ICompletionResource[],
-	prefix: string,
+	currentCommandAndArgString: string,
 	tokenType: TokenType,
 	shellIntegrationCwd: vscode.Uri | undefined,
 	env: Record<string, string>,
 	name: string,
-	precedingText: string,
 	executeExternals: IFigExecuteExternals,
 	token?: vscode.CancellationToken,
 ): Promise<IFigSpecSuggestionsResult> {
@@ -46,6 +45,7 @@ export async function getFigSuggestions(
 		hasCurrentArg: false,
 		items: [],
 	};
+	const currentCommand = currentCommandAndArgString.split(' ')[0];
 	for (const spec of specs) {
 		const specLabels = getFigSuggestionLabel(spec);
 
@@ -66,7 +66,7 @@ export async function getFigSuggestions(
 					const description = getFixSuggestionDescription(spec);
 					result.items.push(createCompletionItem(
 						terminalContext.cursorPosition,
-						prefix,
+						currentCommandAndArgString,
 						{
 							label: { label: specLabel, description },
 							kind: vscode.TerminalCompletionItemKind.Method
@@ -83,8 +83,8 @@ export async function getFigSuggestions(
 				: availableCommands.filter(command => specLabel === (command.definitionCommand ?? (typeof command.label === 'string' ? command.label : command.label.label))));
 			if (
 				!(osIsWindows()
-					? commandAndAliases.some(e => precedingText.startsWith(`${removeAnyFileExtension((typeof e.label === 'string' ? e.label : e.label.label))} `))
-					: commandAndAliases.some(e => precedingText.startsWith(`${typeof e.label === 'string' ? e.label : e.label.label} `)))
+					? commandAndAliases.some(e => currentCommand.startsWith(removeAnyFileExtension((typeof e.label === 'string' ? e.label : e.label.label))))
+					: commandAndAliases.some(e => currentCommand.startsWith(typeof e.label === 'string' ? e.label : e.label.label)))
 			) {
 				continue;
 			}
@@ -93,7 +93,7 @@ export async function getFigSuggestions(
 			if (!actualSpec) {
 				continue;
 			}
-			const completionItemResult = await getFigSpecSuggestions(actualSpec, terminalContext, prefix, shellIntegrationCwd, env, name, executeExternals, token);
+			const completionItemResult = await getFigSpecSuggestions(actualSpec, terminalContext, currentCommandAndArgString, shellIntegrationCwd, env, name, executeExternals, token);
 			result.hasCurrentArg ||= !!completionItemResult?.hasCurrentArg;
 			if (completionItemResult) {
 				result.filesRequested ||= completionItemResult.filesRequested;

extensions/terminal-suggest/src/helpers/completionItem.ts

@@ -6,9 +6,9 @@
 import * as vscode from 'vscode';
 import type { ICompletionResource } from '../types';
 
-export function createCompletionItem(cursorPosition: number, prefix: string, commandResource: ICompletionResource, detail?: string, documentation?: string | vscode.MarkdownString, kind?: vscode.TerminalCompletionItemKind): vscode.TerminalCompletionItem {
-	const endsWithSpace = prefix.endsWith(' ');
-	const lastWord = endsWithSpace ? '' : prefix.split(' ').at(-1) ?? '';
+export function createCompletionItem(cursorPosition: number, currentCommandString: string, commandResource: ICompletionResource, detail?: string, documentation?: string | vscode.MarkdownString, kind?: vscode.TerminalCompletionItemKind): vscode.TerminalCompletionItem {
+	const endsWithSpace = currentCommandString.endsWith(' ');
+	const lastWord = endsWithSpace ? '' : currentCommandString.split(' ').at(-1) ?? '';
 	return {
 		label: commandResource.label,
 		detail: detail ?? commandResource.detail ?? '',

extensions/terminal-suggest/src/terminalSuggestMain.ts

@@ -20,7 +20,7 @@ import { getBashGlobals } from './shell/bash';
 import { getFishGlobals } from './shell/fish';
 import { getPwshGlobals } from './shell/pwsh';
 import { getZshGlobals } from './shell/zsh';
-import { getTokenType, TokenType } from './tokens';
+import { getTokenType, TokenType, shellTypeResetChars, defaultShellTypeResetChars } from './tokens';
 import type { ICompletionResource } from './types';
 import { createCompletionItem } from './helpers/completionItem';
 import { getFigSuggestions } from './fig/figInterface';
@@ -113,15 +113,15 @@ export async function activate(context: vscode.ExtensionContext) {
 			}
 			// Order is important here, add shell globals first so they are prioritized over path commands
 			const commands = [...shellGlobals, ...commandsInPath.completionResources];
-			const prefix = getPrefix(terminalContext.commandLine, terminalContext.cursorPosition);
+			const currentCommandString = getCurrentCommandAndArgs(terminalContext.commandLine, terminalContext.cursorPosition, terminalShellType);
 			const pathSeparator = isWindows ? '\\' : '/';
 			const tokenType = getTokenType(terminalContext, terminalShellType);
 			const result = await Promise.race([
 				getCompletionItemsFromSpecs(
 					availableSpecs,
 					terminalContext,
 					commands,
-					prefix,
+					currentCommandString,
 					tokenType,
 					terminal.shellIntegration?.cwd,
 					getEnvAsRecord(currentTerminalEnv),
@@ -152,12 +152,14 @@ export async function activate(context: vscode.ExtensionContext) {
 }
 
 /**
- * Adjusts the current working directory based on a given prefix if it is a folder.
- * @param prefix - The folder path prefix.
+ * Adjusts the current working directory based on a given current command string if it is a folder.
+ * @param currentCommandString - The current command string, which might contain a folder path prefix.
  * @param currentCwd - The current working directory.
  * @returns The new working directory.
  */
-export async function resolveCwdFromPrefix(prefix: string, currentCwd?: vscode.Uri): Promise<vscode.Uri | undefined> {
+export async function resolveCwdFromCurrentCommandString(currentCommandString: string, currentCwd?: vscode.Uri): Promise<vscode.Uri | undefined> {
+	const prefix = currentCommandString.split(/\s+/).pop()?.trim() ?? '';
+
 	if (!currentCwd) {
 		return;
 	}
@@ -195,7 +197,10 @@ export async function resolveCwdFromPrefix(prefix: string, currentCwd?: vscode.U
 	return undefined;
 }
 
-function getPrefix(commandLine: string, cursorPosition: number): string {
+// Retrurns the string that represents the current command and its arguments up to the cursor position.
+// Uses shell specific separators to determine the current command and its arguments.
+export function getCurrentCommandAndArgs(commandLine: string, cursorPosition: number, shellType: TerminalShellType | undefined): string {
+
 	// Return an empty string if the command line is empty after trimming
 	if (commandLine.trim() === '') {
 		return '';
@@ -209,11 +214,21 @@ function getPrefix(commandLine: string, cursorPosition: number): string {
 	// Extract the part of the line up to the cursor position
 	const beforeCursor = commandLine.slice(0, cursorPosition);
 
-	// Find the last sequence of non-whitespace characters before the cursor
-	const match = beforeCursor.match(/(\S+)\s*$/);
+	const resetChars = shellType ? shellTypeResetChars.get(shellType) ?? defaultShellTypeResetChars : defaultShellTypeResetChars;
+	// Find the last reset character before the cursor
+	let lastResetIndex = -1;
+	for (const char of resetChars) {
+		const idx = beforeCursor.lastIndexOf(char);
+		if (idx > lastResetIndex) {
+			lastResetIndex = idx;
+		}
+	}
+
+	// The start of the current command string is after the last reset char (plus one for the char itself)
+	const currentCommandStart = lastResetIndex + 1;
+	const currentCommandString = beforeCursor.slice(currentCommandStart).replace(/^\s+/, '');
 
-	// Return the match if found, otherwise undefined
-	return match ? match[0] : '';
+	return currentCommandString;
 }
 
 export function asArray<T>(x: T | T[]): T[];
@@ -226,7 +241,7 @@ export async function getCompletionItemsFromSpecs(
 	specs: Fig.Spec[],
 	terminalContext: vscode.TerminalCompletionContext,
 	availableCommands: ICompletionResource[],
-	prefix: string,
+	currentCommandString: string,
 	tokenType: TokenType,
 	shellIntegrationCwd: vscode.Uri | undefined,
 	env: Record<string, string>,
@@ -240,17 +255,16 @@ export async function getCompletionItemsFromSpecs(
 	let hasCurrentArg = false;
 	let fileExtensions: string[] | undefined;
 
-	let precedingText = terminalContext.commandLine.slice(0, terminalContext.cursorPosition + 1);
 	if (isWindows) {
-		const spaceIndex = precedingText.indexOf(' ');
-		const commandEndIndex = spaceIndex === -1 ? precedingText.length : spaceIndex;
-		const lastDotIndex = precedingText.lastIndexOf('.', commandEndIndex);
+		const spaceIndex = currentCommandString.indexOf(' ');
+		const commandEndIndex = spaceIndex === -1 ? currentCommandString.length : spaceIndex;
+		const lastDotIndex = currentCommandString.lastIndexOf('.', commandEndIndex);
 		if (lastDotIndex > 0) { // Don't treat dotfiles as extensions
-			precedingText = precedingText.substring(0, lastDotIndex) + precedingText.substring(spaceIndex);
+			currentCommandString = currentCommandString.substring(0, lastDotIndex) + currentCommandString.substring(spaceIndex);
 		}
 	}
 
-	const result = await getFigSuggestions(specs, terminalContext, availableCommands, prefix, tokenType, shellIntegrationCwd, env, name, precedingText, executeExternals ?? { executeCommand, executeCommandTimeout }, token);
+	const result = await getFigSuggestions(specs, terminalContext, availableCommands, currentCommandString, tokenType, shellIntegrationCwd, env, name, executeExternals ?? { executeCommand, executeCommandTimeout }, token);
 	if (result) {
 		hasCurrentArg ||= result.hasCurrentArg;
 		filesRequested ||= result.filesRequested;
@@ -266,10 +280,12 @@ export async function getCompletionItemsFromSpecs(
 		const labels = new Set(items.map((i) => typeof i.label === 'string' ? i.label : i.label.label));
 		for (const command of availableCommands) {
 			const commandTextLabel = typeof command.label === 'string' ? command.label : command.label.label;
-			if (!labels.has(commandTextLabel)) {
+			// Remove any file extension for matching on Windows
+			const labelWithoutExtension = isWindows ? commandTextLabel.replace(/\.[^ ]+$/, '') : commandTextLabel;
+			if (!labels.has(labelWithoutExtension)) {
 				items.push(createCompletionItem(
 					terminalContext.cursorPosition,
-					prefix,
+					currentCommandString,
 					command,
 					command.detail,
 					command.documentation,
@@ -300,7 +316,7 @@ export async function getCompletionItemsFromSpecs(
 
 	let cwd: vscode.Uri | undefined;
 	if (shellIntegrationCwd && (filesRequested || foldersRequested)) {
-		cwd = await resolveCwdFromPrefix(prefix, shellIntegrationCwd);
+		cwd = await resolveCwdFromCurrentCommandString(currentCommandString, shellIntegrationCwd);
 	}
 
 	return { items, filesRequested, foldersRequested, fileExtensions, cwd };
@@ -361,3 +377,4 @@ export function sanitizeProcessEnvironment(env: Record<string, string>, ...prese
 			}
 		});
 }
+

extensions/terminal-suggest/src/test/terminalSuggestMain.test.ts

@@ -6,7 +6,7 @@
 import { deepStrictEqual, strictEqual } from 'assert';
 import 'mocha';
 import { basename } from 'path';
-import { asArray, getCompletionItemsFromSpecs } from '../terminalSuggestMain';
+import { asArray, getCompletionItemsFromSpecs, getCurrentCommandAndArgs } from '../terminalSuggestMain';
 import { getTokenType } from '../tokens';
 import { cdTestSuiteSpec as cdTestSuite } from './completions/cd.test';
 import { codeSpecOptionsAndSubcommands, codeTestSuite, codeTunnelTestSuite } from './completions/code.test';
@@ -92,15 +92,15 @@ suite('Terminal Suggest', () => {
 				test(`'${testSpec.input}' -> ${expectedString}`, async () => {
 					const commandLine = testSpec.input.split('|')[0];
 					const cursorPosition = testSpec.input.indexOf('|');
-					const prefix = commandLine.slice(0, cursorPosition).split(' ').at(-1) || '';
+					const currentCommandString = getCurrentCommandAndArgs(commandLine, cursorPosition, undefined);
 					const filesRequested = testSpec.expectedResourceRequests?.type === 'files' || testSpec.expectedResourceRequests?.type === 'both';
 					const foldersRequested = testSpec.expectedResourceRequests?.type === 'folders' || testSpec.expectedResourceRequests?.type === 'both';
 					const terminalContext = { commandLine, cursorPosition, allowFallbackCompletions: true };
 					const result = await getCompletionItemsFromSpecs(
 						completionSpecs,
 						terminalContext,
 						availableCommands.map(c => { return { label: c }; }),
-						prefix,
+						currentCommandString,
 						getTokenType(terminalContext, undefined),
 						testPaths.cwd,
 						{},