Settings refactor (#38367)
Co-Authored-By: Ben K <ben@zed.dev> Co-Authored-By: Anthony <anthony@zed.dev> Co-Authored-By: Mikayla <mikayla@zed.dev> Release Notes: - settings: Major internal changes to settings. The primary user-facing effect is that some settings which did not make sense in project settings files are no-longer read from there. (For example the inline blame settings) --------- Co-authored-by: Ben Kunkle <ben@zed.dev> Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com> Co-authored-by: Anthony <anthony@zed.dev>
This commit is contained in:
co-authored by
Ben Kunkle
Mikayla Maki
Anthony
parent
0a9023bce0
commit
fcdab160f9
@@ -7,7 +7,7 @@ use std::path::PathBuf;
|
||||
|
||||
use anyhow::{Context as _, Result};
|
||||
use clap::Parser;
|
||||
use indexmap::IndexMap;
|
||||
use collections::IndexMap;
|
||||
use log::LevelFilter;
|
||||
use serde::Deserialize;
|
||||
use simplelog::ColorChoice;
|
||||
@@ -137,7 +137,7 @@ fn main() -> Result<()> {
|
||||
file_name: "".to_string(),
|
||||
};
|
||||
|
||||
let converter = VsCodeThemeConverter::new(vscode_theme, theme_metadata, IndexMap::new());
|
||||
let converter = VsCodeThemeConverter::new(vscode_theme, theme_metadata, IndexMap::default());
|
||||
|
||||
let theme = converter.convert()?;
|
||||
let mut theme = serde_json::to_value(theme).unwrap();
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
use anyhow::Result;
|
||||
use indexmap::IndexMap;
|
||||
use collections::IndexMap;
|
||||
use strum::IntoEnumIterator;
|
||||
use theme::{
|
||||
FontStyleContent, FontWeightContent, HighlightStyleContent, StatusColorsContent,
|
||||
ThemeColorsContent, ThemeContent, ThemeStyleContent,
|
||||
ThemeColorsContent, ThemeContent, ThemeStyleContent, WindowBackgroundContent,
|
||||
};
|
||||
|
||||
use crate::ThemeMetadata;
|
||||
@@ -56,7 +56,7 @@ impl VsCodeThemeConverter {
|
||||
name: self.theme_metadata.name,
|
||||
appearance,
|
||||
style: ThemeStyleContent {
|
||||
window_background_appearance: Some(theme::WindowBackgroundContent::Opaque),
|
||||
window_background_appearance: Some(WindowBackgroundContent::Opaque),
|
||||
accents: Vec::new(), //TODO can we read this from the theme?
|
||||
colors: theme_colors,
|
||||
status: status_colors,
|
||||
@@ -212,7 +212,7 @@ impl VsCodeThemeConverter {
|
||||
}
|
||||
|
||||
fn convert_syntax_theme(&self) -> Result<IndexMap<String, HighlightStyleContent>> {
|
||||
let mut highlight_styles = IndexMap::new();
|
||||
let mut highlight_styles = IndexMap::default();
|
||||
|
||||
for syntax_token in ZedSyntaxToken::iter() {
|
||||
let override_match = self
|
||||
|
||||
Reference in New Issue
Block a user