7c99ff5 · helix · git.iko.soy

helix-core/src/indent.rs+2−2

@@ -135,8 +135,8 @@ fn calculate_indentation(node: Option<Node>, newline: bool) -> usize {

135 // let len = 1;

136 // })

137

138− if ((indent_scopes.contains(&parent_kind) && true) // not_first_or_last_sibling

138+ if (indent_scopes.contains(&parent_kind) // && not_first_or_last_sibling

139− || (indent_except_first_scopes.contains(&parent_kind) && true))

139+ || indent_except_first_scopes.contains(&parent_kind))

140 && !starts_same_line

141 {

142 // println!("is_scope {}", parent_kind);

helix-core/src/position.rs+3−3

@@ -39,9 +39,9 @@ impl From<(usize, usize)> for Position {

39 }

40}

41

42−impl Into<tree_sitter::Point> for Position {

42+impl From<Position> for tree_sitter::Point {

43− fn into(self) -> tree_sitter::Point {

43+ fn from(pos: Position) -> Self {

44− tree_sitter::Point::new(self.row, self.col)

44+ Self::new(pos.row, pos.col)

45 }

46}

47

shell.nix+1−1

@@ -2,7 +2,7 @@

2

3pkgs.mkShell {

4 nativeBuildInputs = with pkgs; [

5− rust-bin.nightly.latest.rust

5+ (rust-bin.nightly.latest.rust.override { extensions = ["rust-src"]; })

6 lld_10

7 # pkgconfig

8 ];