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

Backward compat format settings

Browse source
This commit is contained in:
Julia 2022-09-23 16:52:00 -04:00
parent af5ad2d5ce
commit 879a0d8b12
3 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/project/src/project.rs
View file

@ -40,7 +40,7 @@ use postage::watch;
use rand::prelude::*;
use search::SearchQuery;
use serde::Serialize;
use settings::Settings;
use settings::{FormatOnSave, Formatter, Settings};
use sha2::{Digest, Sha256};
use similar::{ChangeTag, TextDiff};
use std::{
@ -3120,12 +3120,11 @@ impl Project {
)
});
if trigger == FormatTrigger::Save && !format_on_save {
continue;
}
let transaction = match (formatter, format_on_save) {
(_, FormatOnSave::Off) if trigger == FormatTrigger::Save => continue,
let transaction = match formatter {
settings::Formatter::LanguageServer => Self::format_via_lsp(
(Formatter::LanguageServer, FormatOnSave::On | FormatOnSave::Off)
| (_, FormatOnSave::LanguageServer) => Self::format_via_lsp(
&this,
&buffer,
&buffer_abs_path,
@ -3136,7 +3135,11 @@ impl Project {
.await
.context("failed to format via language server")?,
settings::Formatter::External { command, arguments } => {
(
Formatter::External { command, arguments },
FormatOnSave::On | FormatOnSave::Off,
)
| (_, FormatOnSave::External { command, arguments }) => {
Self::format_via_external_command(
&buffer,
&buffer_abs_path,