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 17:54:46 +01:00
commit 2697862a02
41 changed files with 1818 additions and 6079 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,7 @@ use std::{
pub use sum_tree::Bias;
use sum_tree::TreeMap;
use text::Rope;
use theme::{ActiveTheme, PlayerColor, ThemeColors, ThemeSettings, ThemeVariant};
use theme::{ActiveTheme, PlayerColor, Theme, ThemeColors, ThemeSettings};
use util::{post_inc, RangeExt, ResultExt, TryFutureExt};
use workspace::{ItemNavHistory, SplitDirection, ViewId, Workspace};
@ -9982,7 +9982,7 @@ pub fn highlight_diagnostic_message(
(message_without_backticks, highlights)
}
pub fn diagnostic_style(severity: DiagnosticSeverity, valid: bool, theme: &ThemeVariant) -> Hsla {
pub fn diagnostic_style(severity: DiagnosticSeverity, valid: bool, theme: &Theme) -> Hsla {
match (severity, valid) {
(DiagnosticSeverity::ERROR, true) => theme.status().error,
(DiagnosticSeverity::ERROR, false) => theme.status().error,