From eb6d0c8cacb7bdb37d5f8eb8ef9f6a537d5a5a71 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 7 Jun 2017 08:53:29 +0200 Subject: [PATCH 1/3] Add missing scopes in grammars/src/regexp --- grammars/MagicRegExp.cson | 23 ++++++++++++++++++++++ grammars/src/regexp-common.inc.syntax.yaml | 11 +++++++++++ grammars/src/regexp.inc.syntax.yaml | 6 ++++++ 3 files changed, 40 insertions(+) diff --git a/grammars/MagicRegExp.cson b/grammars/MagicRegExp.cson index 69e0c300..d57ed827 100644 --- a/grammars/MagicRegExp.cson +++ b/grammars/MagicRegExp.cson @@ -35,6 +35,24 @@ repository: include: "#regexp-base-common" } ] + "fstring-formatting-braces": + patterns: [ + { + comment: "empty braces are illegal" + match: "({)(\\s*?)(})" + captures: + "1": + name: "constant.character.format.placeholder.other.python" + "2": + name: "invalid.illegal.brace.python" + "3": + name: "constant.character.format.placeholder.other.python" + } + { + name: "constant.character.escape.python" + match: "({{|}})" + } + ] "regexp-base-common": patterns: [ { @@ -410,3 +428,8 @@ repository: include: "#regexp-expression" } ] + codetags: + match: "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)" + captures: + "1": + name: "keyword.codetag.notation.python" diff --git a/grammars/src/regexp-common.inc.syntax.yaml b/grammars/src/regexp-common.inc.syntax.yaml index d7b02061..af99cc03 100644 --- a/grammars/src/regexp-common.inc.syntax.yaml +++ b/grammars/src/regexp-common.inc.syntax.yaml @@ -12,6 +12,17 @@ repository: - match: \{.*?\} - include: '#regexp-base-common' + fstring-formatting-braces: + patterns: + - comment: empty braces are illegal + match: ({)(\s*?)(}) + captures: + '1': {name: constant.character.format.placeholder.other.python} + '2': {name: invalid.illegal.brace.python} + '3': {name: constant.character.format.placeholder.other.python} + - name: constant.character.escape.python + match: ({{|}}) + regexp-base-common: patterns: - name: support.other.match.any.regexp diff --git a/grammars/src/regexp.inc.syntax.yaml b/grammars/src/regexp.inc.syntax.yaml index ea55ff55..ea449ff8 100644 --- a/grammars/src/regexp.inc.syntax.yaml +++ b/grammars/src/regexp.inc.syntax.yaml @@ -167,4 +167,10 @@ repository: - include: '#${prefix}${basename}-expression' ${nested} + codetags: + match: (?:\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\b) + captures: + '1': {name: keyword.codetag.notation.python} + + ... From b137c7432ac1387366287403e66c3b82a8a9092b Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 7 Jun 2017 10:55:00 +0200 Subject: [PATCH 2/3] Update Makefile, generated sublime syntax files for sublime --- Makefile | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2d09f37c..2fb34dc6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all ci-test test release devenv publish +.PHONY: all ci-test test release devenv publish release_sublime all: devenv release @@ -33,6 +33,24 @@ release: ./node_modules/.bin/syntaxdev atom-spec --package-name MagicPython --tests test/**/*.py --syntax grammars/src/MagicPython.syntax.yaml --out test/atom-spec/python-spec.js ./node_modules/.bin/syntaxdev atom-spec --package-name MagicPython --tests test/**/*.re --syntax grammars/src/MagicRegExp.syntax.yaml --out test/atom-spec/python-re-spec.js +release_sublime: + ./node_modules/.bin/syntaxdev build-plist --in grammars/src/MagicPython.syntax.yaml --out grammars/MagicPython.tmLanguage + ./node_modules/.bin/syntaxdev build-plist --in grammars/src/MagicRegExp.syntax.yaml --out grammars/MagicRegExp.tmLanguage + + rm -f grammars/*.sublime-syntax + sed -i.bak '/