chore: feedback

Author: tthornton3-chwy

package.nls.json

@@ -8,12 +8,12 @@
     "java.debugger.launch.modulePaths.auto": "Automatically resolve the module paths of current project.",
     "java.debugger.launch.modulePaths.runtime": "The module paths within 'runtime' scope of current project.",
     "java.debugger.launch.modulePaths.test": "The module paths within 'test' scope of current project.",
-    "java.debugger.launch.modulePaths.exclude": "The path after '!' will be excluded from the modulePaths. A slash (forwards or backwards) will treat the path as an exact match.",
+    "java.debugger.launch.modulePaths.exclude": "The path after '!' will be excluded from the modulePaths. A trailing slash or backslash will treat the path as an exact match.",
     "java.debugger.launch.classPaths.description": "The classpaths for launching the JVM. If not specified, the debugger will automatically resolve from current project.",
     "java.debugger.launch.classPaths.auto": "Automatically resolve the classpaths of current project.",
     "java.debugger.launch.classPaths.runtime": "The classpaths within 'runtime' scope of current project.",
     "java.debugger.launch.classPaths.test": "The classpaths within 'test' scope of current project.",
-    "java.debugger.launch.classPaths.exclude": "The path after '!' will be excluded from the classpaths. A slash (forwards or backwards) will treat the path as an exact match.",
+    "java.debugger.launch.classPaths.exclude": "The path after '!' will be excluded from the classpaths. A trailing slash or backslash will treat the path as an exact match.",
     "java.debugger.launch.sourcePaths.description": "The extra source directories of the program. The debugger looks for source code from project settings by default. This option allows the debugger to look for source code in extra directories.",
     "java.debugger.launch.encoding.description": "The file.encoding setting for the JVM. Possible values can be found in https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html.",
     "java.debugger.launch.cwd.description": "The working directory of the program. Defaults to the current workspace root.",

src/configurationProvider.ts

@@ -514,7 +514,7 @@ export class JavaDebugConfigurationProvider implements vscode.DebugConfiguration
 
         return result.filter((r) => {
             for (const [excludedPath, isDirect] of excludes.entries()) {
-                if (isDirect && r === excludedPath) {
+                if (isDirect && stripTrailingSeparators(r) === stripTrailingSeparators(excludedPath)) {
                     return false;
                 }
 
@@ -834,6 +834,22 @@ async function updateDebugSettings(event?: vscode.ConfigurationChangeEvent) {
     }
 }
 
+/**
+ * Removes trailing path separators for comparison, leaving filesystem roots
+ * such as "/", "\\", or "C:\\" unchanged (including Windows drive roots when
+ * running on POSIX).
+ */
+function stripTrailingSeparators(fsPath: string): string {
+    if (!fsPath || fsPath === "/" || fsPath === "\\" || fsPath === path.parse(fsPath).root) {
+        return fsPath;
+    }
+    // Windows drive root, recognized even when the host platform is POSIX.
+    if (/^[A-Za-z]:[\\/]$/.test(fsPath)) {
+        return fsPath;
+    }
+    return fsPath.replace(/[\\/]+$/, "");
+}
+
 function needsBuildWorkspace(): boolean {
     const javaConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("java");
     return javaConfig?.debug?.settings?.forceBuildBeforeLaunch;

test/configurationProvider.test.ts

@@ -65,6 +65,7 @@ suite("JavaDebugConfigurationProvider", () => {
         async function assertExactDirectoryExclusion(
             excludeSuffix: "\\" | "/",
             label: string,
+            includeSuffix: "" | "\\" | "/" = "",
         ): Promise<void> {
             const workspace = createTestWorkspace();
             workspaces.push(workspace);
@@ -73,7 +74,7 @@ suite("JavaDebugConfigurationProvider", () => {
             const jarFs = vscode.Uri.file(workspace.jarPath).fsPath;
             const filterExcluded = getFilterExcluded(new JavaDebugConfigurationProvider());
             const result = await filterExcluded(workspace.folder, [
-                libDirFs,
+                `${libDirFs}${includeSuffix}`,
                 jarFs,
                 `!${workspace.libDir}${excludeSuffix}`,
             ]);
@@ -92,5 +93,13 @@ suite("JavaDebugConfigurationProvider", () => {
         test("treats a trailing forward slash as an exact match (Linux-style paths)", async () => {
             await assertExactDirectoryExclusion("/", "Linux-style");
         });
+
+        test("exact-matches when the included Windows-style path ends with a backslash", async () => {
+            await assertExactDirectoryExclusion("\\", "Windows-style included trailing separator", "\\");
+        });
+
+        test("exact-matches when the included Linux-style path ends with a forward slash", async () => {
+            await assertExactDirectoryExclusion("/", "Linux-style included trailing separator", "/");
+        });
     });
 });