Skip to content

Rewrite lexer to better match Vue code #2

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

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

Rewrite lexer to better match Vue code #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eae6a56
Add failing example template
lksnmnn Oct 25, 2019
1ee77bd
Remove example and add test code
lksnmnn Oct 25, 2019
d67187b
Remove outdated python version 3.3
lksnmnn Oct 25, 2019
28ba2b3
Added accessor matching for directives
lksnmnn Oct 25, 2019
7359b94
Add tests remove closing >
lksnmnn Oct 26, 2019
3c0e9d5
rebuilding this lexer
lksnmnn Oct 26, 2019
6e8a02d
Manual merge
lksnmnn Oct 28, 2019
d7b8c26
Linting
lksnmnn Oct 28, 2019
c4173d9
remove pygments .eggs from git
lksnmnn Oct 28, 2019
ae8dbbc
Removing nested javascript stuff
lksnmnn Oct 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ __pycache__
dist
build
*.egg-info
.egg
.cache
.coverage
coverage_html_report
Expand Down
32 changes: 6 additions & 26 deletions vue/lexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,29 @@

from pygments.lexer import bygroups, default, include
from pygments.lexers.javascript import JavascriptLexer
from pygments.token import Literal, Name, Operator, Punctuation, String, Text
from pygments.token import Name, Operator, Punctuation, String, Text

# Use same tokens as `JavascriptLexer`, but with tags and attributes support
TOKENS = JavascriptLexer.tokens

TOKENS.update(
{
"vue": [
(r"(<)([\w]+)", bygroups(Punctuation, Name.Tag), "tag"),
(r"(<)([\w-]+)", bygroups(Punctuation, Name.Tag), "tag"),
(
r"(<)(/)([\w]+)(>)",
bygroups(Punctuation, Punctuation, Name.Tag, Punctuation),
),
],
"tag": [
(r"\s+", Text),
(r"(-)([\w]+)", Name.Tag),
(r'(@[\w]+)(="[\S]+")(>)', bygroups(Name.Tag, Literal.String, Punctuation)),
(r'(@[\w]+)(="[\S]+")', bygroups(Name.Tag, Literal.String)),
(r'(@[\S]+)(="[\S]+")', bygroups(Name.Tag, Literal.String)),
(r'(:[\S]+)(="[\S]+")', bygroups(Name.Tag, Literal.String)),
(r"(:)", Operator),
(r"(v-b-[\S]+)", Name.Tag),
(
r'(v-[\w]+)(=".+)([:][\w]+)(="[\w]+")(>)',
bygroups(
Name.Tag, Literal.String, Name.Tag, Literal.String, Punctuation
),
r"([@:]?[\w-]+\s*)(=)(\s*)",
bygroups(Name.Attribute, Operator, Text),
"attr",
),
(
r'(v-[\w]+)(="[\S]+")(>)',
bygroups(Name.Tag, Literal.String, Punctuation),
),
(r"(v-[\w]+)(>)", bygroups(Name.Tag, Punctuation)),
(r'(v-[\w]+)(=".+")(>)', bygroups(Name.Tag, Literal.String, Punctuation)),
(r"(<)([\w]+)", bygroups(Punctuation, Name.Tag)),
(
r"(<)(/)([\w]+)(>)",
bygroups(Punctuation, Punctuation, Name.Tag, Punctuation),
),
(r"([\w]+\s*)(=)(\s*)", bygroups(Name.Attribute, Operator, Text), "attr"),
(r"[{}]+", Punctuation),
(r"[\w\.]+", Name.Attribute),
(r"[\w\.-]+", Name.Attribute),
(r"(/?)(\s*)(>)", bygroups(Punctuation, Text, Punctuation), "#pop"),
],
"attr": [
Expand Down