Add colors for document highlights

Antonio Scandurra created 2 years ago

Change summary

crates/editor2/src/editor.rs        | 4 ++--
crates/gpui2/src/app.rs             | 8 ++++----
crates/theme2/src/colors.rs         | 2 ++
crates/theme2/src/default_colors.rs | 4 ++++
4 files changed, 12 insertions(+), 6 deletions(-)

Detailed changes

crates/editor2/src/editor.rs

@@ -4057,12 +4057,12 @@ impl Editor {
 
                     this.highlight_background::<DocumentHighlightRead>(
                         read_ranges,
-                        |theme| todo!("theme.editor.document_highlight_read_background"),
+                        |theme| theme.editor_document_highlight_read_background,
                         cx,
                     );
                     this.highlight_background::<DocumentHighlightWrite>(
                         write_ranges,
-                        |theme| todo!("theme.editor.document_highlight_write_background"),
+                        |theme| theme.editor_document_highlight_write_background,
                         cx,
                     );
                     cx.notify();

crates/gpui2/src/app.rs

@@ -48,15 +48,15 @@ pub struct AppCell {
 impl AppCell {
     #[track_caller]
     pub fn borrow(&self) -> AppRef {
-        let thread_id = std::thread::current().id();
-        eprintln!("borrowed {thread_id:?}");
+        // let thread_id = std::thread::current().id();
+        // eprintln!("borrowed {thread_id:?}");
         AppRef(self.app.borrow())
     }
 
     #[track_caller]
     pub fn borrow_mut(&self) -> AppRefMut {
-        let thread_id = std::thread::current().id();
-        eprintln!("borrowed {thread_id:?}");
+        // let thread_id = std::thread::current().id();
+        // eprintln!("borrowed {thread_id:?}");
         AppRefMut(self.app.borrow_mut())
     }
 }

crates/theme2/src/colors.rs

@@ -114,6 +114,8 @@ pub struct ThemeColors {
     pub editor_invisible: Hsla,
     pub editor_wrap_guide: Hsla,
     pub editor_active_wrap_guide: Hsla,
+    pub editor_document_highlight_read_background: Hsla,
+    pub editor_document_highlight_write_background: Hsla,
     pub terminal_background: Hsla,
     pub terminal_ansi_bright_black: Hsla,
     pub terminal_ansi_bright_red: Hsla,

crates/theme2/src/default_colors.rs

@@ -249,6 +249,8 @@ impl ThemeColors {
             editor_invisible: neutral().light_alpha().step_4(), // todo!("pick the right colors")
             editor_wrap_guide: neutral().light_alpha().step_4(), // todo!("pick the right colors")
             editor_active_wrap_guide: neutral().light_alpha().step_4(), // todo!("pick the right colors")
+            editor_document_highlight_read_background: neutral().light_alpha().step_4(), // todo!("pick the right colors")
+            editor_document_highlight_write_background: neutral().light_alpha().step_4(), // todo!("pick the right colors")
             terminal_background: neutral().light().step_1(),
             terminal_ansi_black: black().light().step_12(),
             terminal_ansi_red: red().light().step_11(),
@@ -320,6 +322,8 @@ impl ThemeColors {
             editor_invisible: neutral().dark_alpha().step_4(), // todo!("pick the right colors")
             editor_wrap_guide: neutral().dark_alpha().step_4(), // todo!("pick the right colors")
             editor_active_wrap_guide: neutral().dark_alpha().step_4(), // todo!("pick the right colors")
+            editor_document_highlight_read_background: neutral().dark_alpha().step_4(), // todo!("pick the right colors")
+            editor_document_highlight_write_background: neutral().dark_alpha().step_4(), // todo!("pick the right colors")
             terminal_background: neutral().dark().step_1(),
             terminal_ansi_black: black().dark().step_12(),
             terminal_ansi_red: red().dark().step_11(),