andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

nix: include rust-src so rust-analyzer works correctly.

Browse Source
This commit is contained in:
Blaž Hrastnik 2021-01-19 16:16:15 +09:00
parent f1539cc866
commit 7c99ff58fd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helix-core/src/indent.rs
View File

@ -135,8 +135,8 @@ fn calculate_indentation(node: Option<Node>, newline: bool) -> usize {
// let len = 1;
// })
if ((indent_scopes.contains(&parent_kind) && true) // not_first_or_last_sibling
|| (indent_except_first_scopes.contains(&parent_kind) && true))
if (indent_scopes.contains(&parent_kind) // && not_first_or_last_sibling
|| indent_except_first_scopes.contains(&parent_kind))
&& !starts_same_line
{
// println!("is_scope {}", parent_kind);

6
helix-core/src/position.rs
View File

@ -39,9 +39,9 @@ fn from(tuple: (usize, usize)) -> Self {
}
}
impl Into<tree_sitter::Point> for Position {
fn into(self) -> tree_sitter::Point {
tree_sitter::Point::new(self.row, self.col)
impl From<Position> for tree_sitter::Point {
fn from(pos: Position) -> Self {
Self::new(pos.row, pos.col)
}
}

2
shell.nix
View File

@ -2,7 +2,7 @@
pkgs.mkShell {
nativeBuildInputs = with pkgs; [
rust-bin.nightly.latest.rust
(rust-bin.nightly.latest.rust.override { extensions = ["rust-src"]; })
lld_10
# pkgconfig
];