Merge pull request #733 from lukecotter/feat-custom-themes-label

Author: lcottercertinia

lana/src/commands/SwitchTimelineTheme.ts

@@ -33,14 +33,21 @@ export class SwitchTimelineTheme {
 
   private static async command(_context: Context, _uri: Uri): Promise<void> {
     const config = getConfig();
-    const customThemesNames = Object.keys(config.timeline.customThemes || {});
-    const allThemeNames = Array.from(new Set(THEMES.concat(customThemesNames))).sort();
 
-    const items = allThemeNames.map((label) => ({
+    const items = THEMES.map((label) => ({
       label,
       description: label === DEFAULT_THEME ? 'default' : '',
     }));
 
+    const builtInThemesNames = new Set(THEMES);
+    for (const customThemeName of Object.keys(config.timeline.customThemes ?? {})) {
+      if (!builtInThemesNames.has(customThemeName)) {
+        items.push({ label: customThemeName, description: 'custom' });
+      }
+    }
+
+    items.sort((a, b) => a.label.localeCompare(b.label));
+
     // Create a QuickPick that allows custom text
     const pick = window.createQuickPick();
     pick.items = items;

lana/src/commands/__tests__/SwitchTimelineTheme.test.ts

@@ -133,8 +133,12 @@ describe('SwitchTimelineTheme', () => {
       await command.run({} as never);
 
       const items = mockQuickPick.items;
-      expect(items.some((i) => i.label === 'My Custom Theme')).toBe(true);
-      expect(items.some((i) => i.label === 'Another Theme')).toBe(true);
+      const myCustom = items.find((i) => i.label === 'My Custom Theme');
+      const another = items.find((i) => i.label === 'Another Theme');
+      expect(myCustom).toBeDefined();
+      expect(myCustom?.description).toBe('custom');
+      expect(another).toBeDefined();
+      expect(another?.description).toBe('custom');
     });
 
     it('should sort themes alphabetically', async () => {
@@ -172,6 +176,18 @@ describe('SwitchTimelineTheme', () => {
       expect(defaultItem?.description).toBe('default');
     });
 
+    it('should not mark non-default built-in themes as custom', async () => {
+      const mockContext = createMockContext();
+      const command = SwitchTimelineTheme.getCommand(
+        mockContext as unknown as import('../../Context.js').Context,
+      );
+
+      await command.run({} as never);
+
+      const draculaItem = mockQuickPick.items.find((i) => i.label === 'Dracula');
+      expect(draculaItem?.description).toBe('');
+    });
+
     it('should deduplicate themes when custom theme has same name as preset', async () => {
       mockGetConfig.mockReturnValue({
         timeline: {