Skip to content

Commit

Permalink
Merge pull request helix-editor#6 from helix-editor/compositor
Browse files Browse the repository at this point in the history
Compositor v2 rewrite
  • Loading branch information
janhrastnik authored Dec 13, 2020
2 parents b7a3e52 + 07801b6 commit b12a6dc
Show file tree
Hide file tree
Showing 16 changed files with 970 additions and 584 deletions.
51 changes: 21 additions & 30 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion helix-lsp/src/transport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ impl Transport {
.expect("pending_request with id not found!");
tx.send(Err(error.into())).await?;
}
msg => unimplemented!("{:?}", msg),
}
Ok(())
}
Expand Down
5 changes: 5 additions & 0 deletions helix-syntax/languages.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[[language]]
name = "rust"
scope = "source.rust"
injection-regex = "rust"
file-types = ["rs"]
1 change: 1 addition & 0 deletions helix-term/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ helix-view = { path = "../helix-view", features = ["term"]}
helix-lsp = { path = "../helix-lsp"}

anyhow = "1"
once_cell = "1.4"

smol = "1"
num_cpus = "1"
Expand Down
Loading

0 comments on commit b12a6dc

Please sign in to comment.