From bcc87d67357f1e819d1dd903a0fa4cb840a5f192 Mon Sep 17 00:00:00 2001 From: dylan-robins Date: Fri, 15 Nov 2024 18:57:32 +0100 Subject: [PATCH 1/3] feat: add missing "testing.*" theme colours to schema --- .../schemas/customUIColors.schema.json | 80 +++++++++++++++++-- 1 file changed, 74 insertions(+), 6 deletions(-) diff --git a/packages/catppuccin-vsc/schemas/customUIColors.schema.json b/packages/catppuccin-vsc/schemas/customUIColors.schema.json index 16aef98e..85b395af 100644 --- a/packages/catppuccin-vsc/schemas/customUIColors.schema.json +++ b/packages/catppuccin-vsc/schemas/customUIColors.schema.json @@ -2360,20 +2360,20 @@ "description": "Border on the side of the terminal tab in the panel. This defaults to tab.activeBorder.", "$ref": "#/$defs/catppuccinColor" }, - "testing.iconFailed": { - "description": "Color for the 'failed' icon in the test explorer.", + "testing.runAction": { + "description": "Color for 'run' icons in the editor.", "$ref": "#/$defs/catppuccinColor" }, "testing.iconErrored": { "description": "Color for the 'Errored' icon in the test explorer.", "$ref": "#/$defs/catppuccinColor" }, - "testing.iconPassed": { - "description": "Color for the 'passed' icon in the test explorer.", + "testing.iconFailed": { + "description": "Color for the 'failed' icon in the test explorer.", "$ref": "#/$defs/catppuccinColor" }, - "testing.runAction": { - "description": "Color for 'run' icons in the editor.", + "testing.iconPassed": { + "description": "Color for the 'passed' icon in the test explorer.", "$ref": "#/$defs/catppuccinColor" }, "testing.iconQueued": { @@ -2388,6 +2388,30 @@ "description": "Color for the 'Skipped' icon in the test explorer.", "$ref": "#/$defs/catppuccinColor" }, + "testing.iconErrored.retired": { + "description": "Retired color for the 'Errored' icon in the test explorer.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.iconFailed.retired": { + "description": "Retired color for the 'failed' icon in the test explorer.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.iconPassed.retired": { + "description": "Retired color for the 'passed' icon in the test explorer.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.iconQueued.retired": { + "description": "Retired color for the 'Queued' icon in the test explorer.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.iconUnset.retired": { + "description": "Retired color for the 'Unset' icon in the test explorer.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.iconSkipped.retired": { + "description": "Retired color for the 'Skipped' icon in the test explorer.", + "$ref": "#/$defs/catppuccinColor" + }, "testing.peekBorder": { "description": "Color of the peek view borders and arrow.", "$ref": "#/$defs/catppuccinColor" @@ -2412,6 +2436,50 @@ "description": "Margin color beside info messages shown inline in the editor.", "$ref": "#/$defs/catppuccinColor" }, + "testing.messagePeekBorder": { + "description": "Color of the peek view borders and arrow when peeking a logged message.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.messagePeekHeaderBackground": { + "description": "Color of the peek view borders and arrow when peeking a logged message.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.coveredBackground": { + "description": "Background color of text that was covered.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.coveredBorder": { + "description": "Border color of text that was covered.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.coveredGutterBackground": { + "description": "Gutter color of regions where code was covered.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.uncoveredBranchBackground": { + "description": "Background of the widget shown for an uncovered branch.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.uncoveredBackground": { + "description": "Background color of text that was not covered.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.uncoveredBorder": { + "description": "Border color of text that was not covered.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.uncoveredGutterBackground": { + "description": "Gutter color of regions where code not covered.", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.coverCountBadgeBackground": { + "description": "Background for the badge indicating execution count", + "$ref": "#/$defs/catppuccinColor" + }, + "testing.coverCountBadgeForeground": { + "description": "Foreground for the badge indicating execution count", + "$ref": "#/$defs/catppuccinColor" + }, "welcomePage.background": { "description": "Background color for the Welcome page.", "$ref": "#/$defs/catppuccinColor" From 6335f78e4763c370d11da57e1436e915a3335e06 Mon Sep 17 00:00:00 2001 From: dylan-robins Date: Fri, 15 Nov 2024 18:58:24 +0100 Subject: [PATCH 2/3] feat: implement missing "testing.*" colours in getUiColors function --- packages/catppuccin-vsc/src/theme/uiColors.ts | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/packages/catppuccin-vsc/src/theme/uiColors.ts b/packages/catppuccin-vsc/src/theme/uiColors.ts index 167fadbf..bf6bc0f0 100644 --- a/packages/catppuccin-vsc/src/theme/uiColors.ts +++ b/packages/catppuccin-vsc/src/theme/uiColors.ts @@ -121,6 +121,38 @@ export const getUiColors = ( "debugConsole.sourceForeground": palette.rosewater, "debugConsoleInputIcon.foreground": palette.text, + // testing + "testing.runAction": accent, + "testing.iconErrored": palette.red, + "testing.iconFailed": palette.red, + "testing.iconPassed": palette.green, + "testing.iconQueued": palette.blue, + "testing.iconUnset": palette.text, + "testing.iconSkipped": palette.subtext0, + "testing.iconErrored.retired": palette.red, + "testing.iconFailed.retired": palette.red, + "testing.iconPassed.retired": palette.green, + "testing.iconQueued.retired": palette.blue, + "testing.iconUnset.retired": palette.text, + "testing.iconSkipped.retired": palette.subtext0, + "testing.peekBorder": accent, + "testing.peekHeaderBackground": palette.surface2, + "testing.message.error.decorationForeground": opacity(palette.red, 0.8), + "testing.message.error.lineBackground": opacity(palette.red, 0.15), + "testing.message.info.decorationForeground": opacity(palette.green, 0.8), + "testing.message.info.lineBackground": opacity(palette.green, 0.15), + "testing.messagePeekBorder": accent, + "testing.messagePeekHeaderBackground": palette.surface2, + "testing.coveredBackground": opacity(palette.green, 0.3), + "testing.coveredBorder": transparent, + "testing.coveredGutterBackground": opacity(palette.green, 0.3), + "testing.uncoveredBranchBackground": opacity(palette.red, 0.2), + "testing.uncoveredBackground": opacity(palette.red, 0.2), + "testing.uncoveredBorder": transparent, + "testing.uncoveredGutterBackground": opacity(palette.red, 0.2), + "testing.coverCountBadgeBackground": transparent, + "testing.coverCountBadgeForeground": accent, + "diffEditor.border": palette.surface2, "diffEditor.insertedTextBackground": opacity(palette.green, 0.1), "diffEditor.removedTextBackground": opacity(palette.red, 0.1), From 424bdb01eacbba6fdf8f908d5af735312ddfe24a Mon Sep 17 00:00:00 2001 From: sgoudham Date: Fri, 28 Mar 2025 19:01:09 +0000 Subject: [PATCH 3/3] chore: adjust colours --- packages/catppuccin-vsc/src/theme/uiColors.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/catppuccin-vsc/src/theme/uiColors.ts b/packages/catppuccin-vsc/src/theme/uiColors.ts index 112b681e..154fc04f 100644 --- a/packages/catppuccin-vsc/src/theme/uiColors.ts +++ b/packages/catppuccin-vsc/src/theme/uiColors.ts @@ -137,7 +137,6 @@ export const getUiColors = ( "testing.iconSkipped.retired": palette.subtext0, "testing.peekBorder": accent, "testing.peekHeaderBackground": palette.surface2, - "testing.message.error.decorationForeground": opacity(palette.red, 0.8), "testing.message.error.lineBackground": opacity(palette.red, 0.15), "testing.message.info.decorationForeground": opacity(palette.green, 0.8), "testing.message.info.lineBackground": opacity(palette.green, 0.15), @@ -149,7 +148,7 @@ export const getUiColors = ( "testing.uncoveredBranchBackground": opacity(palette.red, 0.2), "testing.uncoveredBackground": opacity(palette.red, 0.2), "testing.uncoveredBorder": transparent, - "testing.uncoveredGutterBackground": opacity(palette.red, 0.2), + "testing.uncoveredGutterBackground": opacity(palette.red, 0.25), "testing.coverCountBadgeBackground": transparent, "testing.coverCountBadgeForeground": accent,