From 7775bb6fc9d99a41560c20562addccf326b14a5f Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Mon, 3 Feb 2025 15:25:24 -0800
Subject: [PATCH 1/2] Re-enable skipped test

Part of #239532
---
 .../suggest/test/browser/simpleCompletionModel.test.ts         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vs/workbench/services/suggest/test/browser/simpleCompletionModel.test.ts b/src/vs/workbench/services/suggest/test/browser/simpleCompletionModel.test.ts
index 92a62738e08..706c1fc1f30 100644
--- a/src/vs/workbench/services/suggest/test/browser/simpleCompletionModel.test.ts
+++ b/src/vs/workbench/services/suggest/test/browser/simpleCompletionModel.test.ts
@@ -92,8 +92,7 @@ suite('SimpleCompletionModel', function () {
 			assertItems(createFolderItemsModel(...initial), expected);
 		});
 
-		// #239532 Failing on CI not locally?
-		test.skip('should handle many files and folders correctly', function () {
+		test('should handle many files and folders correctly', function () {
 			// This is VS Code's root directory with some python items added that have special
 			// sorting
 			const items = [

From fb31b5b05f7f980fd1e36dc8adc35947c065ced7 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Wed, 5 Feb 2025 05:41:22 -0800
Subject: [PATCH 2/2] Don't treat dotfiles with a single period as having an
 extension

---
 .../services/suggest/browser/simpleCompletionItem.ts        | 3 ++-
 .../suggest/test/browser/simpleCompletionModel.test.ts      | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts b/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
index b1301167f1a..d3590fbf873 100644
--- a/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
+++ b/src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
@@ -101,8 +101,9 @@ export class SimpleCompletionItem {
 			if (isWindows) {
 				this.labelLow = this.labelLow.replaceAll('/', '\\');
 			}
+			// Don't include dotfiles as extensions when sorting
 			const extIndex = this.labelLow.lastIndexOf('.');
-			if (extIndex !== -1) {
+			if (extIndex > 0) {
 				this.labelLowExcludeFileExt = this.labelLow.substring(0, extIndex);
 				this.fileExtLow = this.labelLow.substring(extIndex + 1);
 			}
diff --git a/src/vs/workbench/services/suggest/test/browser/simpleCompletionModel.test.ts b/src/vs/workbench/services/suggest/test/browser/simpleCompletionModel.test.ts
index 706c1fc1f30..216f8c91b78 100644
--- a/src/vs/workbench/services/suggest/test/browser/simpleCompletionModel.test.ts
+++ b/src/vs/workbench/services/suggest/test/browser/simpleCompletionModel.test.ts
@@ -157,8 +157,6 @@ suite('SimpleCompletionModel', function () {
 				'.configurations',
 				'CONTRIBUTING.md',
 				'.devcontainer',
-				'.npmrc',
-				'.gitignore',
 				'.editorconfig',
 				'eslint.config.js',
 				'.eslint-ignore',
@@ -167,13 +165,15 @@ suite('SimpleCompletionModel', function () {
 				'.gitattributes',
 				'.git-blame-ignore-revs',
 				'.github',
+				'.gitignore',
 				'gulpfile.js',
 				'LICENSE.txt',
 				'.lsifrc.json',
-				'.nvmrc',
 				'.mailmap',
 				'.mention-bot',
 				'node_modules',
+				'.npmrc',
+				'.nvmrc',
 				'out',
 				'package.json',
 				'package-lock.json',