Fix detecting Cursor IDE name

Author: alanhamlett

src/utils.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import { COMMON_AI_EXTENSIONS, TIME_BETWEEN_HEARTBEATS_MS } from './constants';
 
 export class Utils {
-  private static appNames = {
+  private static appNames: { [key: string]: string } = {
     'Arduino IDE': 'arduino',
     'Azure Data Studio': 'azdata',
     Cursor: 'cursor',
@@ -15,6 +15,16 @@ export class Utils {
     Windsurf: 'windsurf',
   };
 
+  private static editorNameFromHint(hint?: string): string | undefined {
+    const normalized = hint?.replace(/\s/g, '').toLowerCase();
+    if (!normalized) return undefined;
+
+    for (const editor of Object.keys(this.appNames)) {
+      const editorKey = editor.replace(/\s/g, '').toLowerCase();
+      if (normalized.includes(editorKey)) return this.appNames[editor];
+    }
+  }
+
   public static quote(str: string): string {
     if (str.includes(' ')) return `"${str.replace(/"/g, '\\"')}"`;
     return str;
@@ -199,22 +209,16 @@ export class Utils {
     return false;
   }
 
-  public static getEditorName(): string {
-    if (this.appNames[vscode.env.appName]) {
-      return this.appNames[vscode.env.appName];
-    }
+  public static getEditorName(env: typeof vscode.env = vscode.env): string {
+    const editor = this.editorNameFromHint(env.uriScheme) || this.editorNameFromHint(env.appRoot);
+    if (editor) return editor;
 
-    const appRoot = vscode.env.appRoot.toLowerCase();
-    for (const editor of Object.keys(this.appNames)) {
-      if (appRoot.includes(editor.toLowerCase())) {
-        return this.appNames[editor];
-      }
-    }
+    if (this.appNames[env.appName]) return this.appNames[env.appName];
 
-    if (vscode.env.appName.toLowerCase().includes('visual')) {
+    if (env.appName.toLowerCase().includes('visual')) {
       return 'vscode';
     } else {
-      return vscode.env.appName.replace(/\s/g, '').toLowerCase();
+      return env.appName.replace(/\s/g, '').toLowerCase();
     }
   }
 

test/extension.test.ts

@@ -1,9 +1,59 @@
 import * as assert from 'assert';
 import * as path from 'path';
 import * as vscode from 'vscode';
+import { Utils } from '../src/utils';
 import { WakaTime } from '../src/wakatime';
 
+const mockEnv = (overrides: Partial<typeof vscode.env>): typeof vscode.env => {
+  return {
+    appName: 'Visual Studio Code',
+    appRoot: '/Applications/Visual Studio Code.app/Contents/Resources/app',
+    uriScheme: 'vscode',
+    ...overrides,
+  } as typeof vscode.env;
+};
+
 // Defines a Mocha test suite to group tests of similar kind together
 suite("WakaTime Tests", () => {
 	// Should be implemented after integration with CI/CD
 });
+
+suite('Utils.getEditorName Tests', () => {
+  test('detects editor from appName', () => {
+    assert.strictEqual(Utils.getEditorName(mockEnv({ appName: 'Cursor' })), 'cursor');
+    assert.strictEqual(Utils.getEditorName(mockEnv({ appName: 'Windsurf' })), 'windsurf');
+  });
+
+  test('detects Cursor from uriScheme when appName reports vscode', () => {
+    const env = mockEnv({ uriScheme: 'cursor' });
+    assert.strictEqual(Utils.getEditorName(env), 'cursor');
+  });
+
+  test('prefers uriScheme over appName', () => {
+    const env = mockEnv({ appName: 'Visual Studio Code', uriScheme: 'windsurf' });
+    assert.strictEqual(Utils.getEditorName(env), 'windsurf');
+  });
+
+  test('detects Cursor from appRoot when appName and uriScheme report vscode', () => {
+    const env = mockEnv({ appRoot: '/Applications/Cursor.app/Contents/Resources/app' });
+    assert.strictEqual(Utils.getEditorName(env), 'cursor');
+  });
+
+  test('appRoot matching ignores whitespace in editor names', () => {
+    const env = mockEnv({ appRoot: 'C:\\Program Files\\Azure Data Studio\\resources\\app' });
+    assert.strictEqual(Utils.getEditorName(env), 'azdata');
+  });
+
+  test('falls back to vscode for Visual Studio Code', () => {
+    assert.strictEqual(Utils.getEditorName(mockEnv({})), 'vscode');
+  });
+
+  test('falls back to normalized appName for unknown editors', () => {
+    const env = mockEnv({
+      appName: 'Some Editor',
+      appRoot: '/opt/some-editor/resources/app',
+      uriScheme: 'some-editor',
+    });
+    assert.strictEqual(Utils.getEditorName(env), 'someeditor');
+  });
+});