From 7fee28fcbca8169bad33e4b8d14187253c0833e1 Mon Sep 17 00:00:00 2001 From: Solovyev Aleksey Date: Sun, 17 Jan 2021 09:01:02 +0300 Subject: [PATCH 1/6] Improve macros scope for better highlighting in different schemes --- Syntaxes/Nunjucks.sublime-syntax | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Syntaxes/Nunjucks.sublime-syntax b/Syntaxes/Nunjucks.sublime-syntax index ae6bacb..515eaa6 100644 --- a/Syntaxes/Nunjucks.sublime-syntax +++ b/Syntaxes/Nunjucks.sublime-syntax @@ -295,11 +295,11 @@ contexts: nunjucks-macro-invocation: - match: '({{names}})(\()' - scope: meta.function-call.begin.njk + scope: entity.name.function.njk meta.function-call.begin.njk push: - meta_content_scope: meta.function.parameters.njk - match: (\)) - scope: meta.function-call.end.njk + scope: entity.name.function.njk meta.function-call.end.njk pop: true - include: nunjucks-strings - include: nunjucks-punctuation From 90d2c2ae907165ad1a4d0e05063ab308a9d26244 Mon Sep 17 00:00:00 2001 From: Solovyev Aleksey Date: Sun, 17 Jan 2021 15:59:30 +0300 Subject: [PATCH 2/6] Fix chain filters --- Syntaxes/Nunjucks.sublime-syntax | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Syntaxes/Nunjucks.sublime-syntax b/Syntaxes/Nunjucks.sublime-syntax index 515eaa6..3a3d270 100644 --- a/Syntaxes/Nunjucks.sublime-syntax +++ b/Syntaxes/Nunjucks.sublime-syntax @@ -95,6 +95,7 @@ contexts: - include: nunjucks-commas - include: nunjucks-colons - include: nunjucks-semicolons + - include: nunjucks-pipe nunjucks-dots: - match: '\.' @@ -112,6 +113,10 @@ contexts: - match: ';' scope: punctuation.terminator.njk + nunjucks-pipe: + - match: '\|' + scope: punctuation.accessor.njk + ## Operators nunjucks-operators: - include: nunjucks-bitwise-operators @@ -244,22 +249,23 @@ contexts: - include: nunjucks-block-filter nunjucks-inline-filter: - - match: '(\|)(\s+)?({{names}})(\()?' - captures: - 1: punctuation.accessor.njk - 3: support.class.njk - 4: support.class.njk + # With parentheses + - match: '(?<=\|)((\s+)?{{names}}\()' + scope: support.class.begin.njk push: - - match: '(\))?(\s+)?(?=(%\}|\}\}))' - scope: support.class.njk + - match: '\)' + scope: support.class.end.njk pop: true - include: nunjucks-punctuation - include: nunjucks-operators - include: nunjucks-strings - include: nunjucks-numeric - include: nunjucks-keywords-boolean - - include: nunjucks-keywords-other + - include: nunjucks-keywordss-other - include: nunjucks-variables + # Wuthout parentheses + - match: '(?<=\|)((\s+)?{{names}})' + scope: support.class.njk nunjucks-block-filter: - match: (?<=filter)(\s+)({{names}})(\()? From 4609cd4583464947eabf1d2a4dbf07ca16f439db Mon Sep 17 00:00:00 2001 From: Solovyev Aleksey Date: Sun, 17 Jan 2021 16:09:12 +0300 Subject: [PATCH 3/6] Fix highlighting of called methods --- Syntaxes/Nunjucks.sublime-syntax | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Syntaxes/Nunjucks.sublime-syntax b/Syntaxes/Nunjucks.sublime-syntax index 3a3d270..f133eee 100644 --- a/Syntaxes/Nunjucks.sublime-syntax +++ b/Syntaxes/Nunjucks.sublime-syntax @@ -318,8 +318,25 @@ contexts: ## Variables nunjucks-variables: + # Object methods + - match: '(?<=[\]\w\.])({{names}})(\()' + scope: entity.name.function.njk meta.function-call.begin.njk + push: + - match: (\)) + scope: entity.name.function.njk meta.function-call.end.njk + pop: true + - include: nunjucks-strings + - include: nunjucks-punctuation + - include: nunjucks-parentheses + - include: nunjucks-numeric + - include: nunjucks-operators + - include: nunjucks-keywords-boolean + - include: nunjucks-keywords-other + - include: nunjucks-variables + # Object properties - match: '(?<=[\]\w\.])({{names}})' # scope: variable.other.member.njk scope: variable.function.njk + # Variables - match: '{{names}}' scope: variable.other.readwrite.njk From 137ac5b0cd6543fb579bac85c67fe60c523c2a03 Mon Sep 17 00:00:00 2001 From: Solovyev Aleksey Date: Sun, 17 Jan 2021 16:15:10 +0300 Subject: [PATCH 4/6] Update package version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 57b6a96..57651e4 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ _* to update the package `Package Control: Upgrade Package` select `Nunjucks`_ **Manually download sublime-package file:** -- download sublime-package file: [Nunjucks.sublime-package](https://github.com/alsolovyev/Nunjucks/releases/download/v2.0.0/Nunjucks.sublime-package) +- download sublime-package file: [Nunjucks.sublime-package](https://github.com/alsolovyev/Nunjucks/releases/download/v2.0.1/Nunjucks.sublime-package) - move it into your Sublime Text **Installed Packages** directory - Windows: `%APPDATA%\Sublime Text 3\Installed Packages` - OS X: `~/Library/Application\ Support/Sublime\ Text\ 3/Installed\ Packages` From a94f9e89bdf3ce40d0e549db5f9421a6a3fed32a Mon Sep 17 00:00:00 2001 From: Solovyev Aleksey Date: Sun, 17 Jan 2021 16:16:50 +0300 Subject: [PATCH 5/6] Fix boolean keywords in parentheses --- Syntaxes/Nunjucks.sublime-syntax | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Syntaxes/Nunjucks.sublime-syntax b/Syntaxes/Nunjucks.sublime-syntax index f133eee..1bc1f44 100644 --- a/Syntaxes/Nunjucks.sublime-syntax +++ b/Syntaxes/Nunjucks.sublime-syntax @@ -163,6 +163,8 @@ contexts: - match: \} scope: punctuation.section.braces.end.njk pop: true + - include: nunjucks-keywords-boolean + - include: nunjucks-keywords-other - include: nunjucks-strings - include: nunjucks-punctuation - include: nunjucks-parentheses @@ -178,6 +180,8 @@ contexts: - match: \] scope: punctuation.section.brackets.end.njk pop: true + - include: nunjucks-keywords-boolean + - include: nunjucks-keywords-other - include: nunjucks-strings - include: nunjucks-punctuation - include: nunjucks-parentheses From e274746def8eb7b16744146acf0ba3d0dfa60863 Mon Sep 17 00:00:00 2001 From: Solovyev Aleksey Date: Sun, 17 Jan 2021 16:26:10 +0300 Subject: [PATCH 6/6] Improved indentation rules for curly braces --- Preferences/Indents.tmPreferences | 40 ++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/Preferences/Indents.tmPreferences b/Preferences/Indents.tmPreferences index 04b4916..9c310cd 100644 --- a/Preferences/Indents.tmPreferences +++ b/Preferences/Indents.tmPreferences @@ -9,23 +9,35 @@ increaseIndentPattern decreaseIndentPattern