Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into editor-movement

Browse source
This commit is contained in:
Antonio Scandurra 2023-11-07 18:48:08 +01:00
parent 2697862a02
commit d7e86eb1c1
14 changed files with 235 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

90
crates/editor2/src/display_map.rs
View file

@ -12,7 +12,9 @@ use crate::{
pub use block_map::{BlockMap, BlockPoint}; pub use block_map::{BlockMap, BlockPoint};
use collections::{BTreeMap, HashMap, HashSet}; use collections::{BTreeMap, HashMap, HashSet};
use fold_map::FoldMap; use fold_map::FoldMap;
use gpui::{Font, FontId, HighlightStyle, Hsla, Line, Model, ModelContext, Pixels, UnderlineStyle}; use gpui::{
Font, FontId, HighlightStyle, Hsla, Line, Model, ModelContext, Pixels, TextRun, UnderlineStyle,
};
use inlay_map::InlayMap; use inlay_map::InlayMap;
use language::{ use language::{
language_settings::language_settings, OffsetUtf16, Point, Subscription as BufferSubscription, language_settings::language_settings, OffsetUtf16, Point, Subscription as BufferSubscription,
@ -21,7 +23,7 @@ use lsp::DiagnosticSeverity;
use std::{any::TypeId, borrow::Cow, fmt::Debug, num::NonZeroU32, ops::Range, sync::Arc}; use std::{any::TypeId, borrow::Cow, fmt::Debug, num::NonZeroU32, ops::Range, sync::Arc};
use sum_tree::{Bias, TreeMap}; use sum_tree::{Bias, TreeMap};
use tab_map::TabMap; use tab_map::TabMap;
use theme::Theme; use theme::{SyntaxTheme, Theme};
use wrap_map::WrapMap; use wrap_map::WrapMap;
pub use block_map::{ pub use block_map::{
@ -505,18 +507,18 @@ impl DisplaySnapshot {
&'a self, &'a self,
display_rows: Range<u32>, display_rows: Range<u32>,
language_aware: bool, language_aware: bool,
theme: &'a Theme, editor_style: &'a EditorStyle,
) -> impl Iterator<Item = HighlightedChunk<'a>> { ) -> impl Iterator<Item = HighlightedChunk<'a>> {
self.chunks( self.chunks(
display_rows, display_rows,
language_aware, language_aware,
None, // todo!("add inlay highlight style") Some(editor_style.syntax.inlay_style),
None, // todo!("add suggestion highlight style") Some(editor_style.syntax.suggestion_style),
) )
.map(|chunk| { .map(|chunk| {
let mut highlight_style = chunk let mut highlight_style = chunk
.syntax_highlight_id .syntax_highlight_id
.and_then(|id| id.style(&theme.styles.syntax)); .and_then(|id| id.style(&editor_style.syntax));
if let Some(chunk_highlight) = chunk.highlight_style { if let Some(chunk_highlight) = chunk.highlight_style {
if let Some(highlight_style) = highlight_style.as_mut() { if let Some(highlight_style) = highlight_style.as_mut() {
@ -535,7 +537,8 @@ impl DisplaySnapshot {
if let Some(severity) = chunk.diagnostic_severity { if let Some(severity) = chunk.diagnostic_severity {
// Omit underlines for HINT/INFO diagnostics on 'unnecessary' code. // Omit underlines for HINT/INFO diagnostics on 'unnecessary' code.
if severity <= DiagnosticSeverity::WARNING || !chunk.is_unnecessary { if severity <= DiagnosticSeverity::WARNING || !chunk.is_unnecessary {
let diagnostic_color = super::diagnostic_style(severity, true, theme); let diagnostic_color =
super::diagnostic_style(severity, true, &editor_style.diagnostic_style);
diagnostic_highlight.underline = Some(UnderlineStyle { diagnostic_highlight.underline = Some(UnderlineStyle {
color: Some(diagnostic_color), color: Some(diagnostic_color),
thickness: 1.0.into(), thickness: 1.0.into(),
@ -564,53 +567,46 @@ impl DisplaySnapshot {
TextLayoutDetails { TextLayoutDetails {
text_system, text_system,
editor_style, editor_style,
rem_size,
}: &TextLayoutDetails, }: &TextLayoutDetails,
) -> Line { ) -> Line {
todo!() let mut runs = Vec::new();
// let mut styles = Vec::new(); let mut line = String::new();
// let mut line = String::new(); let mut ended_in_newline = false;
// let mut ended_in_newline = false;
// let range = display_row..display_row + 1; let range = display_row..display_row + 1;
// for chunk in self.highlighted_chunks(range, false, editor_style) { for chunk in self.highlighted_chunks(range, false, &editor_style) {
// line.push_str(chunk.chunk); line.push_str(chunk.chunk);
// let text_style = if let Some(style) = chunk.style { let text_style = if let Some(style) = chunk.style {
// editor_style editor_style
// .text .text
// .clone() .clone()
// .highlight(style, text_system) .highlight(style)
// .map(Cow::Owned) .map(Cow::Owned)
// .unwrap_or_else(|_| Cow::Borrowed(&editor_style.text)) .unwrap_or_else(|_| Cow::Borrowed(&editor_style.text))
// } else { } else {
// Cow::Borrowed(&editor_style.text) Cow::Borrowed(&editor_style.text)
// }; };
// ended_in_newline = chunk.chunk.ends_with("\n"); ended_in_newline = chunk.chunk.ends_with("\n");
// styles.push( runs.push(text_style.to_run(chunk.chunk.len()))
// todo!(), // len: chunk.chunk.len(), }
// // font_id: text_style.font_id,
// // color: text_style.color,
// // underline: text_style.underline,
// );
// }
// // our pixel positioning logic assumes each line ends in \n, // our pixel positioning logic assumes each line ends in \n,
// // this is almost always true except for the last line which // this is almost always true except for the last line which
// // may have no trailing newline. // may have no trailing newline.
// if !ended_in_newline && display_row == self.max_point().row() { if !ended_in_newline && display_row == self.max_point().row() {
// line.push_str("\n"); line.push_str("\n");
runs.push(editor_style.text.to_run("\n".len()));
}
// todo!(); let font_size = editor_style.text.font_size.to_pixels(*rem_size);
// // styles.push(RunStyle { text_system
// // len: "\n".len(), .layout_text(&line, font_size, &runs, None)
// // font_id: editor_style.text.font_id, .unwrap()
// // color: editor_style.text_color, .pop()
// // underline: editor_style.text.underline, .unwrap()
// // });
// }
// text_system.layout_text(&line, editor_style.text.font_size, &styles, None)
} }
pub fn x_for_point( pub fn x_for_point(

282
crates/editor2/src/editor.rs
View file

@ -36,9 +36,10 @@ pub use element::{
use futures::FutureExt; use futures::FutureExt;
use fuzzy::{StringMatch, StringMatchCandidate}; use fuzzy::{StringMatch, StringMatchCandidate};
use gpui::{ use gpui::{
div, px, AnyElement, AppContext, BackgroundExecutor, Context, DispatchContext, Div, Element, actions, div, px, AnyElement, AppContext, BackgroundExecutor, Context, DispatchContext, Div,
Entity, EventEmitter, FocusHandle, FontStyle, FontWeight, Hsla, Model, Pixels, Render, Styled, Element, Entity, EventEmitter, FocusHandle, FontStyle, FontWeight, Hsla, Model, Pixels, Render,
Subscription, Task, TextStyle, View, ViewContext, VisualContext, WeakView, WindowContext, Styled, Subscription, Task, TextStyle, View, ViewContext, VisualContext, WeakView,
WindowContext,
}; };
use highlight_matching_bracket::refresh_matching_bracket_highlights; use highlight_matching_bracket::refresh_matching_bracket_highlights;
use hover_popover::{hide_hover, HoverState}; use hover_popover::{hide_hover, HoverState};
@ -82,7 +83,9 @@ use std::{
pub use sum_tree::Bias; pub use sum_tree::Bias;
use sum_tree::TreeMap; use sum_tree::TreeMap;
use text::Rope; use text::Rope;
use theme::{ActiveTheme, PlayerColor, Theme, ThemeColors, ThemeSettings}; use theme::{
ActiveTheme, DiagnosticStyle, PlayerColor, SyntaxTheme, Theme, ThemeColors, ThemeSettings,
};
use util::{post_inc, RangeExt, ResultExt, TryFutureExt}; use util::{post_inc, RangeExt, ResultExt, TryFutureExt};
use workspace::{ItemNavHistory, SplitDirection, ViewId, Workspace}; use workspace::{ItemNavHistory, SplitDirection, ViewId, Workspace};
@ -257,118 +260,115 @@ impl InlayId {
} }
} }
// actions!( actions!(
// editor, Cancel,
// [ Backspace,
// Cancel, Delete,
// Backspace, Newline,
// Delete, NewlineAbove,
// Newline, NewlineBelow,
// NewlineAbove, GoToDiagnostic,
// NewlineBelow, GoToPrevDiagnostic,
// GoToDiagnostic, GoToHunk,
// GoToPrevDiagnostic, GoToPrevHunk,
// GoToHunk, Indent,
// GoToPrevHunk, Outdent,
// Indent, DeleteLine,
// Outdent, DeleteToPreviousWordStart,
// DeleteLine, DeleteToPreviousSubwordStart,
// DeleteToPreviousWordStart, DeleteToNextWordEnd,
// DeleteToPreviousSubwordStart, DeleteToNextSubwordEnd,
// DeleteToNextWordEnd, DeleteToBeginningOfLine,
// DeleteToNextSubwordEnd, DeleteToEndOfLine,
// DeleteToBeginningOfLine, CutToEndOfLine,
// DeleteToEndOfLine, DuplicateLine,
// CutToEndOfLine, MoveLineUp,
// DuplicateLine, MoveLineDown,
// MoveLineUp, JoinLines,
// MoveLineDown, SortLinesCaseSensitive,
// JoinLines, SortLinesCaseInsensitive,
// SortLinesCaseSensitive, ReverseLines,
// SortLinesCaseInsensitive, ShuffleLines,
// ReverseLines, ConvertToUpperCase,
// ShuffleLines, ConvertToLowerCase,
// ConvertToUpperCase, ConvertToTitleCase,
// ConvertToLowerCase, ConvertToSnakeCase,
// ConvertToTitleCase, ConvertToKebabCase,
// ConvertToSnakeCase, ConvertToUpperCamelCase,
// ConvertToKebabCase, ConvertToLowerCamelCase,
// ConvertToUpperCamelCase, Transpose,
// ConvertToLowerCamelCase, Cut,
// Transpose, Copy,
// Cut, Paste,
// Copy, Undo,
// Paste, Redo,
// Undo, MoveUp,
// Redo, PageUp,
// MoveUp, MoveDown,
// PageUp, PageDown,
// MoveDown, MoveLeft,
// PageDown, MoveRight,
// MoveLeft, MoveToPreviousWordStart,
// MoveRight, MoveToPreviousSubwordStart,
// MoveToPreviousWordStart, MoveToNextWordEnd,
// MoveToPreviousSubwordStart, MoveToNextSubwordEnd,
// MoveToNextWordEnd, MoveToBeginningOfLine,
// MoveToNextSubwordEnd, MoveToEndOfLine,
// MoveToBeginningOfLine, MoveToStartOfParagraph,
// MoveToEndOfLine, MoveToEndOfParagraph,
// MoveToStartOfParagraph, MoveToBeginning,
// MoveToEndOfParagraph, MoveToEnd,
// MoveToBeginning, SelectUp,
// MoveToEnd, SelectDown,
// SelectUp, SelectLeft,
// SelectDown, SelectRight,
// SelectLeft, SelectToPreviousWordStart,
// SelectRight, SelectToPreviousSubwordStart,
// SelectToPreviousWordStart, SelectToNextWordEnd,
// SelectToPreviousSubwordStart, SelectToNextSubwordEnd,
// SelectToNextWordEnd, SelectToStartOfParagraph,
// SelectToNextSubwordEnd, SelectToEndOfParagraph,
// SelectToStartOfParagraph, SelectToBeginning,
// SelectToEndOfParagraph, SelectToEnd,
// SelectToBeginning, SelectAll,
// SelectToEnd, SelectLine,
// SelectAll, SplitSelectionIntoLines,
// SelectLine, AddSelectionAbove,
// SplitSelectionIntoLines, AddSelectionBelow,
// AddSelectionAbove, Tab,
// AddSelectionBelow, TabPrev,
// Tab, ShowCharacterPalette,
// TabPrev, SelectLargerSyntaxNode,
// ShowCharacterPalette, SelectSmallerSyntaxNode,
// SelectLargerSyntaxNode, GoToDefinition,
// SelectSmallerSyntaxNode, GoToDefinitionSplit,
// GoToDefinition, GoToTypeDefinition,
// GoToDefinitionSplit, GoToTypeDefinitionSplit,
// GoToTypeDefinition, MoveToEnclosingBracket,
// GoToTypeDefinitionSplit, UndoSelection,
// MoveToEnclosingBracket, RedoSelection,
// UndoSelection, FindAllReferences,
// RedoSelection, Rename,
// FindAllReferences, ConfirmRename,
// Rename, Fold,
// ConfirmRename, UnfoldLines,
// Fold, FoldSelectedRanges,
// UnfoldLines, ShowCompletions,
// FoldSelectedRanges, OpenExcerpts,
// ShowCompletions, RestartLanguageServer,
// OpenExcerpts, Hover,
// RestartLanguageServer, Format,
// Hover, ToggleSoftWrap,
// Format, ToggleInlayHints,
// ToggleSoftWrap, RevealInFinder,
// ToggleInlayHints, CopyPath,
// RevealInFinder, CopyRelativePath,
// CopyPath, CopyHighlightJson,
// CopyRelativePath, ContextMenuFirst,
// CopyHighlightJson, ContextMenuPrev,
// ContextMenuFirst, ContextMenuNext,
// ContextMenuPrev, ContextMenuLast,
// ContextMenuNext, );
// ContextMenuLast,
// ]
// );
// impl_actions!( // impl_actions!(
// editor, // editor,
@ -390,26 +390,6 @@ impl InlayId {
// ] // ]
// ); // );
// todo!(revisit these actions)
pub struct ShowCompletions;
pub struct Rename;
pub struct GoToDefinition;
pub struct GoToTypeDefinition;
pub struct GoToDefinitionSplit;
pub struct GoToTypeDefinitionSplit;
#[derive(PartialEq, Clone, Default, Deserialize)]
pub struct MoveLeft;
#[derive(PartialEq, Clone, Default, Deserialize)]
pub struct MoveRight;
#[derive(PartialEq, Clone, Default, Deserialize)]
pub struct MoveDown;
#[derive(PartialEq, Clone, Default, Deserialize)]
pub struct MoveUp;
enum DocumentHighlightRead {} enum DocumentHighlightRead {}
enum DocumentHighlightWrite {} enum DocumentHighlightWrite {}
enum InputComposition {} enum InputComposition {}
@ -615,6 +595,8 @@ pub struct EditorStyle {
pub text: TextStyle, pub text: TextStyle,
pub line_height_scalar: f32, pub line_height_scalar: f32,
pub scrollbar_width: Pixels, pub scrollbar_width: Pixels,
pub syntax: Arc<SyntaxTheme>,
pub diagnostic_style: DiagnosticStyle,
} }
type CompletionId = usize; type CompletionId = usize;
@ -3543,6 +3525,7 @@ impl Editor {
TextLayoutDetails { TextLayoutDetails {
text_system: cx.text_system().clone(), text_system: cx.text_system().clone(),
editor_style: self.style.clone().unwrap(), editor_style: self.style.clone().unwrap(),
rem_size: cx.rem_size(),
} }
} }
@ -5862,7 +5845,6 @@ impl Editor {
// } // }
pub fn move_down(&mut self, _: &MoveDown, cx: &mut ViewContext<Self>) { pub fn move_down(&mut self, _: &MoveDown, cx: &mut ViewContext<Self>) {
dbg!("move_down");
self.take_rename(true, cx); self.take_rename(true, cx);
if self.mode == EditorMode::SingleLine { if self.mode == EditorMode::SingleLine {
@ -9399,6 +9381,8 @@ impl Render for Editor {
text: text_style, text: text_style,
line_height_scalar: settings.buffer_line_height.value(), line_height_scalar: settings.buffer_line_height.value(),
scrollbar_width: px(12.), scrollbar_width: px(12.),
syntax: cx.theme().syntax().clone(),
diagnostic_style: cx.theme().diagnostic_style(),
}) })
} }
} }
@ -9982,17 +9966,21 @@ pub fn highlight_diagnostic_message(
(message_without_backticks, highlights) (message_without_backticks, highlights)
} }
pub fn diagnostic_style(severity: DiagnosticSeverity, valid: bool, theme: &Theme) -> Hsla { pub fn diagnostic_style(
severity: DiagnosticSeverity,
valid: bool,
style: &DiagnosticStyle,
) -> Hsla {
match (severity, valid) { match (severity, valid) {
(DiagnosticSeverity::ERROR, true) => theme.status().error, (DiagnosticSeverity::ERROR, true) => style.error,
(DiagnosticSeverity::ERROR, false) => theme.status().error, (DiagnosticSeverity::ERROR, false) => style.error,
(DiagnosticSeverity::WARNING, true) => theme.status().warning, (DiagnosticSeverity::WARNING, true) => style.warning,
(DiagnosticSeverity::WARNING, false) => theme.status().warning, (DiagnosticSeverity::WARNING, false) => style.warning,
(DiagnosticSeverity::INFORMATION, true) => theme.status().info, (DiagnosticSeverity::INFORMATION, true) => style.info,
(DiagnosticSeverity::INFORMATION, false) => theme.status().info, (DiagnosticSeverity::INFORMATION, false) => style.info,
(DiagnosticSeverity::HINT, true) => theme.status().info, (DiagnosticSeverity::HINT, true) => style.info,
(DiagnosticSeverity::HINT, false) => theme.status().info, (DiagnosticSeverity::HINT, false) => style.info,
_ => theme.status().ignored, _ => style.ignored,
} }
} }

15
crates/editor2/src/element.rs
View file

@ -1577,12 +1577,10 @@ impl EditorElement {
}) })
.collect() .collect()
} else { } else {
let style = &self.style; let chunks = snapshot.highlighted_chunks(rows.clone(), true, &self.style);
let chunks = snapshot.highlighted_chunks(rows.clone(), true, cx.theme());
LineWithInvisibles::from_chunks( LineWithInvisibles::from_chunks(
chunks, chunks,
&style.text, &self.style.text,
MAX_LINE_LEN, MAX_LINE_LEN,
rows.len() as usize, rows.len() as usize,
line_number_layouts, line_number_layouts,
@ -2560,6 +2558,10 @@ impl Element<Editor> for EditorElement {
cx.with_key_dispatch_context(dispatch_context, |cx| { cx.with_key_dispatch_context(dispatch_context, |cx| {
cx.with_key_listeners( cx.with_key_listeners(
[ [
build_action_listener(Editor::move_left),
build_action_listener(Editor::move_right),
build_action_listener(Editor::move_down),
build_action_listener(Editor::move_up),
build_key_listener( build_key_listener(
move |editor, key_down: &KeyDownEvent, dispatch_context, phase, cx| { move |editor, key_down: &KeyDownEvent, dispatch_context, phase, cx| {
if phase == DispatchPhase::Bubble { if phase == DispatchPhase::Bubble {
@ -2568,7 +2570,6 @@ impl Element<Editor> for EditorElement {
&key_down.keystroke, &key_down.keystroke,
dispatch_context, dispatch_context,
) { ) {
dbg!(action.as_any());
return Some(action); return Some(action);
} }
} }
@ -2576,10 +2577,6 @@ impl Element<Editor> for EditorElement {
None None
}, },
), ),
build_action_listener(Editor::move_left),
build_action_listener(Editor::move_right),
build_action_listener(Editor::move_down),
build_action_listener(Editor::move_up),
], ],
|cx| cx.with_focus(editor.focus_handle.clone(), |_| {}), |cx| cx.with_focus(editor.focus_handle.clone(), |_| {}),
); );

2
crates/editor2/src/highlight_matching_bracket.rs
View file

@ -24,7 +24,7 @@ pub fn refresh_matching_bracket_highlights(editor: &mut Editor, cx: &mut ViewCon
opening_range.to_anchors(&snapshot.buffer_snapshot), opening_range.to_anchors(&snapshot.buffer_snapshot),
closing_range.to_anchors(&snapshot.buffer_snapshot), closing_range.to_anchors(&snapshot.buffer_snapshot),
], ],
|theme| todo!("theme.editor.document_highlight_read_background"), |theme| theme.editor_document_highlight_read_background,
cx, cx,
) )
} }

3
crates/editor2/src/movement.rs
View file

@ -1,6 +1,6 @@
use super::{Bias, DisplayPoint, DisplaySnapshot, SelectionGoal, ToDisplayPoint}; use super::{Bias, DisplayPoint, DisplaySnapshot, SelectionGoal, ToDisplayPoint};
use crate::{char_kind, CharKind, EditorStyle, ToOffset, ToPoint}; use crate::{char_kind, CharKind, EditorStyle, ToOffset, ToPoint};
use gpui::{px, TextSystem}; use gpui::{px, Pixels, TextSystem};
use language::Point; use language::Point;
use serde::de::IntoDeserializer; use serde::de::IntoDeserializer;
use std::{ops::Range, sync::Arc}; use std::{ops::Range, sync::Arc};
@ -16,6 +16,7 @@ pub enum FindRange {
pub struct TextLayoutDetails { pub struct TextLayoutDetails {
pub text_system: Arc<TextSystem>, pub text_system: Arc<TextSystem>,
pub editor_style: EditorStyle, pub editor_style: EditorStyle,
pub rem_size: Pixels,
} }
pub fn left(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint { pub fn left(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint {

4
crates/gpui2/src/action.rs
View file

@ -24,12 +24,12 @@ macro_rules! actions {
( $name:ident ) => { ( $name:ident ) => {
#[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug, ::std::cmp::PartialEq, $crate::serde::Deserialize)] #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug, ::std::cmp::PartialEq, $crate::serde::Deserialize)]
struct $name; pub struct $name;
}; };
( $name:ident { $($token:tt)* } ) => { ( $name:ident { $($token:tt)* } ) => {
#[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug, ::std::cmp::PartialEq, $crate::serde::Deserialize)] #[derive(::std::clone::Clone, ::std::default::Default, ::std::fmt::Debug, ::std::cmp::PartialEq, $crate::serde::Deserialize)]
struct $name { $($token)* } pub struct $name { $($token)* }
}; };
( $name:ident, $($rest:tt)* ) => { ( $name:ident, $($rest:tt)* ) => {

11
crates/gpui2/src/window.rs
View file

@ -300,7 +300,8 @@ impl Window {
/// When constructing the element tree, we maintain a stack of key dispatch frames until we /// When constructing the element tree, we maintain a stack of key dispatch frames until we
/// find the focused element. We interleave key listeners with dispatch contexts so we can use the /// find the focused element. We interleave key listeners with dispatch contexts so we can use the
/// contexts when matching key events against the keymap. /// contexts when matching key events against the keymap. A key listener can be either an action
/// handler or a [KeyDown] / [KeyUp] event listener.
enum KeyDispatchStackFrame { enum KeyDispatchStackFrame {
Listener { Listener {
event_type: TypeId, event_type: TypeId,
@ -1048,6 +1049,10 @@ impl<'a> WindowContext<'a> {
/// Dispatch a mouse or keyboard event on the window. /// Dispatch a mouse or keyboard event on the window.
pub fn dispatch_event(&mut self, event: InputEvent) -> bool { pub fn dispatch_event(&mut self, event: InputEvent) -> bool {
// Handlers may set this to false by calling `stop_propagation`
self.app.propagate_event = true;
self.window.default_prevented = false;
let event = match event { let event = match event {
// Track the mouse position with our own state, since accessing the platform // Track the mouse position with our own state, since accessing the platform
// API for the mouse position can only occur on the main thread. // API for the mouse position can only occur on the main thread.
@ -1101,10 +1106,6 @@ impl<'a> WindowContext<'a> {
}; };
if let Some(any_mouse_event) = event.mouse_event() { if let Some(any_mouse_event) = event.mouse_event() {
// Handlers may set this to false by calling `stop_propagation`
self.app.propagate_event = true;
self.window.default_prevented = false;
if let Some(mut handlers) = self if let Some(mut handlers) = self
.window .window
.mouse_listeners .mouse_listeners

2
crates/language2/src/highlight_map.rs
View file

@ -95,6 +95,8 @@ mod tests {
.iter() .iter()
.map(|(name, color)| (name.to_string(), (*color).into())) .map(|(name, color)| (name.to_string(), (*color).into()))
.collect(), .collect(),
inlay_style: HighlightStyle::default(),
suggestion_style: HighlightStyle::default(),
}; };
let capture_names = &[ let capture_names = &[

4
crates/theme2/src/colors.rs
View file

@ -1,3 +1,5 @@
use std::sync::Arc;
use gpui::Hsla; use gpui::Hsla;
use refineable::Refineable; use refineable::Refineable;
@ -145,7 +147,7 @@ pub struct ThemeStyles {
pub status: StatusColors, pub status: StatusColors,
pub git: GitStatusColors, pub git: GitStatusColors,
pub player: PlayerColors, pub player: PlayerColors,
pub syntax: SyntaxTheme, pub syntax: Arc<SyntaxTheme>,
} }
#[cfg(test)] #[cfg(test)]

4
crates/theme2/src/default_colors.rs
View file

@ -138,6 +138,8 @@ impl SyntaxTheme {
("variable.special".into(), red().light().step_7().into()), ("variable.special".into(), red().light().step_7().into()),
("variant".into(), red().light().step_7().into()), ("variant".into(), red().light().step_7().into()),
], ],
inlay_style: tomato().light().step_1().into(), // todo!("nate: use a proper style")
suggestion_style: orange().light().step_1().into(), // todo!("nate: use proper style")
} }
} }
@ -193,6 +195,8 @@ impl SyntaxTheme {
("variable.special".into(), red().dark().step_7().into()), ("variable.special".into(), red().dark().step_7().into()),
("variant".into(), red().dark().step_7().into()), ("variant".into(), red().dark().step_7().into()),
], ],
inlay_style: tomato().dark().step_1().into(), // todo!("nate: use a proper style")
suggestion_style: orange().dark().step_1().into(), // todo!("nate: use a proper style")
} }
} }
} }

6
crates/theme2/src/default_theme.rs
View file

@ -1,3 +1,5 @@
use std::sync::Arc;
use crate::{ use crate::{
colors::{GitStatusColors, PlayerColors, StatusColors, SystemColors, ThemeColors, ThemeStyles}, colors::{GitStatusColors, PlayerColors, StatusColors, SystemColors, ThemeColors, ThemeStyles},
default_color_scales, Appearance, SyntaxTheme, Theme, ThemeFamily, default_color_scales, Appearance, SyntaxTheme, Theme, ThemeFamily,
@ -14,7 +16,7 @@ fn zed_pro_daylight() -> Theme {
status: StatusColors::default(), status: StatusColors::default(),
git: GitStatusColors::default(), git: GitStatusColors::default(),
player: PlayerColors::default(), player: PlayerColors::default(),
syntax: SyntaxTheme::default_light(), syntax: Arc::new(SyntaxTheme::default_light()),
}, },
} }
} }
@ -30,7 +32,7 @@ pub(crate) fn zed_pro_moonlight() -> Theme {
status: StatusColors::default(), status: StatusColors::default(),
git: GitStatusColors::default(), git: GitStatusColors::default(),
player: PlayerColors::default(), player: PlayerColors::default(),
syntax: SyntaxTheme::default_dark(), syntax: Arc::new(SyntaxTheme::default_dark()),
}, },
} }
} }

2
crates/theme2/src/registry.rs
View file

@ -52,7 +52,7 @@ impl ThemeRegistry {
status: StatusColors::default(), status: StatusColors::default(),
git: GitStatusColors::default(), git: GitStatusColors::default(),
player: PlayerColors::default(), player: PlayerColors::default(),
syntax: SyntaxTheme::default_dark(), syntax: Arc::new(SyntaxTheme::default_dark()),
}, },
} }
})); }));

4
crates/theme2/src/syntax.rs
View file

@ -3,6 +3,8 @@ use gpui::{HighlightStyle, Hsla};
#[derive(Clone, Default)] #[derive(Clone, Default)]
pub struct SyntaxTheme { pub struct SyntaxTheme {
pub highlights: Vec<(String, HighlightStyle)>, pub highlights: Vec<(String, HighlightStyle)>,
pub inlay_style: HighlightStyle,
pub suggestion_style: HighlightStyle,
} }
impl SyntaxTheme { impl SyntaxTheme {
@ -21,6 +23,8 @@ impl SyntaxTheme {
) )
}) })
.collect(), .collect(),
inlay_style: HighlightStyle::default(),
suggestion_style: HighlightStyle::default(),
} }
} }

23
crates/theme2/src/theme2.rs
View file

@ -77,7 +77,7 @@ impl Theme {
/// Returns the [`SyntaxTheme`] for the theme. /// Returns the [`SyntaxTheme`] for the theme.
#[inline(always)] #[inline(always)]
pub fn syntax(&self) -> &SyntaxTheme { pub fn syntax(&self) -> &Arc<SyntaxTheme> {
&self.styles.syntax &self.styles.syntax
} }
@ -98,4 +98,25 @@ impl Theme {
pub fn syntax_color(&self, name: &str) -> Hsla { pub fn syntax_color(&self, name: &str) -> Hsla {
self.syntax().color(name) self.syntax().color(name)
} }
/// Returns the [`StatusColors`] for the theme.
#[inline(always)]
pub fn diagnostic_style(&self) -> DiagnosticStyle {
DiagnosticStyle {
error: self.status().error,
warning: self.status().warning,
info: self.status().info,
hint: self.status().info,
ignored: self.status().ignored,
}
}
}
#[derive(Clone, Debug)]
pub struct DiagnosticStyle {
pub error: Hsla,
pub warning: Hsla,
pub info: Hsla,
pub hint: Hsla,
pub ignored: Hsla,
} }