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.

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

Add support for Python 3.6 f-string literal, underscore in numbers, and Python 3.5 type annotations #60

Open
wants to merge 23 commits into
base: master
Choose a base branch
from

Conversation

achimnol
Copy link
Contributor

@achimnol achimnol commented Nov 25, 2016

PR for #58 and #59.
Finally I figured out how to "embed" other syntax inside a region using syn cluster.
Python keywords, numbers, booleans, and builtins are highlighted inside f-string braced regions.
I tried to prevent the content inside braces from being highlighted as "Special" while keeping the braces and format string highlighted, but could not separate them. Still, I think this version much improves readability.

image
image

Comments, optimizations, and fixes are welcome.

@lilydjwg
Copy link

lilydjwg commented Dec 9, 2016

It works great for me, thank you!

@monkoose
Copy link

monkoose commented Dec 31, 2016

Seems like @hdima is rare guest on github lately. But this is the best known vim python syntax repository.
Maybe someone should take lead of this repo, someone who atleast can review and accept pull requests?

@lilydjwg
Copy link

That will need privileges granted by hdima, or we can only have forks. I'm already maintaining my own fork.

lilydjwg added a commit to vim-python/python-syntax that referenced this pull request Feb 17, 2017
lilydjwg added a commit to vim-python/python-syntax that referenced this pull request Feb 17, 2017
rmariano added a commit to rmariano/python-syntax that referenced this pull request Apr 30, 2017
achimnol added 2 commits June 2, 2017 11:24
 * Make them highlighted only when used as in the global namespace. (e.g., `id` in `something.id` is not highlighted)
 * Also add self and cls to builtin objects
 * Builtin-functions are highlighted only when used as global functions.
 * Annotations in type-only variable definitions and assignment statements are not supported yet due to potential conflicts with dictionary expressions.
 * Uses a custom syntax highlight def "Optional" (in my setup, it applies italic style.)
 * Taken from purpleP/python-syntax commits and customized.
@achimnol achimnol changed the title Add support for Python 3.6 f-string literal and underscore in numbers. Add support for Python 3.6 f-string literal, underscore in numbers, and Python 3.5 type annotations Jun 5, 2017
@y9c
Copy link

y9c commented Mar 15, 2018

@achimnol

Thanks you for you work.

I seems that pythonTypeArgs is not correctly matched.
I highlight type annotation with red italic font, thus your can see the bug directly.

image

*red arrow indicate the code that should not mark as python type annotation. *

Copy link

@y9c y9c left a comment

Choose a reason for hiding this comment

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

image

@wsdjeg
Copy link

wsdjeg commented Mar 16, 2018

as I know Vim runtime has python syntax file. so what is the differences? and why is can not be merged into Vim core repo?

@lilydjwg
Copy link

@achimnol @yech1990 don't include pythonTypeArgs in pythonTypeExpression. pythonTypeArgs should only be contained in pythonType*, not everywhere pythonTypeExpression can be contained.

syn match pythonStatement "\<async\s\+with\>" display
syn match pythonStatement "\<async\s\+for\>" display
endif

syn cluster pythonTypeExpression contains=pythonTypeAnno,pythonTypeUnion,pythonTypeArgs
Copy link

Choose a reason for hiding this comment

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

remove pythonTypeArgs ?

@y9c
Copy link

y9c commented Mar 19, 2018

@lilydjwg Thank you for your reply. I remove pythonTypeArgs from L213 and python list is rendered correctly now. Is there any other bug I didn't notice?

@lilydjwg
Copy link

lilydjwg commented Mar 23, 2018

@yech1990 No. I was using another version. I've switched to this version since it has more features. I'll comment here if I notice anything wrong.

lilydjwg added a commit to lilydjwg/dotvim that referenced this pull request Mar 26, 2018
@lilydjwg
Copy link

@yech1990 here's another bug:

def func():
  a = call(x | y)

y will be highlighted as pythonTypeUnion.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants