Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Tree-sitter rolling fixes, 1.125 (or 1.124.1) edition #1172

Merged
merged 7 commits into from
Jan 17, 2025
Merged

Tree-sitter rolling fixes, 1.125 (or 1.124.1) edition #1172

merged 7 commits into from
Jan 17, 2025

Conversation

savetheclocktower
Copy link
Contributor

This one could land quickly if we decide to do a 1.124.1 release.

So far, it's only got some Python indentation fixes — but good ones! And, unusually, these changes are covered by specs.

@savetheclocktower savetheclocktower mentioned this pull request Dec 18, 2024
Open
@savetheclocktower
[language-python] Fix some indentation corner cases…
b7b452e 
…like indentation after a comment…

  if foo: # something

…and not indenting on one-liners…

  if foo: pass

…and not indenting after list slice syntax:

  x[1:2]


Also added specs for Python indentation, as it's getting somewhat complex.
@savetheclocktower
(whoops)
7125c5f
@savetheclocktower
Un-focus spec
34c2c36
@savetheclocktower
[language-css] Update tree-sitter-css to latest…
0bb26bd 
…and improve highlighting of selectors while typing at end of file.
@savetheclocktower
Bump parserSource for CSS grammar
e936047
@savetheclocktower
[language-css] Add scope tests parentOfType and childOfType…
159542a 
…to support scenarios where you need to check parent/child relationship to an `ERROR` node, or to several different kinds of nodes at once.
@confused-Techie
Copy link
Member

So taking a look at this PR, while the changes themselves look pretty good, I am worried about what looks like some legitimate test failures in language-c, language-clojure, language-javascript, and language-ruby. Looking at those errors it isn't anything like we sometimes see like a segmentation fault or other build failure, they are actual test failures.

Is it possible the changes made in jasmine or the scope resolver have caused these issues?

(Also much less importantly, there seem to be some console.log() statements left in the jasmine file that I'm assuming we want to clean up)

@savetheclocktower
Copy link
Contributor Author

Is it possible the changes made in jasmine or the scope resolver have caused these issues?

Yeah, almost certainly changes in the Jasmine file. Sorry for not noticing this; I'll be sure to address it tonight.

@savetheclocktower
Copy link
Contributor Author

Aside from the errant console.logs, it was a one-line fix. We'll see what CI says, but this is ready for re-review. Sorry!

confused-Techie
confused-Techie approved these changes Jan 17, 2025
View reviewed changes
Copy link
Member

@confused-Techie confused-Techie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With CI happy, and those console statements removed, everything here looks good!

Love the parserSource being properly updated, and seeing lots of specs here, we should be good to go!

@savetheclocktower savetheclocktower merged commit ec55082 into master Jan 17, 2025
104 checks passed
@savetheclocktower savetheclocktower deleted the tree-sitter-125 branch January 17, 2025 04:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@confused-Techie confused-Techie confused-Techie approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@savetheclocktower @confused-Techie