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

Enable formatting feature of JSON language server

Browse source 
The feature doesn't work yet because the JSON language server
only supports *range* formatting, not document formatting.
We need to adjust our code to inspect the server's capabilities
and send range formatting requests instead when needed.

We're going to hold off on doing this right now, because it
will create merge conflicts with the `preserve-worktrees`
branch (#525)

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld 2022-03-03 14:16:56 -08:00
parent 81627a0f14
commit 9999862016
3 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/lsp/src/lsp.rs
View file

@ -103,6 +103,7 @@ impl LanguageServer {
pub fn new(
binary_path: &Path,
args: &[&str],
options: Option<Value>,
root_path: &Path,
background: Arc<executor::Background>,
) -> Result<Arc<Self>> {
@ -115,13 +116,14 @@ impl LanguageServer {
.spawn()?;
let stdin = server.stdin.take().unwrap();
let stdout = server.stdout.take().unwrap();
Self::new_internal(stdin, stdout, root_path, background)
Self::new_internal(stdin, stdout, root_path, options, background)
}
fn new_internal<Stdin, Stdout>(
stdin: Stdin,
stdout: Stdout,
root_path: &Path,
options: Option<Value>,
executor: Arc<executor::Background>,
) -> Result<Arc<Self>>
where
@ -232,7 +234,7 @@ impl LanguageServer {
.spawn({
let this = this.clone();
async move {
if let Some(capabilities) = this.init(root_uri).log_err().await {
if let Some(capabilities) = this.init(root_uri, options).log_err().await {
*capabilities_tx.borrow_mut() = Some(capabilities);
}
@ -244,13 +246,17 @@ impl LanguageServer {
Ok(this)
}
async fn init(self: Arc<Self>, root_uri: Url) -> Result<ServerCapabilities> {
async fn init(
self: Arc<Self>,
root_uri: Url,
options: Option<Value>,
) -> Result<ServerCapabilities> {
#[allow(deprecated)]
let params = InitializeParams {
process_id: Default::default(),
root_path: Default::default(),
root_uri: Some(root_uri),
initialization_options: Default::default(),
initialization_options: options,
capabilities: ClientCapabilities {
text_document: Some(TextDocumentClientCapabilities {
definition: Some(GotoCapability {
@ -530,6 +536,7 @@ impl LanguageServer {
stdin_writer,
stdout_reader,
Path::new("/"),
None,
cx.background().clone(),
)
.unwrap();