do not allow duplicate flags (#240292)

Author: meganrogge

Diff for: extensions/terminal-suggest/src/terminalSuggestMain.ts

@@ -289,14 +289,17 @@ export async function collectCompletionItemResult(command: Command, parsedArgume
 		if (!specArgs) {
 			return { filesRequested, foldersRequested };
 		}
-
+		const flagsToExclude = kind === vscode.TerminalCompletionItemKind.Flag ? parsedArguments?.passedOptions.map(option => option.name).flat() : undefined;
 		if (Array.isArray(specArgs)) {
 			for (const item of specArgs) {
 				const suggestionLabels = getLabel(item);
-				if (!suggestionLabels) {
+				if (!suggestionLabels?.length) {
 					continue;
 				}
 				for (const label of suggestionLabels) {
+					if (flagsToExclude?.includes(label)) {
+						continue;
+					}
 					items.push(
 						createCompletionItem(
 							terminalContext.cursorPosition,
@@ -311,6 +314,9 @@ export async function collectCompletionItemResult(command: Command, parsedArgume
 			}
 		} else {
 			for (const [label, item] of Object.entries(specArgs)) {
+				if (flagsToExclude?.includes(label)) {
+					continue;
+				}
 				items.push(
 					createCompletionItem(
 						terminalContext.cursorPosition,
@@ -332,7 +338,7 @@ export async function collectCompletionItemResult(command: Command, parsedArgume
 		await addSuggestions(parsedArguments.completionObj.subcommands, vscode.TerminalCompletionItemKind.Method);
 	}
 	if (parsedArguments.suggestionFlags & SuggestionFlag.Options) {
-		await addSuggestions(parsedArguments.completionObj.options, vscode.TerminalCompletionItemKind.Flag);
+		await addSuggestions(parsedArguments.completionObj.options, vscode.TerminalCompletionItemKind.Flag, parsedArguments);
 	}
 
 	return { filesRequested, foldersRequested };

Diff for: extensions/terminal-suggest/src/test/completions/code.test.ts

@@ -41,8 +41,8 @@ export function createCodeTestSpecs(executable: string): ITestSpec[] {
 		{ input: `${executable} --log |`, expectedCompletions: logOptions },
 		{ input: `${executable} --sync |`, expectedCompletions: syncOptions },
 		{ input: `${executable} --extensions-dir |`, expectedResourceRequests: { type: 'folders', cwd: testPaths.cwd } },
-		{ input: `${executable} --list-extensions |`, expectedCompletions: codeSpecOptions, expectedResourceRequests: { type: 'both', cwd: testPaths.cwd } },
-		{ input: `${executable} --show-versions |`, expectedCompletions: codeSpecOptions, expectedResourceRequests: { type: 'both', cwd: testPaths.cwd } },
+		{ input: `${executable} --list-extensions |`, expectedCompletions: codeSpecOptions.filter(c => c !== '--list-extensions'), expectedResourceRequests: { type: 'both', cwd: testPaths.cwd } },
+		{ input: `${executable} --show-versions |`, expectedCompletions: codeSpecOptions.filter(c => c !== '--show-versions'), expectedResourceRequests: { type: 'both', cwd: testPaths.cwd } },
 		{ input: `${executable} --category |`, expectedCompletions: categoryOptions },
 		{ input: `${executable} --category a|`, expectedCompletions: categoryOptions },
 

Diff for: extensions/terminal-suggest/src/test/completions/upstream/ls.test.ts

@@ -72,8 +72,7 @@ export const lsTestSuiteSpec: ISuiteSpec = {
 		{ input: 'ls -a|', expectedCompletions: allOptions },
 
 		// Duplicate option
-		// TODO: Duplicate options should not be presented https://github.com/microsoft/vscode/issues/239607
-		// { input: 'ls -a -|', expectedCompletions: removeArrayEntry(allOptions, '-a'), expectedResourceRequests: { type: 'both', cwd: testPaths.cwd } },
+		{ input: 'ls -a -|', expectedCompletions: allOptions.filter(o => o !== '-a'), expectedResourceRequests: { type: 'both', cwd: testPaths.cwd } },
 
 		// Relative paths
 		{ input: 'ls c|', expectedCompletions: allOptions, expectedResourceRequests: { type: 'both', cwd: testPaths.cwd } },
@@ -89,3 +88,4 @@ export const lsTestSuiteSpec: ISuiteSpec = {
 		{ input: 'ls ../sibling|', expectedCompletions: allOptions, expectedResourceRequests: { type: 'both', cwd: testPaths.cwdParent } },
 	]
 };
+

Diff for: extensions/terminal-suggest/src/test/fig.test.ts

@@ -93,9 +93,8 @@ export const figGenericTestSuites: ISuiteSpec[] = [
 		testSpecs: [
 			{ input: 'foo |', expectedCompletions: ['--bar', '--baz'] },
 			{ input: 'foo bar|', expectedCompletions: ['--bar', '--baz'] },
-			// TODO: Duplicate options should not be presented https://github.com/microsoft/vscode/issues/239607
-			// { input: 'foo --bar |', expectedCompletions: ['--baz'] },
-			// { input: 'foo --baz |', expectedCompletions: ['--bar'] },
+			{ input: 'foo --bar |', expectedCompletions: ['--baz'] },
+			{ input: 'foo --baz |', expectedCompletions: ['--bar'] },
 		]
 	},
 	{