Skip to content

Commit 25d9267

Browse files
Support element for self closing elements in xml (#3360)
1 parent ab675bd commit 25d9267

6 files changed

Lines changed: 56 additions & 12 deletions

File tree

‎packages/app-web-docs/src/docs/user/languages/fixtures/xml.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,23 @@
5050
}
5151
]
5252
},
53+
{
54+
"name": "scopes/xml/element2",
55+
"languageId": "xml",
56+
"facet": "element",
57+
"code": "<name />",
58+
"scopes": [
59+
{
60+
"targets": [
61+
{
62+
"content": "0:0-0:8",
63+
"removal": "0:0-0:8"
64+
}
65+
],
66+
"domain": "0:0-0:8"
67+
}
68+
]
69+
},
5370
{
5471
"name": "scopes/xml/endTag",
5572
"languageId": "xml",

‎packages/app-web-docs/src/docs/user/languages/xml.mdx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ Below are visualizations of all our scope tests for this language. These were cr
6767

6868
<ScopeVisualizer fixtureName="scopes/xml/element" languageId="xml" />
6969

70+
<ScopeVisualizer fixtureName="scopes/xml/element2" languageId="xml" />
71+
7072
### Xml end tag
7173

7274
#### 1. End tag

‎packages/app-web-docs/src/docs/user/scopes/fixtures/xmlElement.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,22 @@
6666
"domain": "0:0-0:13"
6767
}
6868
]
69+
},
70+
{
71+
"name": "scopes/xml/element2",
72+
"languageId": "xml",
73+
"facet": "element",
74+
"code": "<name />",
75+
"scopes": [
76+
{
77+
"targets": [
78+
{
79+
"content": "0:0-0:8",
80+
"removal": "0:0-0:8"
81+
}
82+
],
83+
"domain": "0:0-0:8"
84+
}
85+
]
6986
}
7087
]

‎packages/app-web-docs/src/docs/user/scopes/xmlElement.mdx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,6 @@ Default: `element`
4747

4848
<ScopeVisualizer fixtureName="scopes/xml/element" />
4949

50+
<ScopeVisualizer fixtureName="scopes/xml/element2" />
51+
5052
</ScopeVisualizerProvider>
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<name />
2+
---
3+
4+
[Content] =
5+
[Removal] =
6+
[Domain] = 0:0-0:8
7+
>--------<
8+
0| <name />
9+
10+
[Insertion delimiter] = "\n"

‎resources/queries/xml.scm‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,13 @@
4646
;;! ^^^^
4747
(CharData) @textFragment
4848

49-
;;!! <aaa>text</aaa>
50-
;;! ^^^^^^^^^^^^^^^
51-
;;! ^^^^
52-
(element
53-
(STag) @interior.start.endOf
54-
(ETag) @interior.end.startOf
55-
) @xmlElement
56-
5749
;;!! <aaa>text</aaa>
5850
;;! ^^^^^ ^^^^^^
59-
;;! ---------------
51+
;;! ^^^^
6052
(element
61-
(STag) @xmlStartTag
62-
(ETag) @xmlEndTag
63-
) @_.domain
53+
(STag) @xmlStartTag @interior.start.endOf
54+
(ETag) @xmlEndTag @interior.end.startOf
55+
) @xmlStartTag.domain @xmlEndTag.domain
6456

6557
(element
6658
[
@@ -70,6 +62,10 @@
7062
(#allow-multiple! @xmlBothTags)
7163
) @_.domain
7264

65+
;;!! <aaa>text</aaa>
66+
;;!! <aaa/>
67+
(element) @xmlElement
68+
7369
(element
7470
(STag) @xmlElement.iteration.start.endOf @xmlBothTags.iteration.start.endOf
7571
(content

0 commit comments

Comments
 (0)