From 2c5ab44c0363362750504a9e9308af826d562145 Mon Sep 17 00:00:00 2001 From: Alan Cristhian Date: Sun, 24 May 2015 13:00:38 -0300 Subject: [PATCH 1/2] add 'async' and 'await' keywords. Also add the '@' operator. --- PythonImproved.YAML-tmLanguage | 6 +++--- PythonImproved.tmLanguage | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PythonImproved.YAML-tmLanguage b/PythonImproved.YAML-tmLanguage index 388b2f1..c1312ee 100644 --- a/PythonImproved.YAML-tmLanguage +++ b/PythonImproved.YAML-tmLanguage @@ -80,7 +80,7 @@ patterns: - comment: keywords that delimit flow blocks or alter flow from within a block name: keyword.control.flow.python - match: \b(elif|else|except|finally|for|if|try|while|with|break|continue|pass|raise|return|yield)\b + match: \b(elif|else|except|finally|for|if|try|while|with|break|continue|pass|raise|return|yield|async|await)\b - comment: keyword operators that evaluate to True or False name: keyword.operator.logical.python @@ -100,7 +100,7 @@ patterns: match: \+\=|-\=|\*\=|/\=|//\=|%\=|&\=|\|\=|\^\=|>>\=|<<\=|\*\*\= - name: keyword.operator.arithmetic.python - match: \+|\-|\*|\*\*|/|//|%|<<|>>|&|\||\^|~ + match: \+|\-|\*|\*\*|/|//|%|<<|>>|&|\||\^|~|@ - name: keyword.operator.assignment.python match: \= @@ -622,7 +622,7 @@ repository: illegal_names: name: invalid.illegal.name.python - match: \b(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|nonlocal|not|or|pass|print|raise|return|try|while|with|yield)\b + match: \b(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|nonlocal|not|or|pass|print|raise|return|try|while|with|yield|async|await)\b keyword_arguments: begin: \b([a-zA-Z_][a-zA-Z_0-9]*)\s*(=)(?!=) diff --git a/PythonImproved.tmLanguage b/PythonImproved.tmLanguage index b1aad9d..a52a9d2 100644 --- a/PythonImproved.tmLanguage +++ b/PythonImproved.tmLanguage @@ -195,7 +195,7 @@ comment keywords that delimit flow blocks or alter flow from within a block match - \b(elif|else|except|finally|for|if|try|while|with|break|continue|pass|raise|return|yield)\b + \b(elif|else|except|finally|for|if|try|while|with|break|continue|pass|raise|return|yield|async|await)\b name keyword.control.flow.python @@ -235,7 +235,7 @@ match - \+|\-|\*|\*\*|/|//|%|<<|>>|&|\||\^|~ + \+|\-|\*|\*\*|/|//|%|<<|>>|&|\||\^|~|@ name keyword.operator.arithmetic.python @@ -1858,7 +1858,7 @@ illegal_names match - \b(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|nonlocal|not|or|pass|print|raise|return|try|while|with|yield)\b + \b(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|nonlocal|not|or|pass|print|raise|return|try|while|with|yield|async|await)\b name invalid.illegal.name.python From 01693f85f65c6e6bf9ec5034cd464d7990803322 Mon Sep 17 00:00:00 2001 From: Alan Cristhian Date: Sat, 30 May 2015 19:40:29 -0300 Subject: [PATCH 2/2] add inplace operator, fix function decorators and move 'async' from 'keyword.control.flow.python' to 'storage.modifier.declaration.python' --- PythonImproved.YAML-tmLanguage | 8 ++++---- PythonImproved.tmLanguage | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PythonImproved.YAML-tmLanguage b/PythonImproved.YAML-tmLanguage index c1312ee..74c3660 100644 --- a/PythonImproved.YAML-tmLanguage +++ b/PythonImproved.YAML-tmLanguage @@ -73,14 +73,14 @@ patterns: match: \b(None|True|False|Ellipsis|NotImplemented)\b - name: storage.modifier.declaration.python - match: \b(global|nonlocal)\b + match: \b(global|nonlocal|async)\b - name: keyword.control.import.python match: \b(?:(import|from|as))\b - comment: keywords that delimit flow blocks or alter flow from within a block name: keyword.control.flow.python - match: \b(elif|else|except|finally|for|if|try|while|with|break|continue|pass|raise|return|yield|async|await)\b + match: \b(elif|else|except|finally|for|if|try|while|with|break|continue|pass|raise|return|yield|await)\b - comment: keyword operators that evaluate to True or False name: keyword.operator.logical.python @@ -97,10 +97,10 @@ patterns: match: <\=|>\=|\=\=|<|>|\!\= - name: keyword.operator.assignment.augmented.python - match: \+\=|-\=|\*\=|/\=|//\=|%\=|&\=|\|\=|\^\=|>>\=|<<\=|\*\*\= + match: \+\=|-\=|\*\=|/\=|//\=|%\=|&\=|\|\=|\^\=|>>\=|<<\=|\*\*\=|@\= - name: keyword.operator.arithmetic.python - match: \+|\-|\*|\*\*|/|//|%|<<|>>|&|\||\^|~|@ + match: \+|\-|\*|\*\*|/|//|%|<<|>>|&|\||\^|~|(?!^)@ - name: keyword.operator.assignment.python match: \= diff --git a/PythonImproved.tmLanguage b/PythonImproved.tmLanguage index a52a9d2..281bd20 100644 --- a/PythonImproved.tmLanguage +++ b/PythonImproved.tmLanguage @@ -181,7 +181,7 @@ match - \b(global|nonlocal)\b + \b(global|nonlocal|async)\b name storage.modifier.declaration.python @@ -195,7 +195,7 @@ comment keywords that delimit flow blocks or alter flow from within a block match - \b(elif|else|except|finally|for|if|try|while|with|break|continue|pass|raise|return|yield|async|await)\b + \b(elif|else|except|finally|for|if|try|while|with|break|continue|pass|raise|return|yield|await)\b name keyword.control.flow.python @@ -229,13 +229,13 @@ match - \+\=|-\=|\*\=|/\=|//\=|%\=|&\=|\|\=|\^\=|>>\=|<<\=|\*\*\= + \+\=|-\=|\*\=|/\=|//\=|%\=|&\=|\|\=|\^\=|>>\=|<<\=|\*\*\=|@\= name keyword.operator.assignment.augmented.python match - \+|\-|\*|\*\*|/|//|%|<<|>>|&|\||\^|~|@ + \+|\-|\*|\*\*|/|//|%|<<|>>|&|\||\^|~|(?!^)@ name keyword.operator.arithmetic.python