1.4.1

- Fix newlines breaking highlighting (fix #1)
- Fix superfluous spaces being added (fix #2)

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = crlf
+insert_final_newline = true
+trim_trailing_whitespace = true

.gitattributes

@@ -0,0 +1,5 @@
+# General
+* text=auto
+
+# Project
+package-lock.json -diff

.gitignore

@@ -3,4 +3,5 @@ test/
 
 *.local.*
 *.js
-*.yaml
+*.d.ts
+*.json

changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.4.1
+- Fixed newlines breaking attribute syntax highlighting (#1).
+- Fixed selectors not having syntax highlighting applied when not at the start of a line.
+- Fixed empty parameters having superfluous spaces added when formatted (#2).
+- Fixed pseudo-classes after parenthetical selectors having invalid spaces added (#2).
+
 ## 1.4.0
 - Added breakpoint snippet.
 - Added previous element selector syntax highlighting.

formatters/formatter.ts

@@ -15,6 +15,7 @@ export function activate(context: vscode.ExtensionContext) {
                 .replace(/(?<=(?:\$\(|\))[^()]+) *\)/g, ' )')
                 .replace(/\$\(\s+([^$()|]+)\s+\)/g, '$($1)')
                 .replace(/ *\| */g, ' | ')
+                .replace(/  \|/g, ' |')
                 .replace(/(?<=\|)(.*?) *=\s*/g, '$1 = ')
                 .replace(/^ ([|)])/gm, '$1')
 
@@ -23,7 +24,7 @@ export function activate(context: vscode.ExtensionContext) {
 
                 // CSS
                 .replace(/ *{/g, ' {')
-                .replace(/(?<=[{(][^}]*)([a-z-]+)\s*:(?!\/\/) */g, '$1: ')
+                .replace(/(?<=[{(][^})]*)([a-z-]+)\s*:(?!\/\/) +/g, '$1: ')
                 .replace(/; *(?!})/g, '; ')
                 .replace(/\s*;/g, ';')
                 .replace(/!\s*important/g, '!important')

package.json

@@ -4,7 +4,7 @@
     "description": "Syntax highlighter and formatter for NovaSheets files",
     "publisher": "Nixinova",
     "repository": "NovaSheets-vscode",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "license": "ISC",
     "scripts": {
         "vscode:prepublish": "npm run compile",
@@ -54,7 +54,7 @@
     },
     "devDependencies": {
         "@types/vscode": "^1.54.0",
-        "typescript": "^4.2.3",
+        "typescript": "~4.3.2",
         "yamljs": "^0.3.0"
     }
 }

syntaxes/novasheets.tmLanguage.yaml

@@ -20,9 +20,9 @@ repository:
   css:
     patterns:
       - include: '#selectors'
+      - include: '#attributes'
       - include: '#at-rules'
       - include: '#functions'
-      - include: '#block'
 
   declarations:
     patterns:
@@ -48,7 +48,7 @@ repository:
 
       # Parser constant
       - name: meta.preprocessor.novasheets
-        match: '(@option)\s+([A-Z_]+)\s+(?=\d+|true|false)'
+        match: '(@option)\s+([A-Z_]+)\s+'
         captures:
           1: { name: keyword.control.declaration.option.novasheets }
           2: { name: variable.parameter.option.novasheets }
@@ -163,12 +163,12 @@ repository:
   selectors:
     patterns:
       - name: meta.selector.novasheets
-        begin: '(?<!@[^$@{}])^(?=\s*[A-Za-z&%,.#:+~>\[\]])(?![^}]*$)'
+        begin: '(?<!@[^$@{}])(?=\s*[A-Za-z&%,.#:+~>\[\]])(?=.*{)'
         end: '(?=\{)'
         patterns:
           # Element
           - name: entity.name.tag.css.selector.element.css
-            match: '(?<=\s|^|,)[A-Za-z]+[0-9]?(?=\s|[\[,.#:+~>])'
+            match: '\w+(?=[\s{\[,.#:+~>])'
           # Class
           - name: entity.name.tag.css.selector.class.css
             match: '(\.)(?>\\\s|[^\s,.#:+~>\[\]])+'
@@ -222,31 +222,12 @@ repository:
           - include: '#novasheets'
           - include: '#chars'
 
-  block:
-    name: meta.block.css
-    begin: '{'
-    beginCaptures:
-      0: { name: punctuation.definition.block.begin.css }
-    end: '}'
-    endCaptures:
-      0: { name: punctuation.definition.block.end.css }
+  attributes:
     patterns:
-      # Attribute
-      - name: meta.language.attribute.name.css
-        match: '(?<=[;{])\s*([\w-]+)\s*(:)'
+      - name: entity.other.attribute-name.css
+        match: '([\w-]+)(:)'
         captures:
-          1: { name: entity.other.attribute-name.css }
           2: { name: punctuation.terminator.attribute.name.end.css }
-      # Value
-      - name: meta.language.attribute.value.css
-        begin: '(?<=[{:;])'
-        end: ';|(?=})'
-        endCaptures:
-          0: { name: punctuation.terminator.attribute.value.end.css }
-        patterns:
-          - include: '#novasheets'
-          - include: '#functions'
-          - include: '#chars'
 
   at-rules:
     patterns:

tsconfig.json

@@ -4,7 +4,7 @@
 
     /* Basic Options */
     //"incremental": true,
-    "target": "es2017",
+    "target": "es2018",
     "module": "commonjs",
     //"lib": [],
     //"allowJs": true,