Skip to content

Commit

Permalink
Remove the option for an external formatter in nls (#2064)
Browse files Browse the repository at this point in the history
  • Loading branch information
jneem authored Oct 9, 2024
1 parent 35c98d1 commit 98d7abe
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 89 deletions.
6 changes: 1 addition & 5 deletions lsp/nls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ version.workspace = true
name = "nls"
path = "src/main.rs"

[features]
default = ["format"]
format = ["nickel-lang-core/format"]

[[bench]]
name = "main"
harness = false
Expand Down Expand Up @@ -45,7 +41,7 @@ lsp-types.workspace = true
# contract they should follow, e.g. with an environment variable or just the
# filesystem layout, in which case we will be able to show Nickel diagnostics
# directly inside a TOML or a YAML file. It's not used as of yet, though.
nickel-lang-core = {workspace = true, default-features = false, features = ["spanned-deser"]}
nickel-lang-core = {workspace = true, default-features = false, features = ["spanned-deser", "format"]}
regex.workspace = true
scopeguard.workspace = true
serde = { workspace = true, features = ["derive"] }
Expand Down
77 changes: 0 additions & 77 deletions lsp/nls/src/requests/formatting_external.rs

This file was deleted.

8 changes: 1 addition & 7 deletions lsp/nls/src/requests/mod.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
pub mod completion;
pub mod formatting;
pub mod goto;
pub mod hover;
pub mod rename;
pub mod symbols;

#[cfg(feature = "format")]
pub mod formatting;

#[cfg(not(feature = "format"))]
#[path = "formatting_external.rs"]
pub mod formatting;

0 comments on commit 98d7abe

Please sign in to comment.