Simplify first-in-line computation for indent queries #10527
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
the-mikedavis
added
S-waiting-on-review
the-mikedavis
previously approved these changes
Apr 20, 2024
pascalkuthe
reviewed
Apr 20, 2024
helix-core/src/indent.rs
Outdated
| @@ -863,7 +839,7 @@ pub fn treesitter_indent_for_pos<'a>( | |||
| loop { | |||
| // This can safely be unwrapped because `first_in_line` contains | |||
| // one entry for each ancestor of the node (which is what we iterate over) | |||
There was a problem hiding this comment.
This comment can be removed now
This fixes issues for grammars with nodes containing only whitespace (e.g. Go).
Triton171
force-pushed
the
indent-fix-first-in-line
branch
from
4f1abcc to
269cd2e
Compare
pascalkuthe
approved these changes
Apr 20, 2024
It was supposed to correctly handle things like lines starting with a specific symbol that isn't considered a node in the syntax tree, e.g. for marking an environment. The main example I could think of is Literate Haskell, where lines starting with |
the-mikedavis
approved these changes
Apr 20, 2024
Vulpesx
pushed a commit
to Vulpesx/helix
that referenced
this pull request
Jun 7, 2024
Chirikumbrah
pushed a commit
to Chirikumbrah/helix
that referenced
this pull request
Jun 15, 2024
smortime
pushed a commit
to smortime/helix
that referenced
this pull request
Jul 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I originally thought that it might be necessary to look at the syntax tree to decide whether a node is the first node on its line. Since then, I haven't really seen any example where this is the case, so we can replace my initial implementation with a simpler one that just checks if all preceeding characters on the same line are whitespace.
This fixes #10336 and should generally prevent issues with tree-sitter grammars that insert nodes for whitespace.