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

Allow to configure default prettier

Browse source
This commit is contained in:
Kirill Bulatov 2023-09-22 18:40:12 +03:00
parent b109075bf2
commit 6ec3927dd3
7 changed files with 60 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/language/src/language_settings.rs
View file

@ -50,6 +50,7 @@ pub struct LanguageSettings {
pub remove_trailing_whitespace_on_save: bool,
pub ensure_final_newline_on_save: bool,
pub formatter: Formatter,
pub prettier: HashMap<String, serde_json::Value>,
pub enable_language_server: bool,
pub show_copilot_suggestions: bool,
pub show_whitespaces: ShowWhitespaceSetting,
@ -98,6 +99,8 @@ pub struct LanguageSettingsContent {
#[serde(default)]
pub formatter: Option<Formatter>,
#[serde(default)]
pub prettier: Option<HashMap<String, serde_json::Value>>,
#[serde(default)]
pub enable_language_server: Option<bool>,
#[serde(default)]
pub show_copilot_suggestions: Option<bool>,
@ -155,9 +158,7 @@ pub enum Formatter {
#[default]
Auto,
LanguageServer,
Prettier {
config: (), // Support some of the most important settings in the prettier-vscode extension.
},
Prettier,
External {
command: Arc<str>,
arguments: Arc<[String]>,
@ -397,6 +398,7 @@ fn merge_settings(settings: &mut LanguageSettings, src: &LanguageSettingsContent
src.preferred_line_length,
);
merge(&mut settings.formatter, src.formatter.clone());
merge(&mut settings.prettier, src.prettier.clone());
merge(&mut settings.format_on_save, src.format_on_save.clone());
merge(
&mut settings.remove_trailing_whitespace_on_save,