Merge pull request #66 from mghdotdev/release/version-1-6-3

Release/version 1 6 3
mghdotdev · Dec 28, 2023 · c6aa02b · c6aa02b
2 parents 6b59ed1 + d57e800
commit c6aa02b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Miva IDE CHANGELOG
 
+## v1.6.3
+
+* Fixed Miva Script expression syntax hightlighting error.
+
 ## v1.6.2
 
-* Updated CHANGELOG header to be consistant with README.
+* Updated CHANGELOG header to be consistent with README.
 * Fixed MvASSIGNARRAY completion bugs.
 
 ## v1.6.1

diff --git a/ROADMAP.md b/ROADMAP.md
@@ -70,9 +70,12 @@ This is the existing development flow. When new LSK or Empressa versions are rel
 - [x] Add "What's New" popup after upgrading.
 - [x] Fix completions when inside mvt:item functions.
 
+### v1.6.3
+
+- [x] Fix syntax issue in Miva Script where an expression scope is active inside embedded JavaScript curly code blocks.
+
 ### v1.X.0
 
-- [ ] Fix syntax issue in Miva Script where an expression scope is active inside embedded JavaScript curly code blocks.
 - [ ] Fix indentation issues when running Reindent Lines.
 	- mvt:comment with pipes
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "vscode-miva-ide",
 	"displayName": "Miva IDE",
 	"description": "Syntax highlighting, snippets and tools for building websites with Miva.",
-	"version": "1.6.2",
+	"version": "1.6.3",
 	"engines": {
 		"vscode": "^1.77.0"
 	},

diff --git a/syntaxes/MV/mv.injection.tmLanguage.json b/syntaxes/MV/mv.injection.tmLanguage.json
@@ -462,7 +462,7 @@
       ]
     },
     "expression": {
-      "begin": "{",
+      "begin": "\\{(?!\\n)",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.expression.begin.mv"

diff --git a/syntaxes/MV/mv.injection.tmLanguage.yaml b/syntaxes/MV/mv.injection.tmLanguage.yaml
@@ -258,7 +258,7 @@ repository:
 
   # =-======================== Expression ========================-= #
   expression:
-    begin: '{'
+    begin: '\{(?!\n)'
     beginCaptures:
       0: {name: punctuation.definition.expression.begin.mv}
     end: '}'