From 4e7e66277ec37cb8afdd5ecaaec955a022f96349 Mon Sep 17 00:00:00 2001
From: Nixinova <Nixinova@users.noreply.github.com>
Date: Tue, 14 Jul 2020 16:11:23 +1200
Subject: [PATCH] 1.2.4

- Update to 0.5.x
- Add syntax highlighting for argument defaults, units, and URLs
---
 .vscodeignore                       |  2 +-
 changelog.md                        |  8 ++++
 package.json                        |  4 +-
 readme.md                           |  4 +-
 syntaxes/novasheets.tmLanguage.json | 70 +++++++++++++++++++++++------
 5 files changed, 71 insertions(+), 17 deletions(-)

diff --git a/.vscodeignore b/.vscodeignore
index f5be647..18a3bcd 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -1,4 +1,4 @@
 .vscode/**
-.vscode-test/**
+.git/**
 .gitignore
 colors.txt
diff --git a/changelog.md b/changelog.md
index 60d1b8f..19168d7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.2.4
+- Added syntax highlighting for static comments (`/*/ text /*/`) and parsed comments (`/*[ ]*/`).
+- Added syntax highlighting for loop indentifiers `$i`, `$v`, and `$v[n]`.
+- Added syntax highlighting for default argument content.
+- Added syntax highlighting for CSS units.
+- Added syntax highlighting for all numeric types.
+- Added syntax highlighting for URLs.
+
 ## 1.2.3
 - Changed syntax highlighting rules to always apply to `@var`, `@endvar`, and `@const` anywhere in a line
 - Changed syntax highlighting of `@const` declarations to allow boolean values and to apply syntax highlighting to the value of the constant.
diff --git a/package.json b/package.json
index 73872b2..379ce48 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
     "name": "novasheets",
     "displayName": "NovaSheets",
-    "description": "Syntax highligher for NovaSheet files",
+    "description": "Syntax highlighter for NovaSheets files",
     "publisher": "Nixinova",
     "repository": "NovaSheets-vscode",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "engines": {
         "vscode": "^1.45.0"
     },
diff --git a/readme.md b/readme.md
index 06b0fce..777052e 100644
--- a/readme.md
+++ b/readme.md
@@ -1,8 +1,10 @@
 [![Latest version](https://img.shields.io/github/v/release/Nixinova/NovaSheets-vscode?label=latest&style=flat-square)](https://github.com/Nixinova/NovaSheets-vscode/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-vscode/releases)
+[![Downloads](https://img.shields.io/visual-studio-marketplace/d/Nixinova.novasheets?style=flat-square)](https://marketplace.visualstudio.com/items/Nixinova.novasheets)
+[![Installs](https://img.shields.io/visual-studio-marketplace/i/Nixinova.novasheets?style=flat-square)](https://marketplace.visualstudio.com/items/Nixinova.novasheets)
 
-This is a [VSCode](https://github.com/microsoft/vscode) extension for [NovaSheets](https://github.com/Nixinova/NovaSheets).
+This is a [VSCode](https://github.com/microsoft/vscode) extension for [NovaSheets](https://github.com/Nixinova/NovaSheets) syntax highlighting.
 
 # Features
 This extension includes syntax highlighting for NovaSheet syntax, including NovaSheets variables and comments, as well as regular CSS content.
diff --git a/syntaxes/novasheets.tmLanguage.json b/syntaxes/novasheets.tmLanguage.json
index a27acf5..c3a0baf 100644
--- a/syntaxes/novasheets.tmLanguage.json
+++ b/syntaxes/novasheets.tmLanguage.json
@@ -21,6 +21,9 @@
 		{
 			"include": "#separator"
 		},
+		{
+			"include": "#loop_identifier"
+		},
 		{
 			"include": "#comments"
 		},
@@ -79,13 +82,13 @@
 			"begin": "(\\$\\()",
 			"beginCaptures": {
 				"1": {
-					"name": "keyword.variable.substitutor.nss"
+					"name": "constant.character.nss"
 				}
 			},
 			"end": "(\\))",
 			"endCaptures": {
 				"1": {
-					"name": "keyword.variable.substitutor.nss"
+					"name": "constant.character.nss"
 				}
 			},
 			"patterns": [
@@ -106,7 +109,7 @@
 				},
 				{
 					"match": "\\|+|(?<!@.*|=)=",
-					"name": "keyword.variable.substitutor.nss"
+					"name": "constant.character.nss"
 				},
 				{
 					"include": "#variable"
@@ -123,31 +126,60 @@
 			]
 		},
 		"parameter": {
-			"match": "(\\$\\[)(.+?)(\\|.*?)?(?:(\\s//.+$)|(\\]))",
+			"match": "(\\$\\[)(.+?)(\\|(.*?))?(?:(\\s//.+$)|(\\]))",
 			"captures": {
 				"1": {
-					"name": "keyword.variable.substitutor.nss"
+					"name": "constant.character.nss"
 				},
 				"2": {
 					"name": "keyword.control.variable.attribute.nss"
 				},
 				"3": {
-					"name": "invalid.illegal.nss"
+					"name": "constant.character.nss"
 				},
 				"4": {
-					"name": "comment.inline.nss"
+					"name": "constant.character.escape.default_argument.nss"
 				},
 				"5": {
-					"name": "keyword.variable.substitutor.nss"
+					"name": "comment.inline.nss"
+				},
+				"6": {
+					"name": "constant.character.nss"
 				}
 			}
 		},
+		"loop_identifier": {
+			"match": "\\$i|\\$v\\[?|(?<=\\$v\\[[^\\]]*?)\\]",
+			"name": "keyword.variable.identifier.loop.nss"
+		},
 		"comments": {
 			"patterns": [
 				{
-					"match": "(?<!:)//.*$",
+					"match": "##!.*",
+					"name": "comment.block.documentation"
+				},
+				{
+					"match": "(?<![a-z]+:)//.*$",
 					"name": "comment.inline.nss"
 				},
+				{
+					"match": "(/\\*/)(.*?)(/\\*/)",
+					"captures": {
+						"1": {
+							"name": "comment.static.nss"
+						},
+						"2": {
+							"name": "markup.italic.content.nss"
+						},
+						"3": {
+							"name": "comment.static.nss"
+						}
+					}
+				},
+				{
+					"match": "(/\\*\\[|\\]\\*/)",
+					"name": "comment.block.css"
+				},
 				{
 					"match": "/\\*.*?\\*/",
 					"name": "comment.block.css"
@@ -156,6 +188,10 @@
 		},
 		"css": {
 			"patterns": [
+				{
+					"match": "[a-z]+://\\w+(\\.\\w+)+(/\\S+?)?(?!\\))",
+					"name": "markup.underline.link"
+				},
 				{
 					"match": "([^@{}]*){",
 					"captures": {
@@ -201,7 +237,7 @@
 				},
 				{
 					"match": "!\\s*important",
-					"name": "string.regexp"
+					"name": "string.regexp.important.css"
 				}
 			]
 		},
@@ -216,12 +252,20 @@
 					"name": "keyword.constant.logic.nss"
 				},
 				{
-					"match": "[-:;,.+~^*/!%(){}a-zA-Z]",
-					"name": "entity.constant.character"
+					"match": "(?<=\\d\\s*)(em|rem|en|ex|px|pt|pc|cm|mm|m|ft|in|%)\\b",
+					"name": "constant.numeric.unit.css"
+				},
+				{
+					"match": "\\d+e\\d+",
+					"name": "constant.numeric.css"
 				},
 				{
-					"match": "[0-9]",
+					"match": "0x[0-9a-f]*\\.?[0-9a-f]+|0b[01]*\\.?[01]+|0o[0-7]*\\.?[0-7]+|[0-9]*\\.?[0-9]+",
 					"name": "constant.numeric.css"
+				},
+				{
+					"match": "[-:;,.+~^*/!%(){}a-zA-Z]",
+					"name": "entity.constant.character"
 				}
 			]
 		}