- css селекторы которые названы странно типа value-2

demn98 · demn98 · commit eca966b3ed7c · 2025-02-13T16:51:35.000+03:00
- старт тега и окончание тега выделить в отдельный тег
diff --git a/css/larevel.css b/css/larevel.css
@@ -6,51 +6,63 @@ pre, code {
     background-color: #0c0c0c;
 }
 
-.hl-attribute{
+.hl-attribute {
     color: #FFCB6B;
 }
 
-.hl-constant{
+.hl-constant {
     color: #82AAFF;
 }
 
-.hl-function{
+.hl-function {
     color: #82AAFF;
 }
 
-.hl-template{
+.hl-template {
     color: #A9C77D;
 }
 
-.hl-slug{
+.hl-slug {
     color: #FF5874;
 }
 
-.hl-delimeter{
+.hl-delimeter {
     color: #89DDFF;
 }
 
-.hl-operator{
+.hl-operator {
     color: #C792EA;
 }
 
-.hl-tag {
+.hl-start-end-tag {
+    color: #89DDFF;
+}
+
+.hl-system-tag {
     color: #D3423E;
 }
 
-.hl-tag2{
+.hl-tag {
+    color: #FF5572;
+}
+
+.hl-this-keyword {
+    color: #FF5572;
+}
+
+.hl-doctype-keyword {
     color: #FF5572;
 }
 
 .hl-keyword {
     color: #C792EA;
 }
 
-.hl-property {
+.hl-argument {
     color: #82AAFF;
 }
 
-.hl-property2{
+.hl-property {
     color: #89DDFF;
 }
 
@@ -66,7 +78,11 @@ pre, code {
     color: #C3E88D;
 }
 
-.hl-value2 {
+.hl-json-value {
+    color: #80CBC4;
+}
+
+.hl-location-value {
     color: #80CBC4;
 }
 
diff --git a/src/Languages/JavaScript/Patterns/JsPropertyPattern.php b/src/Languages/JavaScript/Patterns/JsPropertyPattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new DynamicTokenType('hl-property2');
+        return new DynamicTokenType('hl-property');
     }
 }
diff --git a/src/Languages/Json/Injections/JsonArrayInjection.php b/src/Languages/Json/Injections/JsonArrayInjection.php
@@ -32,9 +32,9 @@ public function parseContent(string $content, Highlighter $highlighter): string
         foreach($match['match'] as $val) {
             $content = preg_replace(
                 '/' . addcslashes($val[0], '/*') . '[\b]*/',
-                Escape::tokens($theme->before(new DynamicTokenType('hl-value2')))
+                Escape::tokens($theme->before(new DynamicTokenType('hl-json-value')))
                 . $val[0]
-                . Escape::tokens($theme->after(new DynamicTokenType('hl-value2'))),
+                . Escape::tokens($theme->after(new DynamicTokenType('hl-json-value'))),
                 $content,
             );
         }
diff --git a/src/Languages/Json/Patterns/JsonDoubleQuoteValuePattern.php b/src/Languages/Json/Patterns/JsonDoubleQuoteValuePattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new CanNotContainTokenType('hl-value2');
+        return new CanNotContainTokenType('hl-json-value');
     }
 }
diff --git a/src/Languages/Nginx/Patterns/NginxLocationPathPattern.php b/src/Languages/Nginx/Patterns/NginxLocationPathPattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new DynamicTokenType('hl-value2');
+        return new DynamicTokenType('hl-location-value');
     }
 }
diff --git a/src/Languages/Php/Patterns/PhpCloseTagPattern.php b/src/Languages/Php/Patterns/PhpCloseTagPattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new DynamicTokenType('hl-tag');
+        return new DynamicTokenType('hl-system-tag');
     }
 }
diff --git a/src/Languages/Php/Patterns/PhpEnumCasePattern.php b/src/Languages/Php/Patterns/PhpEnumCasePattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new DynamicTokenType('hl-property');
+        return new DynamicTokenType('hl-argument');
     }
 }
diff --git a/src/Languages/Php/Patterns/PhpNamedArgumentPattern.php b/src/Languages/Php/Patterns/PhpNamedArgumentPattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new DynamicTokenType('hl-property');
+        return new DynamicTokenType('hl-argument');
     }
 }
diff --git a/src/Languages/Php/Patterns/PhpOpenTagPattern.php b/src/Languages/Php/Patterns/PhpOpenTagPattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new DynamicTokenType('hl-tag');
+        return new DynamicTokenType('hl-system-tag');
     }
 }
diff --git a/src/Languages/Php/PhpLanguage.php b/src/Languages/Php/PhpLanguage.php
@@ -77,7 +77,7 @@ public function getPatterns(): array
             // KEYWORDS
             new KeywordPattern($keywords),
             new KeywordPattern('(null|true|false|instanceof|echo|new)', 'hl-constant'),
-            new GenericPattern('/(?<match>\$this)(\-|\$|\,|\)|\;|\:|\s|\(|\])/', 'hl-tag2'),
+            new GenericPattern('/(?<match>\$this)(\-|\$|\,|\)|\;|\:|\s|\(|\])/', 'hl-this-keyword'),
             new GenericPattern('/\->\b(?<match>[\w]+?)\b(?!\()/', 'hl-delimeter'),
             new GenericPattern('/(?<match>\+\+)/', 'hl-constant'),
             new GenericPattern('/\((?<match>(string))\)/', 'hl-keyword'),
diff --git a/src/Languages/Xml/Patterns/XmlCloseTagPattern.php b/src/Languages/Xml/Patterns/XmlCloseTagPattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new DynamicTokenType('hl-tag2');
+        return new DynamicTokenType('hl-tag');
     }
 }
diff --git a/src/Languages/Xml/Patterns/XmlDoctypePattern.php b/src/Languages/Xml/Patterns/XmlDoctypePattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new DynamicTokenType('hl-tag2');
+        return new DynamicTokenType('hl-doctype-keyword');
     }
 }
diff --git a/src/Languages/Xml/Patterns/XmlEndCloseTagPattern.php b/src/Languages/Xml/Patterns/XmlEndCloseTagPattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new DynamicTokenType('hl-delimeter');
+        return new DynamicTokenType('hl-start-end-tag');
     }
 }
diff --git a/src/Languages/Xml/Patterns/XmlOpenTagPattern.php b/src/Languages/Xml/Patterns/XmlOpenTagPattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new DynamicTokenType('hl-tag2');
+        return new DynamicTokenType('hl-tag');
     }
 }
diff --git a/src/Languages/Xml/Patterns/XmlStartOpenTagPattern.php b/src/Languages/Xml/Patterns/XmlStartOpenTagPattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new DynamicTokenType('hl-delimeter');
+        return new DynamicTokenType('hl-start-end-tag');
     }
 }
diff --git a/src/Languages/Yaml/Patterns/YamlPropertyPattern.php b/src/Languages/Yaml/Patterns/YamlPropertyPattern.php
@@ -20,6 +20,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenType
     {
-        return new DynamicTokenType('hl-property2');
+        return new DynamicTokenType('hl-property');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,51 +6,63 @@ pre, code {`
`6`	`6`	`background-color: #0c0c0c;`
`7`	`7`	`}`
`8`	`8`
`9`		`-.hl-attribute{`
	`9`	`+.hl-attribute {`
`10`	`10`	`color: #FFCB6B;`
`11`	`11`	`}`
`12`	`12`
`13`		`-.hl-constant{`
	`13`	`+.hl-constant {`
`14`	`14`	`color: #82AAFF;`
`15`	`15`	`}`
`16`	`16`
`17`		`-.hl-function{`
	`17`	`+.hl-function {`
`18`	`18`	`color: #82AAFF;`
`19`	`19`	`}`
`20`	`20`
`21`		`-.hl-template{`
	`21`	`+.hl-template {`
`22`	`22`	`color: #A9C77D;`
`23`	`23`	`}`
`24`	`24`
`25`		`-.hl-slug{`
	`25`	`+.hl-slug {`
`26`	`26`	`color: #FF5874;`
`27`	`27`	`}`
`28`	`28`
`29`		`-.hl-delimeter{`
	`29`	`+.hl-delimeter {`
`30`	`30`	`color: #89DDFF;`
`31`	`31`	`}`
`32`	`32`
`33`		`-.hl-operator{`
	`33`	`+.hl-operator {`
`34`	`34`	`color: #C792EA;`
`35`	`35`	`}`
`36`	`36`
`37`		`-.hl-tag {`
	`37`	`+.hl-start-end-tag {`
	`38`	`+ color: #89DDFF;`
	`39`	`+}`
	`40`	`+`
	`41`	`+.hl-system-tag {`
`38`	`42`	`color: #D3423E;`
`39`	`43`	`}`
`40`	`44`
`41`		`-.hl-tag2{`
	`45`	`+.hl-tag {`
	`46`	`+ color: #FF5572;`
	`47`	`+}`
	`48`	`+`
	`49`	`+.hl-this-keyword {`
	`50`	`+ color: #FF5572;`
	`51`	`+}`
	`52`	`+`
	`53`	`+.hl-doctype-keyword {`
`42`	`54`	`color: #FF5572;`
`43`	`55`	`}`
`44`	`56`
`45`	`57`	`.hl-keyword {`
`46`	`58`	`color: #C792EA;`
`47`	`59`	`}`
`48`	`60`
`49`		`-.hl-property {`
	`61`	`+.hl-argument {`
`50`	`62`	`color: #82AAFF;`
`51`	`63`	`}`
`52`	`64`
`53`		`-.hl-property2{`
	`65`	`+.hl-property {`
`54`	`66`	`color: #89DDFF;`
`55`	`67`	`}`
`56`	`68`
`@@ -66,7 +78,11 @@ pre, code {`
`66`	`78`	`color: #C3E88D;`
`67`	`79`	`}`
`68`	`80`
`69`		`-.hl-value2 {`
	`81`	`+.hl-json-value {`
	`82`	`+ color: #80CBC4;`
	`83`	`+}`
	`84`	`+`
	`85`	`+.hl-location-value {`
`70`	`86`	`color: #80CBC4;`
`71`	`87`	`}`
`72`	`88`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ public function getPattern(): string`
`20`	`20`
`21`	`21`	`public function getTokenType(): TokenType`
`22`	`22`	`{`
`23`		`- return new DynamicTokenType('hl-property2');`
	`23`	`+ return new DynamicTokenType('hl-property');`
`24`	`24`	`}`
`25`	`25`	`}`