1.2.2

NovaSheets · Jun 13, 2020 · 50eb433 · 50eb433
1 parent 552c587
commit 50eb433
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 19 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,14 @@
 # Changelog
 
-## 0.2.1
+## 1.2.2
+- Added syntax highlighting for `@const` and `@endvar` declarations.
+- Added syntax highlighting for logical and bitwise operations.
+- Changed variable declaration syntax highlighting to allow equals sign notation to be valid.
+- Fixed lines being automatically indented.
+- Fixed empty comments not having syntax highlighting applied.
+- Fixed colons being treated as invalid in variable contents.
+
+## 1.2.1
 - Re-added numeric syntax highlighting.
 - Added specific syntax highlighting for denoting built-in variables.
 - Added `"` and `'` as auto-closing and auto-surrounding pairs.
@@ -13,7 +21,7 @@
 - Fixed CSS at-rule declarators containing hyphens not having proper syntax highlighting applied.
 - Fixed single-character strings not being treated as valid.
 - Fixed invalid hex colors being treated as valid.
-- Fixed general invalid characters now having syntax highlighting applied.
+- Fixed general invalid characters not having syntax highlighting applied.
 
 ## 1.2.0
 - Added argument syntax highlighting.

diff --git a/language-configuration.json b/language-configuration.json
@@ -22,8 +22,5 @@
         ["{", "}"],
         ["\"", "\""],
         ["'", "'"]
-    ],
-    "indentationRules": {
-        "decreaseIndentPattern": "^\\s*---\\s*$"
-    }
+    ]
 }
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "description": "Syntax highligher for NovaSheet files",
     "publisher": "Nixinova",
     "repository": "NovaSheets-vscode",
-    "version": "1.2.1",
+    "version": "1.2.2",
     "engines": {
         "vscode": "^1.45.0"
     },
@@ -33,6 +33,11 @@
                 "scopeName": "source.nss",
                 "path": "./syntaxes/novasheets.tmLanguage.json"
             }
-        ]
+        ],
+        "configurationDefaults": {
+            "[novasheets]": {
+                "editor.autoIndent": "none"
+            }
+        }
     }
-}
+}
diff --git a/readme.md b/readme.md
@@ -1,3 +1,7 @@
+[![Latest version](https://img.shields.io/github/v/release/Nixinova/NovaSheets-vscode?label=latest&style=flat-square)](https://github.com/Nixinova/NovaSheets/releases)
+[![Marketplace version](https://img.shields.io/visual-studio-marketplace/v/Nixinova.novasheets?label=marketplace&style=flat-square)](https://marketplace.visualstudio.com/items/Nixinova.novasheets)
+[![Last updated](https://img.shields.io/github/release-date/Nixinova/NovaSheets-vscode?label=updated&style=flat-square)](https://github.com/Nixinova/NovaSheets/releases)
+
 This is a [VSCode](https://github.com/microsoft/vscode) extension for [NovaSheets](https://github.com/Nixinova/NovaSheets).
 
 # Features

diff --git a/syntaxes/novasheets.tmLanguage.json b/syntaxes/novasheets.tmLanguage.json
@@ -3,9 +3,15 @@
 	"name": "NovaSheets",
 	"scopeName": "source.nss",
 	"patterns": [
+		{
+			"include": "#constant"
+		},
 		{
 			"include": "#variable_declaration"
 		},
+		{
+			"include": "#variable_ending"
+		},
 		{
 			"include": "#variable"
 		},
@@ -26,23 +32,49 @@
 		}
 	],
 	"repository": {
-		"variable_declaration": {
-			"match": "^\\s*(@var)\\s+([^=)\\]]+?)(\\|[^=)\\]]+?)?(\\s//.+|)$",
+		"constant": {
+			"match": "^\\s*(@const)\\s+([A-Z_]+)\\s+([0-9]+)(\\s//.*)?$",
 			"captures": {
 				"1": {
 					"name": "keyword.variable.declarator"
 				},
 				"2": {
-					"name": "support.type.variable.default.nss"
-				},
-				"3": {
-					"name": "keyword.control.variable.attribute.nss"
+					"name": "support.type.constant.nss"
 				},
 				"4": {
 					"name": "comment.inline.nss"
 				}
 			}
 		},
+		"variable_declaration": {
+			"patterns": [
+				{
+					"match": "(?<=^\\s*@var.+)//.*$",
+					"name": "comment.inline.nss"
+				},
+				{
+					"match": "^\\s*(@var)\\s+((?:[^|=)\\]](?!\/\/))+)(\\|(?:[^=)\\]](?!\/\/))+)*(=?)(?=.*$)",
+					"captures": {
+						"1": {
+							"name": "keyword.variable.declarator"
+						},
+						"2": {
+							"name": "support.type.variable.default.nss"
+						},
+						"3": {
+							"name": "keyword.control.variable.attribute.nss"
+						},
+						"4": {
+							"name": "keyword.variable.declarator"
+						}
+					}
+				}
+			]
+		},
+		"variable_ending": {
+			"match": "^\\s*@endvar\\s*$",
+			"name": "keyword.variable.ending.declarator"
+		},
 		"variable": {
 			"begin": "(\\$\\()",
 			"beginCaptures": {
@@ -61,7 +93,7 @@
 					"match": "(?<=\\()(@)?([^|=)]+)(?=\\)|\\|)",
 					"captures": {
 						"1": {
-							"name" : "keyword.other.unit.variable.default.nss"
+							"name": "keyword.other.unit.variable.default.nss"
 						},
 						"2": {
 							"name": "support.type.variable.default.nss"
@@ -117,11 +149,11 @@
 		"comments": {
 			"patterns": [
 				{
-					"match": "(?<!:)//.+$",
+					"match": "(?<!:)//.*$",
 					"name": "comment.inline.nss"
 				},
 				{
-					"match": "/\\*.+\\*/",
+					"match": "/\\*.*\\*/",
 					"name": "comment.block.css"
 				}
 			]
@@ -180,7 +212,15 @@
 		"other": {
 			"patterns": [
 				{
-					"match": "[-;,.+*/!%(){}a-zA-Z]",
+					"match": "(?<=\\$\\(\\s*@(?:bitwise|logic)[^)]+)(!|not|&|and|nand|or|nor|xor|xnor)",
+					"name": "support.function.bitwise.nss"
+				},
+				{
+					"match": "\\b(true|false)\\b",
+					"name": "keyword.constant.logic.nss"
+				},
+				{
+					"match": "[-:;,.+*/!%(){}a-zA-Z]",
 					"name": "entity.constant.character"
 				},
 				{