Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Update tree-sitter-python + Add missing tree-sitter scopes - #325

Merged
darangi merged 14 commits into
atom:masterfrom
aminya:master
Jan 27, 2021
Merged

Update tree-sitter-python + Add missing tree-sitter scopes#325
darangi merged 14 commits into
atom:masterfrom
aminya:master

Conversation

@aminya

@aminyaaminya commented Oct 28, 2020

Copy link
Copy Markdown
Contributor

Description of the Change

This updates tree-sitter python dependency.

Benefits

Bug fixes: tree-sitter/tree-sitter-python@v0.15.1...v0.17.0

Applicable Issues

Solves some of the open issues regarding syntax highlighting.

Fixes#324
Fixes#134
Fixes#273
Fixes#312

Allows removing the Kite's workaround for tree-sitter:
https://github.com/kiteco/atom-plugin/pull/704

@aminyaaminya changed the title ⬆️ Update tree-sitter-pythonUpdate tree-sitter-python Oct 28, 2020
@aminya

Copy link
Copy Markdown
ContributorAuthor

@sadick254@darangi Please take a look.

aminyaand others added 5 commits January 8, 2021 11:59
Co-Authored-By: Eric Shimizu Karbstein <17973728+GrayJack@users.noreply.github.com>
Co-Authored-By: Eric Shimizu Karbstein <17973728+GrayJack@users.noreply.github.com>
Co-Authored-By: Eric Shimizu Karbstein <17973728+GrayJack@users.noreply.github.com>
Co-Authored-By: Eric Shimizu Karbstein <17973728+GrayJack@users.noreply.github.com>
Co-Authored-By: Eric Shimizu Karbstein <17973728+GrayJack@users.noreply.github.com>
@aminyaaminya changed the title Update tree-sitter-python Update tree-sitter-python + Add missing tree-sitter scopesJan 8, 2021
aminyaand others added 3 commits January 8, 2021 12:15
Co-Authored-By: Eric Shimizu Karbstein <17973728+GrayJack@users.noreply.github.com>
Co-Authored-By: Eric Shimizu Karbstein <17973728+GrayJack@users.noreply.github.com>
Co-Authored-By: Eric Shimizu Karbstein <17973728+GrayJack@users.noreply.github.com>
Comment threadgrammars/tree-sitter-python.cson Outdated
@chbk

chbk commented Jan 12, 2021

Copy link
Copy Markdown

As a heads-up, #313 also fixes the missing scopes mentioned here. That said, it's part of a larger ecosystem of PRs that might take time to (hopefully) get merged, so I'm glad to see this fixed now.

@aminya

aminya commented Jan 12, 2021

Copy link
Copy Markdown
ContributorAuthor

As a heads-up, #313 also fixes the missing scopes mentioned here. That said, it's part of a larger ecosystem of PRs that might take time to (hopefully) get merged, so I'm glad to see this fixed now.

Thanks for the PR. I only need a few of these commits in my PR so I can close many things here and there. If you can rebase after me, that would be great.

cc: @sadick254

@ThatXliner

ThatXliner commented Jan 15, 2021

Copy link
Copy Markdown
Contributor

What’s the status on this? Because once this is merged, kite should also merge the “remove workaround” (a.k.a. Stop it nagging me). Then I get to enjoy performing :atom: atom 😎

@aminya

Copy link
Copy Markdown
ContributorAuthor

This is ready to go. We are awaiting one of the maintainers to merge this.
@sadick254@darangi

@ThatXliner

Copy link
Copy Markdown
Contributor

@jeff-hykin (the reviewer)

@jeff-hykin

Copy link
Copy Markdown

@ThatXliner Not sure why I'm reviewer, but I added a review 😁

@darangi

Copy link
Copy Markdown
Contributor

Thanks @aminya , We will look into this

@darangi

Copy link
Copy Markdown
Contributor

@aminya could you resolve this conflict so I merge this in? Thanks for your contributions 🙇🏾

@aminya

Copy link
Copy Markdown
ContributorAuthor

Thank you! The conflict was only the deleted travis file.

@darangi
darangi merged commit 6d7026e into atom:masterJan 27, 2021
@ThatXlinerThatXliner mentioned this pull request Feb 1, 2021
@aminyaaminya mentioned this pull request Feb 1, 2021
'^(BaseException|Exception|TypeError|StopAsyncIteration|StopIteration|ImportError|ModuleNotFoundError|OSError|ConnectionError|BrokenPipeError|ConnectionAbortedError|ConnectionRefusedError|ConnectionResetError|BlockingIOError|ChildProcessError|FileExistsError|FileNotFoundError|IsADirectoryError|NotADirectoryError|InterruptedError|PermissionError|ProcessLookupError|TimeoutError|EOFError|RuntimeError|RecursionError|NotImplementedError|NameError|UnboundLocalError|AttributeError|SyntaxError|IndentationError|TabError|LookupError|IndexError|KeyError|ValueError|UnicodeError|UnicodeEncodeError|UnicodeDecodeError|UnicodeTranslateError|AssertionError|ArithmeticError|FloatingPointError|OverflowError|ZeroDivisionError|SystemError|ReferenceError|BufferError|MemoryError|Warning|UserWarning|DeprecationWarning|PendingDeprecationWarning|SyntaxWarning|RuntimeWarning|FutureWarning|ImportWarning|UnicodeWarning|BytesWarning|ResourceWarning|GeneratorExit|SystemExit|KeyboardInterrupt)$'
scopes: 'support.type.exception'}
scopes: 'support.type.exception'},
{match: '^(self)', scopes: 'entity.name.variable.self'}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This needs ^(self)\\b otherwise it'll match the self in selfserve and other things

'default_parameter > identifier:nth-child(0)': 'variable.parameter.function'
'keyword_argument > identifier:nth-child(0)': 'variable.parameter.function'
'lambda_parameters > identifier': 'variable.parameter.function'
'typed_parameter > identifier': 'variable.parameter.function'

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Not sure why .function is on there (aren't parameters always part of a function?)

@jeff-hykin

jeff-hykin commented Feb 13, 2021

Copy link
Copy Markdown

(😬 I was cleaning out my notifications and realized I commented "but I added a review" without clicking "submit" on my review)

@aminya

Copy link
Copy Markdown
ContributorAuthor

Thanks for the review. Do you want to make a PR to fix these?

@jeff-hykin

jeff-hykin commented Feb 13, 2021

Copy link
Copy Markdown

The first comment should probably be a PR, although that edgecase bug I'm describing probably happens other places too. Its a really common bug with a very very small edgecase. The other comment was just clarification.

@MdAbulHossain1MdAbulHossain1 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

6 participants

@aminya@chbk@ThatXliner@jeff-hykin@darangi@MdAbulHossain1