aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--helix-core/src/indent.rs4
-rw-r--r--helix-core/src/position.rs6
-rw-r--r--shell.nix2
3 files changed, 6 insertions, 6 deletions
diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index d75038d2..e708b317 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -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);
diff --git a/helix-core/src/position.rs b/helix-core/src/position.rs
index 8bc48094..5e5f902b 100644
--- a/helix-core/src/position.rs
+++ b/helix-core/src/position.rs
@@ -39,9 +39,9 @@ impl From<(usize, usize)> for Position {
}
}
-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)
}
}
diff --git a/shell.nix b/shell.nix
index f8f65093..e0a26045 100644
--- a/shell.nix
+++ b/shell.nix
@@ -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
];