Small style fixes

This commit is contained in:
Kirill Bulatov 2023-10-10 17:16:43 +03:00
parent 9bf22c56cd
commit 986a516bf1
4 changed files with 8 additions and 2 deletions

View file

@ -346,6 +346,12 @@ pub trait LspAdapter: 'static + Send + Sync {
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum BundledFormatter {
Prettier {
// See https://prettier.io/docs/en/options.html#parser for a list of valid values.
// Usually, every language has a single parser (standard or plugin-provided), hence `Some("parser_name")` can be used.
// There can not be multiple parsers for a single language, in case of a conflict, we would attempt to select the one with most plugins.
//
// But exceptions like Tailwind CSS exist, which uses standard parsers for CSS/JS/HTML/etc. but require an extra plugin to be installed.
// For those cases, `None` will install the plugin but apply other, regular parser defined for the language, and this would not be a conflict.
parser_name: Option<&'static str>,
plugin_names: Vec<&'static str>,
},

View file

@ -47,7 +47,6 @@ const PRETTIER_PACKAGE_NAME: &str = "prettier";
const TAILWIND_PRETTIER_PLUGIN_PACKAGE_NAME: &str = "prettier-plugin-tailwindcss";
impl Prettier {
// This was taken from the prettier-vscode extension.
pub const CONFIG_FILE_NAMES: &'static [&'static str] = &[
".prettierrc",
".prettierrc.json",

View file

@ -8496,6 +8496,7 @@ impl Project {
.insert(new_server_id, (name, Arc::clone(prettier_server)));
// TODO kb could there be a race with multiple default prettier instances added?
// also, clean up prettiers for dropped workspaces (e.g. external files that got closed)
// also, is there a way to speed up initial prettier startup? now it takes a 1s or so on the first formatting attempt.
cx.emit(Event::LanguageServerAdded(new_server_id));
});
}

View file

@ -1574,8 +1574,8 @@ message PrettierInstanceForBufferResponse {
message InvokePrettierForBuffer {
uint64 project_id = 1;
optional uint64 buffer_id = 3;
string prettier_path = 2;
optional uint64 buffer_id = 3;
optional uint64 worktree_id = 4;
string method = 5;
}