Rework selector matching for CSScheme

Now supports all known operators and groups.

Author: FichteFoll

Package/CSScheme.YAML-tmLanguage

@@ -39,26 +39,34 @@ repository:
   selector:
     name: meta.selector.csscheme
     begin: \s*(?=[*a-zA-Z()-])
-    end: (?=\{)
+    end: \s*(?=\{)
     patterns:
+    - include: '#comment-block'
     - include: '#selector-patterns'
 
   selector-patterns:
     patterns:
-    - include: '#comment-block'
-    - name: entity.name.tag.wildcard.csscheme
+    - name: keyword.operator.subtraction.csscheme
+      match: (?<![\w_-])(-|'-'|\\-)  # '-' and \\- are escapes for the SASS pre-processor
+    - name: constant.language.wildcard.csscheme  # our special "settings" selector
       match: \*
-    - name: punctuation.parameter-sep.csscheme
-      match: ','
-    - name: meta.selector.subtract.csscheme
-      begin: (?<!\w)('?)-(\1)
-      beginCaptures:
-        '0': {name: keyword.control.selector.subtract.csscheme}
-      end: (?=[{,])
+    - name: keyword.operator.intersection.csscheme
+      match: '&'
+    - name: keyword.operator.union.csscheme
+      match: ',|\|'
+    - name: keyword.operator.nesting.csscheme
+      match: \s
+    - begin: \(
+      end: \)
+      captures:
+        '0': {name: punctuation.section.group.csscheme}
+      name: meta.group.csscheme
       patterns:
-      - include: '#selector-patterns'
+        - include: '#selector-patterns'
+    - name: meta.scope-token.csscheme
+      match: '[\w_.-]+'  # technically, more characters are supported but nowhere used
     - name: invalid.illegal.selector.csscheme
-      match: '[^\s\w*.-]'
+      match: '.'
 
   ruleset:
     name: meta.ruleset.csscheme

Package/CSScheme.tmLanguage

@@ -355,11 +355,15 @@
 			<key>begin</key>
 			<string>\s*(?=[*a-zA-Z()-])</string>
 			<key>end</key>
-			<string>(?=\{)</string>
+			<string>\s*(?=\{)</string>
 			<key>name</key>
 			<string>meta.selector.csscheme</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#comment-block</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#selector-patterns</string>
@@ -371,36 +375,50 @@
 			<key>patterns</key>
 			<array>
 				<dict>
-					<key>include</key>
-					<string>#comment-block</string>
+					<key>match</key>
+					<string>(?&lt;![\w_-])(-|'-'|\\-)</string>
+					<key>name</key>
+					<string>keyword.operator.subtraction.csscheme</string>
 				</dict>
 				<dict>
 					<key>match</key>
 					<string>\*</string>
 					<key>name</key>
-					<string>entity.name.tag.wildcard.csscheme</string>
+					<string>constant.language.wildcard.csscheme</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>&amp;</string>
+					<key>name</key>
+					<string>keyword.operator.intersection.csscheme</string>
 				</dict>
 				<dict>
 					<key>match</key>
-					<string>,</string>
+					<string>,|\|</string>
 					<key>name</key>
-					<string>punctuation.parameter-sep.csscheme</string>
+					<string>keyword.operator.union.csscheme</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\s</string>
+					<key>name</key>
+					<string>keyword.operator.nesting.csscheme</string>
 				</dict>
 				<dict>
 					<key>begin</key>
-					<string>(?&lt;!\w)('?)-(\1)</string>
-					<key>beginCaptures</key>
+					<string>\(</string>
+					<key>captures</key>
 					<dict>
 						<key>0</key>
 						<dict>
 							<key>name</key>
-							<string>keyword.control.selector.subtract.csscheme</string>
+							<string>punctuation.section.group.csscheme</string>
 						</dict>
 					</dict>
 					<key>end</key>
-					<string>(?=[{,])</string>
+					<string>\)</string>
 					<key>name</key>
-					<string>meta.selector.subtract.csscheme</string>
+					<string>meta.group.csscheme</string>
 					<key>patterns</key>
 					<array>
 						<dict>
@@ -411,7 +429,13 @@
 				</dict>
 				<dict>
 					<key>match</key>
-					<string>[^\s\w*.-]</string>
+					<string>[\w_.-]+</string>
+					<key>name</key>
+					<string>meta.scope-token.csscheme</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>.</string>
 					<key>name</key>
 					<string>invalid.illegal.selector.csscheme</string>
 				</dict>