move punctuation methods down in terminal completion sorting order (microsoft#251922)

fix microsoft#251919

Author: meganrogge

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionItem.ts

@@ -86,14 +86,15 @@ export class TerminalCompletionItem extends SimpleCompletionItem {
 	labelLowNormalizedPath: string;
 
 	/**
-	 * A penalty that applies to files or folders starting with the underscore character.
+	 * The file extension part from {@link labelLow}.
 	 */
-	underscorePenalty: 0 | 1 = 0;
+	fileExtLow: string = '';
 
 	/**
-	 * The file extension part from {@link labelLow}.
+	 * A penalty that applies to completions that are comprised of only punctuation characters or
+	 * that applies to files or folders starting with the underscore character.
 	 */
-	fileExtLow: string = '';
+	punctuationPenalty: 0 | 1 = 0;
 
 	constructor(
 		override readonly completion: ITerminalCompletion
@@ -123,11 +124,16 @@ export class TerminalCompletionItem extends SimpleCompletionItem {
 			if (completion.kind === TerminalCompletionItemKind.Folder) {
 				this.labelLowNormalizedPath = this.labelLowNormalizedPath.replace(/\/$/, '');
 			}
-			this.underscorePenalty = basename(this.labelLowNormalizedPath).startsWith('_') ? 1 : 0;
 		}
+
+		this.punctuationPenalty = shouldPenalizeForPunctuation(this.labelLowExcludeFileExt) ? 1 : 0;
 	}
 }
 
 function isFile(completion: ITerminalCompletion): boolean {
 	return !!(completion.kind === TerminalCompletionItemKind.File || completion.isFileOverride);
 }
+
+function shouldPenalizeForPunctuation(label: string): boolean {
+	return basename(label).startsWith('_') || /^[\[\]\{\}\(\)\.,;:!?\/\\\-_@#~*%^=$]+$/.test(label);
+}

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts

@@ -52,9 +52,10 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
 		return 1;
 	}
 
-	// Sort by underscore penalty (eg. `__init__/` should be penalized)
-	if (a.underscorePenalty !== b.underscorePenalty) {
-		return a.underscorePenalty - b.underscorePenalty;
+	if (a.punctuationPenalty !== b.punctuationPenalty) {
+		// Sort by underscore penalty (eg. `__init__/` should be penalized)
+		// Sort by punctuation penalty (eg. `;` should be penalized)
+		return a.punctuationPenalty - b.punctuationPenalty;
 	}
 
 	// Sort files of the same name by extension

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionService.ts

@@ -194,7 +194,13 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 			if (completions.resourceRequestConfig) {
 				const resourceCompletions = await this.resolveResources(completions.resourceRequestConfig, promptValue, cursorPosition, provider.id, capabilities, shellType);
 				if (resourceCompletions) {
-					completionItems.push(...resourceCompletions);
+					for (const item of resourceCompletions) {
+						const labels = new Set(completionItems.map(c => c.label));
+						// Ensure no duplicates such as .
+						if (!labels.has(item.label)) {
+							completionItems.push(item);
+						}
+					}
 				}
 			}
 			return completionItems;
@@ -350,7 +356,6 @@ export class TerminalCompletionService extends Disposable implements ITerminalCo
 					break;
 				}
 			}
-
 			resourceCompletions.push({
 				label,
 				provider,

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts

@@ -584,7 +584,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
 			this._inlineCompletionItem.fileExtLow = x.fileExtLow;
 			this._inlineCompletionItem.labelLowExcludeFileExt = x.labelLowExcludeFileExt;
 			this._inlineCompletionItem.labelLowNormalizedPath = x.labelLowNormalizedPath;
-			this._inlineCompletionItem.underscorePenalty = x.underscorePenalty;
+			this._inlineCompletionItem.punctuationPenalty = x.punctuationPenalty;
 			this._inlineCompletionItem.word = x.word;
 			this._model?.forceRefilterAll();
 		}

src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionModel.test.ts

@@ -218,6 +218,34 @@ suite('TerminalCompletionModel', function () {
 		});
 	});
 
+	suite('Punctuation', () => {
+		test('punctuation chars should be below other methods', function () {
+			const items = [
+				createItem({ label: 'a' }),
+				createItem({ label: 'b' }),
+				createItem({ label: ',' }),
+				createItem({ label: ';' }),
+				createItem({ label: ':' }),
+				createItem({ label: 'c' }),
+				createItem({ label: '[' }),
+				createItem({ label: '...' }),
+			];
+			model = new TerminalCompletionModel(items, new LineContext('', 0));
+			assertItems(model, ['a', 'b', 'c', ',', ';', ':', '[', '...']);
+		});
+		test('punctuation chars should be below other files', function () {
+			const items = [
+				createItem({ label: '..' }),
+				createItem({ label: '...' }),
+				createItem({ label: '../' }),
+				createItem({ label: './a/' }),
+				createItem({ label: './b/' }),
+			];
+			model = new TerminalCompletionModel(items, new LineContext('', 0));
+			assertItems(model, ['./a/', './b/', '..', '...', '../']);
+		});
+	});
+
 	suite('inline completions', () => {
 		function createItems(kind: TerminalCompletionItemKind.InlineSuggestion | TerminalCompletionItemKind.InlineSuggestionAlwaysOnTop) {
 			return [