From bdeb32c34b8654623974b5d5b811bd72f8126361 Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Thu, 9 Nov 2023 01:39:31 -0500
Subject: [PATCH] Extend VSCode theme importer

---
 crates/theme2/src/themes/andromeda.rs    |  8 +++++
 crates/theme2/src/themes/ayu.rs          | 12 +++++++
 crates/theme2/src/themes/dracula.rs      |  4 +++
 crates/theme2/src/themes/gruvbox.rs      | 24 +++++++++++++
 crates/theme2/src/themes/night_owl.rs    |  8 +++++
 crates/theme2/src/themes/nord.rs         |  4 +++
 crates/theme2/src/themes/notctis.rs      | 44 ++++++++++++++++++++++++
 crates/theme2/src/themes/palenight.rs    | 12 +++++++
 crates/theme2/src/themes/rose_pine.rs    | 12 +++++++
 crates/theme2/src/themes/solarized.rs    |  6 ++++
 crates/theme2/src/themes/synthwave_84.rs |  3 ++
 crates/theme_importer/src/vscode.rs      | 16 +++++++++
 12 files changed, 153 insertions(+)

diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs
index 22a0a8741c..72354a79a8 100644
--- a/crates/theme2/src/themes/andromeda.rs
+++ b/crates/theme2/src/themes/andromeda.rs
@@ -30,6 +30,10 @@ pub fn andromeda() -> UserThemeFamily {
                         text: Some(rgba(0xd4cdd8ff).into()),
                         tab_inactive_background: Some(rgba(0x23262eff).into()),
                         tab_active_background: Some(rgba(0x23262eff).into()),
+                        editor_background: Some(rgba(0x23262eff).into()),
+                        editor_gutter_background: Some(rgba(0x23262eff).into()),
+                        editor_line_number: Some(rgba(0x746f77ff).into()),
+                        editor_active_line_number: Some(rgba(0xd4cdd8ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xee5d42ff).into()),
                         terminal_ansi_bright_green: Some(rgba(0x95e072ff).into()),
                         terminal_ansi_bright_yellow: Some(rgba(0xffe66dff).into()),
@@ -64,6 +68,10 @@ pub fn andromeda() -> UserThemeFamily {
                         text: Some(rgba(0xd4cdd8ff).into()),
                         tab_inactive_background: Some(rgba(0x23262eff).into()),
                         tab_active_background: Some(rgba(0x262933ff).into()),
+                        editor_background: Some(rgba(0x262933ff).into()),
+                        editor_gutter_background: Some(rgba(0x262933ff).into()),
+                        editor_line_number: Some(rgba(0x746f77ff).into()),
+                        editor_active_line_number: Some(rgba(0xd4cdd8ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xee5d42ff).into()),
                         terminal_ansi_bright_green: Some(rgba(0x95e072ff).into()),
                         terminal_ansi_bright_yellow: Some(rgba(0xffe66dff).into()),
diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs
index 8d79289046..b27f62b442 100644
--- a/crates/theme2/src/themes/ayu.rs
+++ b/crates/theme2/src/themes/ayu.rs
@@ -30,6 +30,10 @@ pub fn ayu() -> UserThemeFamily {
                         text: Some(rgba(0x8a9199ff).into()),
                         tab_inactive_background: Some(rgba(0xf8f9faff).into()),
                         tab_active_background: Some(rgba(0xf8f9faff).into()),
+                        editor_background: Some(rgba(0xf8f9faff).into()),
+                        editor_gutter_background: Some(rgba(0xf8f9faff).into()),
+                        editor_line_number: Some(rgba(0x8a919966).into()),
+                        editor_active_line_number: Some(rgba(0x5c6166ff).into()),
                         terminal_background: Some(rgba(0xf8f9faff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x686868ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xef7070ff).into()),
@@ -69,6 +73,10 @@ pub fn ayu() -> UserThemeFamily {
                         text: Some(rgba(0x707a8cff).into()),
                         tab_inactive_background: Some(rgba(0x1f2430ff).into()),
                         tab_active_background: Some(rgba(0x1f2430ff).into()),
+                        editor_background: Some(rgba(0x1f2430ff).into()),
+                        editor_gutter_background: Some(rgba(0x1f2430ff).into()),
+                        editor_line_number: Some(rgba(0x8a919966).into()),
+                        editor_active_line_number: Some(rgba(0xcccac2ff).into()),
                         terminal_background: Some(rgba(0x1f2430ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x686868ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xf18678ff).into()),
@@ -108,6 +116,10 @@ pub fn ayu() -> UserThemeFamily {
                         text: Some(rgba(0x565b66ff).into()),
                         tab_inactive_background: Some(rgba(0x0b0e14ff).into()),
                         tab_active_background: Some(rgba(0x0b0e14ff).into()),
+                        editor_background: Some(rgba(0x0b0e14ff).into()),
+                        editor_gutter_background: Some(rgba(0x0b0e14ff).into()),
+                        editor_line_number: Some(rgba(0x6c738099).into()),
+                        editor_active_line_number: Some(rgba(0xbfbdb6ff).into()),
                         terminal_background: Some(rgba(0x0b0e14ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x686868ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xef7077ff).into()),
diff --git a/crates/theme2/src/themes/dracula.rs b/crates/theme2/src/themes/dracula.rs
index 57c04851a5..ac5d594b9f 100644
--- a/crates/theme2/src/themes/dracula.rs
+++ b/crates/theme2/src/themes/dracula.rs
@@ -29,6 +29,10 @@ pub fn dracula() -> UserThemeFamily {
                     text: Some(rgba(0xf8f8f2ff).into()),
                     tab_inactive_background: Some(rgba(0x21222cff).into()),
                     tab_active_background: Some(rgba(0x282a35ff).into()),
+                    editor_background: Some(rgba(0x282a35ff).into()),
+                    editor_gutter_background: Some(rgba(0x282a35ff).into()),
+                    editor_line_number: Some(rgba(0x6272a4ff).into()),
+                    editor_active_line_number: Some(rgba(0xf8f8f2ff).into()),
                     terminal_background: Some(rgba(0x282a35ff).into()),
                     terminal_ansi_bright_black: Some(rgba(0x6272a4ff).into()),
                     terminal_ansi_bright_red: Some(rgba(0xff6d6dff).into()),
diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs
index 2e79b250da..2c388079a5 100644
--- a/crates/theme2/src/themes/gruvbox.rs
+++ b/crates/theme2/src/themes/gruvbox.rs
@@ -28,6 +28,10 @@ pub fn gruvbox() -> UserThemeFamily {
                         text: Some(rgba(0xebdbb2ff).into()),
                         tab_inactive_background: Some(rgba(0x1d2021ff).into()),
                         tab_active_background: Some(rgba(0x32302fff).into()),
+                        editor_background: Some(rgba(0x1d2021ff).into()),
+                        editor_gutter_background: Some(rgba(0x1d2021ff).into()),
+                        editor_line_number: Some(rgba(0x665c54ff).into()),
+                        editor_active_line_number: Some(rgba(0xebdbb2ff).into()),
                         terminal_background: Some(rgba(0x1d2021ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xfb4833ff).into()),
@@ -65,6 +69,10 @@ pub fn gruvbox() -> UserThemeFamily {
                         text: Some(rgba(0xebdbb2ff).into()),
                         tab_inactive_background: Some(rgba(0x282828ff).into()),
                         tab_active_background: Some(rgba(0x3c3836ff).into()),
+                        editor_background: Some(rgba(0x282828ff).into()),
+                        editor_gutter_background: Some(rgba(0x282828ff).into()),
+                        editor_line_number: Some(rgba(0x665c54ff).into()),
+                        editor_active_line_number: Some(rgba(0xebdbb2ff).into()),
                         terminal_background: Some(rgba(0x282828ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xfb4833ff).into()),
@@ -102,6 +110,10 @@ pub fn gruvbox() -> UserThemeFamily {
                         text: Some(rgba(0xebdbb2ff).into()),
                         tab_inactive_background: Some(rgba(0x32302fff).into()),
                         tab_active_background: Some(rgba(0x504945ff).into()),
+                        editor_background: Some(rgba(0x32302fff).into()),
+                        editor_gutter_background: Some(rgba(0x32302fff).into()),
+                        editor_line_number: Some(rgba(0x665c54ff).into()),
+                        editor_active_line_number: Some(rgba(0xebdbb2ff).into()),
                         terminal_background: Some(rgba(0x32302fff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xfb4833ff).into()),
@@ -139,6 +151,10 @@ pub fn gruvbox() -> UserThemeFamily {
                         text: Some(rgba(0x3c3836ff).into()),
                         tab_inactive_background: Some(rgba(0xf9f5d7ff).into()),
                         tab_active_background: Some(rgba(0xf2e5bcff).into()),
+                        editor_background: Some(rgba(0xf9f5d7ff).into()),
+                        editor_gutter_background: Some(rgba(0xf9f5d7ff).into()),
+                        editor_line_number: Some(rgba(0xbdae93ff).into()),
+                        editor_active_line_number: Some(rgba(0x3c3836ff).into()),
                         terminal_background: Some(rgba(0xf9f5d7ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0x9d0006ff).into()),
@@ -176,6 +192,10 @@ pub fn gruvbox() -> UserThemeFamily {
                         text: Some(rgba(0x3c3836ff).into()),
                         tab_inactive_background: Some(rgba(0xfbf1c7ff).into()),
                         tab_active_background: Some(rgba(0xebdbb2ff).into()),
+                        editor_background: Some(rgba(0xfbf1c7ff).into()),
+                        editor_gutter_background: Some(rgba(0xfbf1c7ff).into()),
+                        editor_line_number: Some(rgba(0xbdae93ff).into()),
+                        editor_active_line_number: Some(rgba(0x3c3836ff).into()),
                         terminal_background: Some(rgba(0xfbf1c7ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0x9d0006ff).into()),
@@ -213,6 +233,10 @@ pub fn gruvbox() -> UserThemeFamily {
                         text: Some(rgba(0x3c3836ff).into()),
                         tab_inactive_background: Some(rgba(0xf2e5bcff).into()),
                         tab_active_background: Some(rgba(0xd5c4a1ff).into()),
+                        editor_background: Some(rgba(0xf2e5bcff).into()),
+                        editor_gutter_background: Some(rgba(0xf2e5bcff).into()),
+                        editor_line_number: Some(rgba(0xbdae93ff).into()),
+                        editor_active_line_number: Some(rgba(0x3c3836ff).into()),
                         terminal_background: Some(rgba(0xf2e5bcff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x928374ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0x9d0006ff).into()),
diff --git a/crates/theme2/src/themes/night_owl.rs b/crates/theme2/src/themes/night_owl.rs
index 90ae45f879..24fa9e6073 100644
--- a/crates/theme2/src/themes/night_owl.rs
+++ b/crates/theme2/src/themes/night_owl.rs
@@ -30,6 +30,10 @@ pub fn night_owl() -> UserThemeFamily {
                         text: Some(rgba(0xd6deebff).into()),
                         tab_inactive_background: Some(rgba(0x01101cff).into()),
                         tab_active_background: Some(rgba(0x0a2842ff).into()),
+                        editor_background: Some(rgba(0x011526ff).into()),
+                        editor_gutter_background: Some(rgba(0x011526ff).into()),
+                        editor_line_number: Some(rgba(0x4b6479ff).into()),
+                        editor_active_line_number: Some(rgba(0xd6deebff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x575656ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xef524fff).into()),
                         terminal_ansi_bright_green: Some(rgba(0x21da6eff).into()),
@@ -68,6 +72,10 @@ pub fn night_owl() -> UserThemeFamily {
                         text: Some(rgba(0x403f53ff).into()),
                         tab_inactive_background: Some(rgba(0xf0f0f0ff).into()),
                         tab_active_background: Some(rgba(0xf6f6f6ff).into()),
+                        editor_background: Some(rgba(0xfbfbfbff).into()),
+                        editor_gutter_background: Some(rgba(0xfbfbfbff).into()),
+                        editor_line_number: Some(rgba(0x90a7b2ff).into()),
+                        editor_active_line_number: Some(rgba(0x403f53ff).into()),
                         terminal_background: Some(rgba(0xf6f6f6ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x403f53ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xde3c3aff).into()),
diff --git a/crates/theme2/src/themes/nord.rs b/crates/theme2/src/themes/nord.rs
index b1dedd6b16..5b8688737a 100644
--- a/crates/theme2/src/themes/nord.rs
+++ b/crates/theme2/src/themes/nord.rs
@@ -29,6 +29,10 @@ pub fn nord() -> UserThemeFamily {
                     text: Some(rgba(0xd8dee9ff).into()),
                     tab_inactive_background: Some(rgba(0x2e3440ff).into()),
                     tab_active_background: Some(rgba(0x3b4252ff).into()),
+                    editor_background: Some(rgba(0x2e3440ff).into()),
+                    editor_gutter_background: Some(rgba(0x2e3440ff).into()),
+                    editor_line_number: Some(rgba(0x4c566aff).into()),
+                    editor_active_line_number: Some(rgba(0xd8dee9ff).into()),
                     terminal_background: Some(rgba(0x2e3440ff).into()),
                     terminal_ansi_bright_black: Some(rgba(0x4c566aff).into()),
                     terminal_ansi_bright_red: Some(rgba(0xbf616aff).into()),
diff --git a/crates/theme2/src/themes/notctis.rs b/crates/theme2/src/themes/notctis.rs
index f5b8f1207d..bb835c5397 100644
--- a/crates/theme2/src/themes/notctis.rs
+++ b/crates/theme2/src/themes/notctis.rs
@@ -30,6 +30,10 @@ pub fn notctis() -> UserThemeFamily {
                         text: Some(rgba(0xbecfdaff).into()),
                         tab_inactive_background: Some(rgba(0x08324eff).into()),
                         tab_active_background: Some(rgba(0x07263aff).into()),
+                        editor_background: Some(rgba(0x07263aff).into()),
+                        editor_gutter_background: Some(rgba(0x07263aff).into()),
+                        editor_line_number: Some(rgba(0x4c6b7fff).into()),
+                        editor_active_line_number: Some(rgba(0xbecfdaff).into()),
                         terminal_background: Some(rgba(0x051b28ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x475e6cff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
@@ -69,6 +73,10 @@ pub fn notctis() -> UserThemeFamily {
                         text: Some(rgba(0xcbbec2ff).into()),
                         tab_inactive_background: Some(rgba(0x413036ff).into()),
                         tab_active_background: Some(rgba(0x322a2dff).into()),
+                        editor_background: Some(rgba(0x322a2dff).into()),
+                        editor_gutter_background: Some(rgba(0x322a2dff).into()),
+                        editor_line_number: Some(rgba(0x715b63ff).into()),
+                        editor_active_line_number: Some(rgba(0xcbbec2ff).into()),
                         terminal_background: Some(rgba(0x272022ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x69545bff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
@@ -108,6 +116,10 @@ pub fn notctis() -> UserThemeFamily {
                         text: Some(rgba(0x005661ff).into()),
                         tab_inactive_background: Some(rgba(0xcaedf2ff).into()),
                         tab_active_background: Some(rgba(0xf4f6f6ff).into()),
+                        editor_background: Some(rgba(0xf4f6f6ff).into()),
+                        editor_gutter_background: Some(rgba(0xf4f6f6ff).into()),
+                        editor_line_number: Some(rgba(0xa0abacff).into()),
+                        editor_active_line_number: Some(rgba(0x005661ff).into()),
                         terminal_background: Some(rgba(0xe1eeefff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x004d57ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xff3f00ff).into()),
@@ -147,6 +159,10 @@ pub fn notctis() -> UserThemeFamily {
                         text: Some(rgba(0x0c006bff).into()),
                         tab_inactive_background: Some(rgba(0xe2dff6ff).into()),
                         tab_active_background: Some(rgba(0xf2f1f8ff).into()),
+                        editor_background: Some(rgba(0xf2f1f8ff).into()),
+                        editor_gutter_background: Some(rgba(0xf2f1f8ff).into()),
+                        editor_line_number: Some(rgba(0x9c99b0ff).into()),
+                        editor_active_line_number: Some(rgba(0x0c006bff).into()),
                         terminal_background: Some(rgba(0xe9e7f3ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x0f0080ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xff3f00ff).into()),
@@ -186,6 +202,10 @@ pub fn notctis() -> UserThemeFamily {
                         text: Some(rgba(0x005661ff).into()),
                         tab_inactive_background: Some(rgba(0xf0e9d6ff).into()),
                         tab_active_background: Some(rgba(0xfef8ecff).into()),
+                        editor_background: Some(rgba(0xfef8ecff).into()),
+                        editor_gutter_background: Some(rgba(0xfef8ecff).into()),
+                        editor_line_number: Some(rgba(0xa0abacff).into()),
+                        editor_active_line_number: Some(rgba(0x005661ff).into()),
                         terminal_background: Some(rgba(0xf6eddaff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x004d57ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xff3f00ff).into()),
@@ -225,6 +245,10 @@ pub fn notctis() -> UserThemeFamily {
                         text: Some(rgba(0xc5cdd3ff).into()),
                         tab_inactive_background: Some(rgba(0x202d37ff).into()),
                         tab_active_background: Some(rgba(0x1b2932ff).into()),
+                        editor_background: Some(rgba(0x1b2932ff).into()),
+                        editor_gutter_background: Some(rgba(0x1b2932ff).into()),
+                        editor_line_number: Some(rgba(0x5d6e79ff).into()),
+                        editor_active_line_number: Some(rgba(0xc5cdd3ff).into()),
                         terminal_background: Some(rgba(0x0e1920ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x425866ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xca8468ff).into()),
@@ -264,6 +288,10 @@ pub fn notctis() -> UserThemeFamily {
                         text: Some(rgba(0xb1c9ccff).into()),
                         tab_inactive_background: Some(rgba(0x052e32ff).into()),
                         tab_active_background: Some(rgba(0x052428ff).into()),
+                        editor_background: Some(rgba(0x052428ff).into()),
+                        editor_gutter_background: Some(rgba(0x052428ff).into()),
+                        editor_line_number: Some(rgba(0x4e6b6eff).into()),
+                        editor_active_line_number: Some(rgba(0xb1c9ccff).into()),
                         terminal_background: Some(rgba(0x03181aff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x47686cff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
@@ -303,6 +331,10 @@ pub fn notctis() -> UserThemeFamily {
                         text: Some(rgba(0xb1c9ccff).into()),
                         tab_inactive_background: Some(rgba(0x052e32ff).into()),
                         tab_active_background: Some(rgba(0x031316ff).into()),
+                        editor_background: Some(rgba(0x031316ff).into()),
+                        editor_gutter_background: Some(rgba(0x031316ff).into()),
+                        editor_line_number: Some(rgba(0x4e6b6eff).into()),
+                        editor_active_line_number: Some(rgba(0xb1c9ccff).into()),
                         terminal_background: Some(rgba(0x020c0eff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x47686cff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
@@ -342,6 +374,10 @@ pub fn notctis() -> UserThemeFamily {
                         text: Some(rgba(0xb1c9ccff).into()),
                         tab_inactive_background: Some(rgba(0x052e32ff).into()),
                         tab_active_background: Some(rgba(0x031316ff).into()),
+                        editor_background: Some(rgba(0x031316ff).into()),
+                        editor_gutter_background: Some(rgba(0x031316ff).into()),
+                        editor_line_number: Some(rgba(0x4e6b6eff).into()),
+                        editor_active_line_number: Some(rgba(0xb1c9ccff).into()),
                         terminal_background: Some(rgba(0x020c0eff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x47686cff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
@@ -381,6 +417,10 @@ pub fn notctis() -> UserThemeFamily {
                         text: Some(rgba(0xc5c2d6ff).into()),
                         tab_inactive_background: Some(rgba(0x2f2c49ff).into()),
                         tab_active_background: Some(rgba(0x292640ff).into()),
+                        editor_background: Some(rgba(0x292640ff).into()),
+                        editor_gutter_background: Some(rgba(0x292640ff).into()),
+                        editor_line_number: Some(rgba(0x5c5973ff).into()),
+                        editor_active_line_number: Some(rgba(0xc5c2d6ff).into()),
                         terminal_background: Some(rgba(0x1f1d30ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x504e65ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
@@ -420,6 +460,10 @@ pub fn notctis() -> UserThemeFamily {
                         text: Some(rgba(0xccbfd9ff).into()),
                         tab_inactive_background: Some(rgba(0x3d2e4dff).into()),
                         tab_active_background: Some(rgba(0x30243dff).into()),
+                        editor_background: Some(rgba(0x30243dff).into()),
+                        editor_gutter_background: Some(rgba(0x30243dff).into()),
+                        editor_line_number: Some(rgba(0x665973ff).into()),
+                        editor_active_line_number: Some(rgba(0xccbfd9ff).into()),
                         terminal_background: Some(rgba(0x291d35ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x594e65ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xe97749ff).into()),
diff --git a/crates/theme2/src/themes/palenight.rs b/crates/theme2/src/themes/palenight.rs
index 7ed27d3b75..6e5651fe03 100644
--- a/crates/theme2/src/themes/palenight.rs
+++ b/crates/theme2/src/themes/palenight.rs
@@ -30,6 +30,10 @@ pub fn palenight() -> UserThemeFamily {
                         text: Some(rgba(0xffffffff).into()),
                         tab_inactive_background: Some(rgba(0x31364aff).into()),
                         tab_active_background: Some(rgba(0x292c3eff).into()),
+                        editor_background: Some(rgba(0x292c3eff).into()),
+                        editor_gutter_background: Some(rgba(0x292c3eff).into()),
+                        editor_line_number: Some(rgba(0x4c5374ff).into()),
+                        editor_active_line_number: Some(rgba(0xbfc7d5ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x676e95ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xff5571ff).into()),
                         terminal_ansi_bright_green: Some(rgba(0xc3e88dff).into()),
@@ -68,6 +72,10 @@ pub fn palenight() -> UserThemeFamily {
                         text: Some(rgba(0xffffffff).into()),
                         tab_inactive_background: Some(rgba(0x31364aff).into()),
                         tab_active_background: Some(rgba(0x292c3eff).into()),
+                        editor_background: Some(rgba(0x292c3eff).into()),
+                        editor_gutter_background: Some(rgba(0x292c3eff).into()),
+                        editor_line_number: Some(rgba(0x4c5374ff).into()),
+                        editor_active_line_number: Some(rgba(0xbfc7d5ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x676e95ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xff5571ff).into()),
                         terminal_ansi_bright_green: Some(rgba(0xc3e88dff).into()),
@@ -106,6 +114,10 @@ pub fn palenight() -> UserThemeFamily {
                         text: Some(rgba(0xffffffff).into()),
                         tab_inactive_background: Some(rgba(0x31364aff).into()),
                         tab_active_background: Some(rgba(0x25283aff).into()),
+                        editor_background: Some(rgba(0x292c3eff).into()),
+                        editor_gutter_background: Some(rgba(0x292c3eff).into()),
+                        editor_line_number: Some(rgba(0x4c5374ff).into()),
+                        editor_active_line_number: Some(rgba(0xbfc7d5ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x676e95ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xff5571ff).into()),
                         terminal_ansi_bright_green: Some(rgba(0xc3e88dff).into()),
diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs
index 913af127fb..f12b9090d4 100644
--- a/crates/theme2/src/themes/rose_pine.rs
+++ b/crates/theme2/src/themes/rose_pine.rs
@@ -30,6 +30,10 @@ pub fn rose_pine() -> UserThemeFamily {
                         text: Some(rgba(0xe0def4ff).into()),
                         tab_inactive_background: Some(rgba(0x000000ff).into()),
                         tab_active_background: Some(rgba(0x6e6a861a).into()),
+                        editor_background: Some(rgba(0x191724ff).into()),
+                        editor_gutter_background: Some(rgba(0x191724ff).into()),
+                        editor_line_number: Some(rgba(0x908caaff).into()),
+                        editor_active_line_number: Some(rgba(0xe0def4ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x908caaff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xeb6f92ff).into()),
                         terminal_ansi_bright_green: Some(rgba(0x30738fff).into()),
@@ -68,6 +72,10 @@ pub fn rose_pine() -> UserThemeFamily {
                         text: Some(rgba(0xe0def4ff).into()),
                         tab_inactive_background: Some(rgba(0x000000ff).into()),
                         tab_active_background: Some(rgba(0x817c9c14).into()),
+                        editor_background: Some(rgba(0x232136ff).into()),
+                        editor_gutter_background: Some(rgba(0x232136ff).into()),
+                        editor_line_number: Some(rgba(0x908caaff).into()),
+                        editor_active_line_number: Some(rgba(0xe0def4ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x908caaff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xeb6f92ff).into()),
                         terminal_ansi_bright_green: Some(rgba(0x3d8fb0ff).into()),
@@ -106,6 +114,10 @@ pub fn rose_pine() -> UserThemeFamily {
                         text: Some(rgba(0x575279ff).into()),
                         tab_inactive_background: Some(rgba(0x000000ff).into()),
                         tab_active_background: Some(rgba(0x6e6a860d).into()),
+                        editor_background: Some(rgba(0xfaf4edff).into()),
+                        editor_gutter_background: Some(rgba(0xfaf4edff).into()),
+                        editor_line_number: Some(rgba(0x797593ff).into()),
+                        editor_active_line_number: Some(rgba(0x575279ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x797593ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xb3627aff).into()),
                         terminal_ansi_bright_green: Some(rgba(0x276983ff).into()),
diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs
index 0a78328e2e..41a8e21e5a 100644
--- a/crates/theme2/src/themes/solarized.rs
+++ b/crates/theme2/src/themes/solarized.rs
@@ -27,6 +27,9 @@ pub fn solarized() -> UserThemeFamily {
                         element_background: Some(rgba(0x29a19899).into()),
                         tab_inactive_background: Some(rgba(0x003f51ff).into()),
                         tab_active_background: Some(rgba(0x002a36ff).into()),
+                        editor_background: Some(rgba(0x002a35ff).into()),
+                        editor_gutter_background: Some(rgba(0x002a35ff).into()),
+                        editor_line_number: Some(rgba(0x566c74ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x586e75ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xcb4b15ff).into()),
                         terminal_ansi_bright_green: Some(rgba(0x859900ff).into()),
@@ -62,6 +65,9 @@ pub fn solarized() -> UserThemeFamily {
                         element_background: Some(rgba(0xab9d56ff).into()),
                         tab_inactive_background: Some(rgba(0xd3cbb7ff).into()),
                         tab_active_background: Some(rgba(0xfdf6e3ff).into()),
+                        editor_background: Some(rgba(0xfdf6e3ff).into()),
+                        editor_gutter_background: Some(rgba(0xfdf6e3ff).into()),
+                        editor_line_number: Some(rgba(0x9ca8a6ff).into()),
                         terminal_ansi_bright_black: Some(rgba(0x657b83ff).into()),
                         terminal_ansi_bright_red: Some(rgba(0xcb4b15ff).into()),
                         terminal_ansi_bright_green: Some(rgba(0x859900ff).into()),
diff --git a/crates/theme2/src/themes/synthwave_84.rs b/crates/theme2/src/themes/synthwave_84.rs
index 8c0520ee11..9f157ade61 100644
--- a/crates/theme2/src/themes/synthwave_84.rs
+++ b/crates/theme2/src/themes/synthwave_84.rs
@@ -20,6 +20,9 @@ pub fn synthwave_84() -> UserThemeFamily {
                     element_background: Some(rgba(0x614d85ff).into()),
                     text: Some(rgba(0xffffffff).into()),
                     tab_inactive_background: Some(rgba(0x252334ff).into()),
+                    editor_background: Some(rgba(0x252334ff).into()),
+                    editor_gutter_background: Some(rgba(0x252334ff).into()),
+                    editor_line_number: Some(rgba(0xffffff73).into()),
                     terminal_ansi_bright_red: Some(rgba(0xfe444fff).into()),
                     terminal_ansi_bright_green: Some(rgba(0x71f1b7ff).into()),
                     terminal_ansi_bright_yellow: Some(rgba(0xfede5cff).into()),
diff --git a/crates/theme_importer/src/vscode.rs b/crates/theme_importer/src/vscode.rs
index 5a09870dc8..864aa47ea2 100644
--- a/crates/theme_importer/src/vscode.rs
+++ b/crates/theme_importer/src/vscode.rs
@@ -488,6 +488,22 @@ impl VsCodeThemeConverter {
                 .tab_inactive_background
                 .as_ref()
                 .traverse(|color| try_parse_color(&color))?,
+            editor_background: vscode_colors
+                .editor_background
+                .as_ref()
+                .traverse(|color| try_parse_color(&color))?,
+            editor_gutter_background: vscode_colors
+                .editor_background
+                .as_ref()
+                .traverse(|color| try_parse_color(&color))?,
+            editor_line_number: vscode_colors
+                .editor_line_number_foreground
+                .as_ref()
+                .traverse(|color| try_parse_color(&color))?,
+            editor_active_line_number: vscode_colors
+                .editor_foreground
+                .as_ref()
+                .traverse(|color| try_parse_color(&color))?,
             terminal_background: vscode_colors
                 .terminal_background
                 .as_ref()