enhance PHP & CSS colouring

Author: gaplo917

vscode/src/gapstyle.yml

@@ -348,7 +348,6 @@ tokenColors:
     - meta.function-call
     - meta.function-call.generic
     - meta.function-call.object
-    - meta.function-call.php
     - meta.function-call.static
     - meta.method.groovy
     - support.function.any-method.lua
@@ -416,14 +415,6 @@ tokenColors:
     settings:
       foreground: *KEYWORD
 
-  - name: Language specific Keywords
-    scope:
-    - punctuation.section.embedded.begin.php
-    - punctuation.section.embedded.end.php
-    settings:
-      fontStyle: bold
-      foreground: *KEYWORD
-
 
 # =============================================================================
 # Language Built-ins
@@ -581,7 +572,6 @@ tokenColors:
     - storage.type.cs
     - storage.type.groovy
     - storage.type.objc
-    - storage.type.php
     - storage.type.haskell
     - storage.type.ocaml
     settings:
@@ -1017,6 +1007,7 @@ tokenColors:
     - entity.other.attribute-name.id.css
     - entity.other.attribute-name.pseudo-element.css
     - entity.name.tag.css
+    - entity.name.tag.custom.css
     - constant.other.unicode-range.css
     - punctuation.definition.constant.css
     - support.constant.language-range.css
@@ -1626,32 +1617,61 @@ tokenColors:
 # =============================================================================
 # PHP
 # =============================================================================
+
+  - name: PHP Keywords
+    scope:
+    - punctuation.section.embedded.begin.php
+    - punctuation.section.embedded.end.php
+    - punctuation.section.embedded.end.php source.php
+    - variable.language.this.php
+    - constant.language.php
+    - storage.type.php
+    settings:
+      foreground: *KEYWORD
+      fontStyle: bold
+
   - name: PHP Class Fields
     scope:
       - meta.class.body.php variable.other.php
       - meta.class.body.php variable.other.php punctuation.definition.variable.php
     settings:
       foreground: *MEMBER_VAR
 
-  - name: PHP Function parameter
+  - name: PHP Magic Function
     scope:
-      - meta.function.parameters.php variable.other.php
+      - support.function.magic.php
     settings:
-      foreground: *FUNCTION_PARAM
+      foreground: *FUNCTION
+      fontStyle: bold italic
 
-  - name: PHP Keyword
+  - name: PHP Function parameter
     scope:
-      - variable.language.this.php
+      - meta.function.parameters.php variable.other.php
     settings:
-      foreground: *KEYWORD
-      fontStyle: bold
+      foreground: *FUNCTION_PARAM
 
   - name: PHP Typehints
     scope:
       - meta.function.parameter.typehinted.php
       - meta.function.parameter.typehinted.php storage.type.php
     settings:
       foreground: *TYPE_PARAM
+
+  - name: PHP Variable
+    scope:
+      - variable.other.php
+      - variable.other.class.php
+    settings:
+      foreground: *LOCAL_VAR
+
+  - name: PHP Global
+    scope:
+      - variable.other.global.php
+      - variable.other.global.php punctuation.definition.variable.php
+    settings:
+      foreground: *PREDEFINED
+      fontStyle: italic
+
 # =============================================================================
 # Protobuf
 # =============================================================================