aboutsummaryrefslogtreecommitdiff
path: root/helix-core/src
diff options
context:
space:
mode:
authorBlaž Hrastnik2021-01-19 07:16:15 +0000
committerBlaž Hrastnik2021-01-19 07:16:15 +0000
commit7c99ff58fdc4c5217f86e59d2b3ec0df10f79aaa (patch)
treec5a5480ef22590813058f451480f31b618c94669 /helix-core/src
parentf1539cc86680935a0b2a5bbd16c64b110687cdf7 (diff)
nix: include rust-src so rust-analyzer works correctly.
Diffstat (limited to 'helix-core/src')
-rw-r--r--helix-core/src/indent.rs4
-rw-r--r--helix-core/src/position.rs6
2 files changed, 5 insertions, 5 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)
}
}