-
Notifications
You must be signed in to change notification settings - Fork 4.6k
language: Add context-aware decrease indent for Python #33370
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Conversation
This file contains hidden or 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
94ac38b
to
763c138
Compare
aviatesk
added a commit
to aviatesk/zed-julia
that referenced
this pull request
Jun 28, 2025
This commit adds both regex-based and Tree-sitter-based indentation rules to provide a smooth editing experience for Julia coding in Zed. Motivation - this didn't work properly before: ```julia if x elseif y else # <- wouldn't auto-outdent end ``` Changes: - Add `increase_indent_pattern` for Julia block keywords - Add `decrease_indent_patterns` with context-aware `valid_after` rules - Add `@start.suffix` captures in indents.scm for tracking block beginnings (required for `decrease_indent_patterns` to be functional) - Update `@outdent` patterns to work with specific keywords The dual approach (regex + Tree-sitter) is intentional, following Zed's design pattern established for Python (see zed-industries/zed#29625, zed-industries/zed#33370).
aviatesk
added a commit
to aviatesk/zed-julia
that referenced
this pull request
Jul 1, 2025
This commit adds both regex-based and Tree-sitter-based indentation rules to provide a smooth editing experience for Julia coding in Zed. Motivation - this didn't work properly before: ```julia if x elseif y else # <- wouldn't auto-outdent end ``` Changes: - Add `increase_indent_pattern` for Julia block keywords - Add `decrease_indent_patterns` with context-aware `valid_after` rules - Add `@start.suffix` captures in indents.scm for tracking block beginnings (required for `decrease_indent_patterns` to be functional) - Update `@outdent` patterns to work with specific keywords The dual approach (regex + Tree-sitter) is intentional, following Zed's design pattern established for Python (see zed-industries/zed#29625, zed-industries/zed#33370).
aviatesk
added a commit
to aviatesk/zed-julia
that referenced
this pull request
Jul 1, 2025
This commit adds both regex-based and Tree-sitter-based indentation rules to provide a smooth editing experience for Julia coding in Zed. Motivation - this didn't work properly before: ```julia if x elseif y else # <- wouldn't auto-outdent end ``` Changes: - Add `increase_indent_pattern` for Julia block keywords - Add `decrease_indent_patterns` with context-aware `valid_after` rules - Add `@start.suffix` captures in indents.scm for tracking block beginnings (required for `decrease_indent_patterns` to be functional) - Update `@outdent` patterns to work with specific keywords The dual approach (regex + Tree-sitter) is intentional, following Zed's design pattern established for Python (see zed-industries/zed#29625, zed-industries/zed#33370).
aviatesk
added a commit
to aviatesk/zed-julia
that referenced
this pull request
Jul 1, 2025
This commit adds both regex-based and Tree-sitter-based indentation rules to provide a smooth editing experience for Julia coding in Zed. Motivation - this didn't work properly before: ```julia if x elseif y else # <- wouldn't auto-outdent end ``` Changes: - Add `increase_indent_pattern` for Julia block keywords - Add `decrease_indent_patterns` with context-aware `valid_after` rules - Add `@start.suffix` captures in indents.scm for tracking block beginnings (required for `decrease_indent_patterns` to be functional) - Update `@outdent` patterns to work with specific keywords The dual approach (regex + Tree-sitter) is intentional, following Zed's design pattern established for Python (see zed-industries/zed#29625, zed-industries/zed#33370).
aviatesk
added a commit
to aviatesk/zed-julia
that referenced
this pull request
Jul 1, 2025
This commit adds both regex-based and Tree-sitter-based indentation rules to provide a smooth editing experience for Julia coding in Zed. Motivation - this didn't work properly before: ```julia if x elseif y else # <- wouldn't auto-outdent end ``` Changes: - Add `increase_indent_pattern` for Julia block keywords - Add `decrease_indent_patterns` with context-aware `valid_after` rules - Add `@start.suffix` captures in indents.scm for tracking block beginnings (required for `decrease_indent_patterns` to be functional) - Update `@outdent` patterns to work with specific keywords The dual approach (regex + Tree-sitter) is intentional, following Zed's design pattern established for Python (see zed-industries/zed#29625, zed-industries/zed#33370).
aviatesk
added a commit
to aviatesk/zed-julia
that referenced
this pull request
Jul 1, 2025
This commit adds both regex-based and Tree-sitter-based indentation rules to provide a smooth editing experience for Julia coding in Zed. Motivation - this didn't work properly before: ```julia if x elseif y else # <- wouldn't auto-outdent end ``` Changes: - Add `increase_indent_pattern` for Julia block keywords - Add `decrease_indent_patterns` with context-aware `valid_after` rules - Add `@start.suffix` captures in indents.scm for tracking block beginnings (required for `decrease_indent_patterns` to be functional) - Update `@outdent` patterns to work with specific keywords The dual approach (regex + Tree-sitter) is intentional, following Zed's design pattern established for Python (see zed-industries/zed#29625, zed-industries/zed#33370).
aviatesk
added a commit
to aviatesk/zed-julia
that referenced
this pull request
Jul 1, 2025
This commit adds both regex-based and Tree-sitter-based indentation rules to provide a smooth editing experience for Julia coding in Zed. Motivation - this didn't work properly before: ```julia if x elseif y else # <- wouldn't auto-outdent end ``` Changes: - Add `increase_indent_pattern` for Julia block keywords - Add `decrease_indent_patterns` with context-aware `valid_after` rules - Add `@start.suffix` captures in indents.scm for tracking block beginnings (required for `decrease_indent_patterns` to be functional) - Update `@outdent` patterns to work with specific keywords The dual approach (regex + Tree-sitter) is intentional, following Zed's design pattern established for Python (see zed-industries/zed#29625, zed-industries/zed#33370).
aviatesk
added a commit
to aviatesk/zed-julia
that referenced
this pull request
Jul 4, 2025
This commit adds both regex-based and Tree-sitter-based indentation rules to provide a smooth editing experience for Julia coding in Zed. Motivation - this didn't work properly before: ```julia if x elseif y else # <- wouldn't auto-outdent end ``` Changes: - Add `increase_indent_pattern` for Julia block keywords - Add `decrease_indent_patterns` with context-aware `valid_after` rules - Add `@start.suffix` captures in indents.scm for tracking block beginnings (required for `decrease_indent_patterns` to be functional) - Update `@outdent` patterns to work with specific keywords The dual approach (regex + Tree-sitter) is intentional, following Zed's design pattern established for Python (see zed-industries/zed#29625, zed-industries/zed#33370).
aviatesk
added a commit
to aviatesk/zed-julia
that referenced
this pull request
Jul 4, 2025
This commit adds both regex-based and Tree-sitter-based indentation rules to provide a smooth editing experience for Julia coding in Zed. Motivation - this didn't work properly before: ```julia if x elseif y else # <- wouldn't auto-outdent end ``` Changes: - Add `increase_indent_pattern` for Julia block keywords - Add `decrease_indent_patterns` with context-aware `valid_after` rules - Add `@start.suffix` captures in indents.scm for tracking block beginnings (required for `decrease_indent_patterns` to be functional) - Update `@outdent` patterns to work with specific keywords The dual approach (regex + Tree-sitter) is intentional, following Zed's design pattern established for Python (see zed-industries/zed#29625, zed-industries/zed#33370).
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.
Closes #33238, follow-up to #29625.
Changes:
significant_indentation
, which was the way to introduce indentation scoping in languages like Python. However, it turned out to be unnecessarily complicated to define and maintain.decrease_indent_patterns
, which takes apattern
keyword to automatically outdent andvalid_after
keywords to treat as valid code points to snap to. The outdent happens to the most recentvalid_after
keyword that also has less or equal indentation than the currently typed keyword.Fixes:
except
,finally
,else
, and so on now automatically indents intelligently based on the context in which it appears. For instance:but,
Release Notes:
except
,else
,finally
, etc.