Fix dirname on Windows

Author: walles

src/diagnostics.ts

@@ -35,7 +35,7 @@ export function getDiagnostics(doc: vscode.TextDocument): vscode.Diagnostic[] {
     returnMe.push(...getSecondLineDiagnostic(secondLine));
   }
 
-  if (utils.basename(doc.fileName) === "COMMIT_EDITMSG") {
+  if (doc.fileName.endsWith("COMMIT_EDITMSG")) {
     returnMe.push(...getNoDiffDiagnostic(doc));
   }
 

src/messages.ts

@@ -1,10 +1,9 @@
 import * as vscode from "vscode";
 import * as verbosecommits from "./verbosecommits";
-import * as utils from "./utils";
 
 /** Show informational toast about doing verbose Git commits */
 export async function displayVerboseDiffMessage(doc: vscode.TextDocument) {
-  if (utils.basename(doc.fileName) !== "COMMIT_EDITMSG") {
+  if (!doc.fileName.endsWith("COMMIT_EDITMSG")) {
     // We only like one kind of files
     return;
   }

src/quickfix.ts

@@ -24,7 +24,7 @@ export default class GitCommitCodeActionProvider
     returnMe.push(...createBranchIssueIdFix(gitBranch, doc, range));
     returnMe.push(...createUpcaseJiraIdFix(doc, range));
 
-    if (utils.basename(doc.fileName) === "COMMIT_EDITMSG") {
+    if (doc.fileName.endsWith("COMMIT_EDITMSG")) {
       returnMe.push(...(await createEnableGitVerboseCommitFix(doc, range)));
     }
 

src/test/suite/utils.test.ts

@@ -50,4 +50,14 @@ suite("Utils", () => {
       undefined,
     );
   });
+
+  test("Our dirname works on Windows as well", () => {
+    assert.strictEqual(utils.dirname("/foo/bar/baz.txt"), "/foo/bar");
+    assert.strictEqual(utils.dirname("foo/bar/baz.txt"), "foo/bar");
+    assert.strictEqual(utils.dirname("baz.txt"), "");
+    assert.strictEqual(utils.dirname("/foo/bar/"), "/foo");
+    assert.strictEqual(utils.dirname("C:/foo/bar/baz.txt"), "C:/foo/bar");
+    assert.strictEqual(utils.dirname("C:/foo/bar/"), "C:/foo");
+    assert.strictEqual(utils.dirname("baz.txt"), "");
+  });
 });

src/utils.ts

@@ -94,25 +94,17 @@ export function getJiraIssueIdFromBranchName(
   return undefined;
 }
 
-/**
- * Returns the last portion of a path, handling both / and \ separators.
- * Equivalent to Node's path.basename, but works in browser and cross-platform.
- * @param filePath - The full file path.
- * @returns The file name portion of the path.
- */
-export function basename(filePath: string): string {
-  const parts = filePath.split(/[/]+/);
-  return parts.pop() || "";
-}
-
 /**
  * Returns the directory portion of a path, handling both / and \ separators.
  * Equivalent to Node's path.dirname, but works in browser and cross-platform.
  * @param filePath - The full file path.
  * @returns The directory portion of the path.
  */
 export function dirname(filePath: string): string {
-  const parts = filePath.split(/[/]+/);
+  // First, remove any trailing / or \
+  filePath = filePath.replace(/[\\/]+$/, "");
+
+  const parts = filePath.split(/[\\/]+/);
   parts.pop();
   return parts.join("/");
 }