Do not wrap entire attribute in a span

wouterj · wouterj · commit 60f9d8ae0d0c · 2024-05-21T16:19:09.000+02:00
diff --git a/src/Templates/highlight.php/php.json b/src/Templates/highlight.php/php.json
@@ -11,17 +11,30 @@
     "keywords": "and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try match switch continue endfor endif declare unset true false goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",
     "contains": [
         {
-            "className": "php-attribute",
-            "begin": "#\\[\\s*(\\\\?[A-Z][A-Za-z0-9_\\x7f-\\xff]+|\\\\?[A-Z]+(?=[A-Z][a-z0-9_\\x7f-\\xff])){1,}(?![A-Za-z0-9])(?![$])",
+            "className": "meta",
+            "begin": "#\\[\\s*(\\\\?[A-Z][A-Za-z0-9_\\x7f-\\xff]+)+\\]"
+        },
+        {
+            "begin": "#\\[\\s*(\\\\?[A-Z][A-Za-z0-9_\\x7f-\\xff]+)+(?![A-Za-z0-9])(?![$])",
             "end": "]",
+            "returnBegin": true,
             "contains": [
+                {
+                    "className": "meta",
+                    "begin": "#\\[\\s*(\\\\?[A-Z][A-Za-z0-9_\\x7f-\\xff]+)+(?![A-Za-z0-9])(?![$])"
+                },
                 {
                     "begin": "\\(",
                     "end": "\\)",
                     "keywords": "true false null new array",
                     "contains": {
-                        "$ref": "#contains.10.contains.1.contains"
+                        "$ref": "#contains.11.contains.1.contains"
                     }
+                },
+                {
+                    "className": "meta",
+                    "begin": "]",
+                    "endsParent": true
                 }
             ]
         },
@@ -50,7 +63,7 @@
                     "begin": "<\\?(php)?|\\?>"
                 },
                 {
-                    "$ref": "#contains.1.contains.0"
+                    "$ref": "#contains.2.contains.0"
                 },
                 {
                     "className": "doctag",
@@ -69,7 +82,7 @@
                     "begin": "@[A-Za-z]+"
                 },
                 {
-                    "$ref": "#contains.1.contains.0"
+                    "$ref": "#contains.2.contains.0"
                 },
                 {
                     "className": "doctag",
@@ -84,7 +97,7 @@
             "end": false,
             "contains": [
                 {
-                    "$ref": "#contains.1.contains.0"
+                    "$ref": "#contains.2.contains.0"
                 },
                 {
                     "className": "doctag",
@@ -120,7 +133,7 @@
             ]
         },
         {
-            "$ref": "#contains.2.contains.0"
+            "$ref": "#contains.3.contains.0"
         },
         {
             "className": "variable",
@@ -156,15 +169,15 @@
                     "contains": [
                         "self",
                         {
-                            "$ref": "#contains.8"
+                            "$ref": "#contains.9"
                         },
                         {
                             "className": "comment",
                             "begin": "/\\*",
                             "end": "\\*/",
                             "contains": [
                                 {
-                                    "$ref": "#contains.1.contains.0"
+                                    "$ref": "#contains.2.contains.0"
                                 },
                                 {
                                     "className": "doctag",
@@ -177,10 +190,10 @@
                             "className": "string",
                             "contains": [
                                 {
-                                    "$ref": "#contains.5.contains.0"
+                                    "$ref": "#contains.6.contains.0"
                                 },
                                 {
-                                    "$ref": "#contains.2.contains.0"
+                                    "$ref": "#contains.3.contains.0"
                                 }
                             ],
                             "variants": [
@@ -199,7 +212,7 @@
                                     "illegal": null,
                                     "contains": [
                                         {
-                                            "$ref": "#contains.5.contains.0"
+                                            "$ref": "#contains.6.contains.0"
                                         }
                                     ]
                                 },
@@ -210,7 +223,7 @@
                                     "illegal": null,
                                     "contains": [
                                         {
-                                            "$ref": "#contains.5.contains.0"
+                                            "$ref": "#contains.6.contains.0"
                                         },
                                         {
                                             "className": "subst",
@@ -255,7 +268,7 @@
                     "beginKeywords": "extends implements"
                 },
                 {
-                    "$ref": "#contains.10.contains.0"
+                    "$ref": "#contains.11.contains.0"
                 }
             ]
         },
@@ -265,7 +278,7 @@
             "illegal": "[\\.']",
             "contains": [
                 {
-                    "$ref": "#contains.10.contains.0"
+                    "$ref": "#contains.11.contains.0"
                 }
             ]
         },
@@ -274,18 +287,18 @@
             "end": ";",
             "contains": [
                 {
-                    "$ref": "#contains.10.contains.0"
+                    "$ref": "#contains.11.contains.0"
                 }
             ]
         },
         {
             "begin": "=>"
         },
         {
-            "$ref": "#contains.10.contains.1.contains.3"
+            "$ref": "#contains.11.contains.1.contains.3"
         },
         {
-            "$ref": "#contains.10.contains.1.contains.4"
+            "$ref": "#contains.11.contains.1.contains.4"
         }
     ]
 }
diff --git a/tests/fixtures/expected/blocks/code-blocks/php-attributes.html b/tests/fixtures/expected/blocks/code-blocks/php-attributes.html
@@ -64,73 +64,73 @@
                     <span class="hljs-title">SomeClass</span>
                 </span>
                 {
-                <span class="hljs-php-attribute">#[AttributeName]</span>
+                <span class="hljs-meta">#[AttributeName]</span>
                 <span class="hljs-keyword">private</span>
                 <span class="hljs-variable">
                     <span class="hljs-variable-other-marker">$</span> property1</span>
                 ;
-                <span class="hljs-php-attribute">#[AttributeName()]</span>
+                <span class="hljs-meta">#[AttributeName</span>()<span class="hljs-meta">]</span>
                 <span class="hljs-keyword">private</span>
                 <span class="hljs-variable">
                     <span class="hljs-variable-other-marker">$</span> property2</span>
                 ;
-                <span class="hljs-php-attribute">#[AttributeName(<span class="hljs-string">'value'</span>)]</span>
+                <span class="hljs-meta">#[AttributeName</span>(<span class="hljs-string">'value'</span>)<span class="hljs-meta">]</span>
                 <span class="hljs-keyword">private</span>
                 <span class="hljs-variable">
                     <span class="hljs-variable-other-marker">$</span> property3</span>
                 ;
-                <span class="hljs-php-attribute">#[AttributeName(<span class="hljs-string">'value'</span>, option: <span class="hljs-string">'value'</span>)]</span>
+                <span class="hljs-meta">#[AttributeName</span>(<span class="hljs-string">'value'</span>, option: <span class="hljs-string">'value'</span>)<span class="hljs-meta">]</span>
                 <span class="hljs-keyword">private</span>
                 <span class="hljs-variable">
                     <span class="hljs-variable-other-marker">$</span> property4</span>
                 ;
-                <span class="hljs-php-attribute">#[AttributeName([<span class="hljs-string">'value'</span> =&gt; <span class="hljs-string">'value'</span>])]</span>
+                <span class="hljs-meta">#[AttributeName</span>([<span class="hljs-string">'value'</span> =&gt; <span class="hljs-string">'value'</span>])<span class="hljs-meta">]</span>
                 <span class="hljs-keyword">private</span>
                 <span class="hljs-variable">
                     <span class="hljs-variable-other-marker">$</span> property5</span>
                 ;
-                <span class="hljs-php-attribute">#[AttributeName(
+                <span class="hljs-meta">#[AttributeName</span>(
                     <span class="hljs-string">'value'</span>,
                     option: <span class="hljs-string">'value'</span>
-                )]</span>
+                )<span class="hljs-meta">]</span>
                 <span class="hljs-keyword">private</span>
                 <span class="hljs-variable">
                     <span class="hljs-variable-other-marker">$</span> property6</span>
                 ;
-                <span class="hljs-php-attribute">#[Assert\AttributeName(<span class="hljs-string">'value'</span>)]</span>
+                <span class="hljs-meta">#[Assert\AttributeName</span>(<span class="hljs-string">'value'</span>)<span class="hljs-meta">]</span>
                 <span class="hljs-keyword">private</span>
                 <span class="hljs-variable">
                     <span class="hljs-variable-other-marker">$</span> property7</span>
                 ;
-                <span class="hljs-php-attribute">#[Assert\AttributeName(
+                <span class="hljs-meta">#[Assert\AttributeName</span>(
                     <span class="hljs-string">'value'</span>,
                     option: <span class="hljs-string">'value'</span>
-                )]</span>
+                )<span class="hljs-meta">]</span>
                 <span class="hljs-keyword">private</span>
                 <span class="hljs-variable">
                     <span class="hljs-variable-other-marker">$</span> property8</span>
                 ;
-                <span class="hljs-php-attribute">#[Route(<span class="hljs-string">'/blog/{page&lt;\d+&gt;}'</span>, name: <span class="hljs-string">'blog_list'</span>)]</span>
+                <span class="hljs-meta">#[Route</span>(<span class="hljs-string">'/blog/{page&lt;\d+&gt;}'</span>, name: <span class="hljs-string">'blog_list'</span>)<span class="hljs-meta">]</span>
                 <span class="hljs-keyword">private</span>
                 <span class="hljs-variable">
                 <span class="hljs-variable-other-marker">$</span> property9</span>
                 ;
-                <span class="hljs-php-attribute">#[Assert\GreaterThanOrEqual(
+                <span class="hljs-meta">#[Assert\GreaterThanOrEqual</span>(
                     value: <span class="hljs-number">18</span>,
-                )]</span>
+                )<span class="hljs-meta">]</span>
                 <span class="hljs-keyword">private</span>
                 <span class="hljs-variable">
                 <span class="hljs-variable-other-marker">$</span> property10</span>
                 ;
-                <span class="hljs-php-attribute">#[ORM\CustomIdGenerator(class: <span class="hljs-string">'doctrine.uuid_generator'</span>)]</span>
+                <span class="hljs-meta">#[ORM\CustomIdGenerator</span>(class: <span class="hljs-string">'doctrine.uuid_generator'</span>)<span class="hljs-meta">]</span>
                 <span class="hljs-keyword">private</span>
                 <span class="hljs-variable">
                 <span class="hljs-variable-other-marker">$</span> property11</span>
                 ;
-                <span class="hljs-php-attribute">#[Assert\AtLeastOneOf([
+                <span class="hljs-meta">#[Assert\AtLeastOneOf</span>([
                     <span class="hljs-keyword">new</span> Assert\Regex(<span class="hljs-string">'/#/'</span>),
                     <span class="hljs-keyword">new</span> Assert\Length(min: <span class="hljs-number">10</span>),
-                ])]</span>
+                ])<span class="hljs-meta">]</span>
                 <span class="hljs-keyword">private</span>
                 <span class="hljs-variable">
                 <span class="hljs-variable-other-marker">$</span> property12</span>

Original file line number	Diff line number	Diff line change
`@@ -11,17 +11,30 @@`
`11`	`11`	"keywords": "and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try match switch continue endfor endif declare unset true false goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",
`12`	`12`	`"contains": [`
`13`	`13`	`{`
`14`		`- "className": "php-attribute",`
`15`		`- "begin": "#\\[\\s*(\\\\?[A-Z][A-Za-z0-9_\\x7f-\\xff]+\|\\\\?[A-Z]+(?=[A-Z][a-z0-9_\\x7f-\\xff])){1,}(?![A-Za-z0-9])(?![$])",`
	`14`	`+ "className": "meta",`
	`15`	`+ "begin": "#\\[\\s*(\\\\?[A-Z][A-Za-z0-9_\\x7f-\\xff]+)+\\]"`
	`16`	`+ },`
	`17`	`+ {`
	`18`	`+ "begin": "#\\[\\s*(\\\\?[A-Z][A-Za-z0-9_\\x7f-\\xff]+)+(?![A-Za-z0-9])(?![$])",`
`16`	`19`	`"end": "]",`
	`20`	`+ "returnBegin": true,`
`17`	`21`	`"contains": [`
	`22`	`+ {`
	`23`	`+ "className": "meta",`
	`24`	`+ "begin": "#\\[\\s*(\\\\?[A-Z][A-Za-z0-9_\\x7f-\\xff]+)+(?![A-Za-z0-9])(?![$])"`
	`25`	`+ },`
`18`	`26`	`{`
`19`	`27`	`"begin": "\\(",`
`20`	`28`	`"end": "\\)",`
`21`	`29`	`"keywords": "true false null new array",`
`22`	`30`	`"contains": {`
`23`		`- "$ref": "#contains.10.contains.1.contains"`
	`31`	`+ "$ref": "#contains.11.contains.1.contains"`
`24`	`32`	`}`
	`33`	`+ },`
	`34`	`+ {`
	`35`	`+ "className": "meta",`
	`36`	`+ "begin": "]",`
	`37`	`+ "endsParent": true`
`25`	`38`	`}`
`26`	`39`	`]`
`27`	`40`	`},`
`@@ -50,7 +63,7 @@`
`50`	`63`	`"begin": "<\\?(php)?\|\\?>"`
`51`	`64`	`},`
`52`	`65`	`{`
`53`		`- "$ref": "#contains.1.contains.0"`
	`66`	`+ "$ref": "#contains.2.contains.0"`
`54`	`67`	`},`
`55`	`68`	`{`
`56`	`69`	`"className": "doctag",`
`@@ -69,7 +82,7 @@`
`69`	`82`	`"begin": "@[A-Za-z]+"`
`70`	`83`	`},`
`71`	`84`	`{`
`72`		`- "$ref": "#contains.1.contains.0"`
	`85`	`+ "$ref": "#contains.2.contains.0"`
`73`	`86`	`},`
`74`	`87`	`{`
`75`	`88`	`"className": "doctag",`
`@@ -84,7 +97,7 @@`
`84`	`97`	`"end": false,`
`85`	`98`	`"contains": [`
`86`	`99`	`{`
`87`		`- "$ref": "#contains.1.contains.0"`
	`100`	`+ "$ref": "#contains.2.contains.0"`
`88`	`101`	`},`
`89`	`102`	`{`
`90`	`103`	`"className": "doctag",`
`@@ -120,7 +133,7 @@`
`120`	`133`	`]`
`121`	`134`	`},`
`122`	`135`	`{`
`123`		`- "$ref": "#contains.2.contains.0"`
	`136`	`+ "$ref": "#contains.3.contains.0"`
`124`	`137`	`},`
`125`	`138`	`{`
`126`	`139`	`"className": "variable",`
`@@ -156,15 +169,15 @@`
`156`	`169`	`"contains": [`
`157`	`170`	`"self",`
`158`	`171`	`{`
`159`		`- "$ref": "#contains.8"`
	`172`	`+ "$ref": "#contains.9"`
`160`	`173`	`},`
`161`	`174`	`{`
`162`	`175`	`"className": "comment",`
`163`	`176`	`"begin": "/\\*",`
`164`	`177`	`"end": "\\*/",`
`165`	`178`	`"contains": [`
`166`	`179`	`{`
`167`		`- "$ref": "#contains.1.contains.0"`
	`180`	`+ "$ref": "#contains.2.contains.0"`
`168`	`181`	`},`
`169`	`182`	`{`
`170`	`183`	`"className": "doctag",`
`@@ -177,10 +190,10 @@`
`177`	`190`	`"className": "string",`
`178`	`191`	`"contains": [`
`179`	`192`	`{`
`180`		`- "$ref": "#contains.5.contains.0"`
	`193`	`+ "$ref": "#contains.6.contains.0"`
`181`	`194`	`},`
`182`	`195`	`{`
`183`		`- "$ref": "#contains.2.contains.0"`
	`196`	`+ "$ref": "#contains.3.contains.0"`
`184`	`197`	`}`
`185`	`198`	`],`
`186`	`199`	`"variants": [`
`@@ -199,7 +212,7 @@`
`199`	`212`	`"illegal": null,`
`200`	`213`	`"contains": [`
`201`	`214`	`{`
`202`		`- "$ref": "#contains.5.contains.0"`
	`215`	`+ "$ref": "#contains.6.contains.0"`
`203`	`216`	`}`
`204`	`217`	`]`
`205`	`218`	`},`
`@@ -210,7 +223,7 @@`
`210`	`223`	`"illegal": null,`
`211`	`224`	`"contains": [`
`212`	`225`	`{`
`213`		`- "$ref": "#contains.5.contains.0"`
	`226`	`+ "$ref": "#contains.6.contains.0"`
`214`	`227`	`},`
`215`	`228`	`{`
`216`	`229`	`"className": "subst",`
`@@ -255,7 +268,7 @@`
`255`	`268`	`"beginKeywords": "extends implements"`
`256`	`269`	`},`
`257`	`270`	`{`
`258`		`- "$ref": "#contains.10.contains.0"`
	`271`	`+ "$ref": "#contains.11.contains.0"`
`259`	`272`	`}`
`260`	`273`	`]`
`261`	`274`	`},`
`@@ -265,7 +278,7 @@`
`265`	`278`	`"illegal": "[\\.']",`
`266`	`279`	`"contains": [`
`267`	`280`	`{`
`268`		`- "$ref": "#contains.10.contains.0"`
	`281`	`+ "$ref": "#contains.11.contains.0"`
`269`	`282`	`}`
`270`	`283`	`]`
`271`	`284`	`},`
`@@ -274,18 +287,18 @@`
`274`	`287`	`"end": ";",`
`275`	`288`	`"contains": [`
`276`	`289`	`{`
`277`		`- "$ref": "#contains.10.contains.0"`
	`290`	`+ "$ref": "#contains.11.contains.0"`
`278`	`291`	`}`
`279`	`292`	`]`
`280`	`293`	`},`
`281`	`294`	`{`
`282`	`295`	`"begin": "=>"`
`283`	`296`	`},`
`284`	`297`	`{`
`285`		`- "$ref": "#contains.10.contains.1.contains.3"`
	`298`	`+ "$ref": "#contains.11.contains.1.contains.3"`
`286`	`299`	`},`
`287`	`300`	`{`
`288`		`- "$ref": "#contains.10.contains.1.contains.4"`
	`301`	`+ "$ref": "#contains.11.contains.1.contains.4"`
`289`	`302`	`}`
`290`	`303`	`]`
`291`	`304`	`}`