From 3245a89350c8952364e1cf607ed4809c0e041de4 Mon Sep 17 00:00:00 2001 From: Aadi Rave Date: Sun, 6 Oct 2024 20:58:51 -0400 Subject: [PATCH 1/6] added catppuccin themes for bat --- .gitmodules | 3 +++ assets/themes/bat | 1 + 2 files changed, 4 insertions(+) create mode 160000 assets/themes/bat diff --git a/.gitmodules b/.gitmodules index fe159da803..416acb0d2a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -263,3 +263,6 @@ [submodule "assets/syntaxes/02_Extra/CFML"] path = assets/syntaxes/02_Extra/CFML url = https://github.com/jcberquist/sublimetext-cfml.git +[submodule "assets/themes/bat"] + path = assets/themes/bat + url = https://github.com/catppuccin/bat.git diff --git a/assets/themes/bat b/assets/themes/bat new file mode 160000 index 0000000000..d3feec47b1 --- /dev/null +++ b/assets/themes/bat @@ -0,0 +1 @@ +Subproject commit d3feec47b16a8e99eabb34cdfbaa115541d374fc From 3269f7b7ef5f32c98feed678cc4d87a39eaa76a9 Mon Sep 17 00:00:00 2001 From: Aadi Rave Date: Sun, 6 Oct 2024 21:07:26 -0400 Subject: [PATCH 2/6] added changelog entry for pr #3099 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2ec2da9b5..a8ad7ced47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,9 @@ ## Themes +- Added Catppuccin themes (Latte, Frappe, Macchiato, Mocha), see #3099 (@aadirave) + + ## `bat` as a library - Changes to `syntax_mapping::SyntaxMapping` #2755 (@cyqsimon) From 310c86c2c2b9c0f341ce9a4db61c1ff5c93fe8f4 Mon Sep 17 00:00:00 2001 From: Aadi Rave <63650119+aadirave@users.noreply.github.com> Date: Sun, 6 Oct 2024 21:15:31 -0400 Subject: [PATCH 3/6] Update assets.rs --- tests/assets.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/assets.rs b/tests/assets.rs index f7b207fcaf..79427fdcd1 100644 --- a/tests/assets.rs +++ b/tests/assets.rs @@ -13,6 +13,10 @@ fn all_themes_are_present() { assert_eq!( themes, vec![ + "Catppuccin Latte", + "Catppuccin Frappe", + "Catppuccin Mocha", + "Catppuccin Macchiatto" "1337", "Coldark-Cold", "Coldark-Dark", From ad38a835a04437f7f809124a37da93062cd6bd03 Mon Sep 17 00:00:00 2001 From: Aadi Rave <63650119+aadirave@users.noreply.github.com> Date: Sun, 6 Oct 2024 21:17:51 -0400 Subject: [PATCH 4/6] Update assets.rs --- tests/assets.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/assets.rs b/tests/assets.rs index 79427fdcd1..b1e3c2bab7 100644 --- a/tests/assets.rs +++ b/tests/assets.rs @@ -16,7 +16,7 @@ fn all_themes_are_present() { "Catppuccin Latte", "Catppuccin Frappe", "Catppuccin Mocha", - "Catppuccin Macchiatto" + "Catppuccin Macchiatto", "1337", "Coldark-Cold", "Coldark-Dark", From 9b6f22ff61681d0b3e84de968c1a5e92b793e31e Mon Sep 17 00:00:00 2001 From: Aadi Rave <63650119+aadirave@users.noreply.github.com> Date: Sun, 6 Oct 2024 21:24:42 -0400 Subject: [PATCH 5/6] changed assets.rs to reflect formatting of theme additions --- tests/assets.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/assets.rs b/tests/assets.rs index b1e3c2bab7..2f145d1dff 100644 --- a/tests/assets.rs +++ b/tests/assets.rs @@ -13,11 +13,11 @@ fn all_themes_are_present() { assert_eq!( themes, vec![ - "Catppuccin Latte", + "1337", "Catppuccin Frappe", + "Catppuccin Latte", + "Catppuccin Macchiato", "Catppuccin Mocha", - "Catppuccin Macchiatto", - "1337", "Coldark-Cold", "Coldark-Dark", "DarkNeon", @@ -28,15 +28,15 @@ fn all_themes_are_present() { "Monokai Extended Light", "Monokai Extended Origin", "Nord", - "OneHalfDark", + "OneHalfDark", "OneHalfLight", "Solarized (dark)", "Solarized (light)", "Sublime Snazzy", "TwoDark", "Visual Studio Dark+", - "ansi", - "base16", + "ansi", + "base16", "base16-256", "gruvbox-dark", "gruvbox-light", From 6109f7bf37dcdb3da0449599aaa0671f326f239e Mon Sep 17 00:00:00 2001 From: Aadi Rave <63650119+aadirave@users.noreply.github.com> Date: Sun, 6 Oct 2024 21:28:29 -0400 Subject: [PATCH 6/6] removed formatting errors --- tests/assets.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/assets.rs b/tests/assets.rs index 2f145d1dff..358e07ea6e 100644 --- a/tests/assets.rs +++ b/tests/assets.rs @@ -13,7 +13,7 @@ fn all_themes_are_present() { assert_eq!( themes, vec![ - "1337", + "1337", "Catppuccin Frappe", "Catppuccin Latte", "Catppuccin Macchiato", @@ -28,15 +28,15 @@ fn all_themes_are_present() { "Monokai Extended Light", "Monokai Extended Origin", "Nord", - "OneHalfDark", + "OneHalfDark", "OneHalfLight", "Solarized (dark)", "Solarized (light)", "Sublime Snazzy", "TwoDark", "Visual Studio Dark+", - "ansi", - "base16", + "ansi", + "base16", "base16-256", "gruvbox-dark", "gruvbox-light",