Skip to content

Support element for self closing elements in xml #3360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndreasArvidsson merged 2 commits into from
Sep 19, 2026
Merged

Support element for self closing elements in xml #3360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e53530
Support `element` for self closing elements in xml
AndreasArvidsson Sep 19, 2026
ca94f25
Ran Meta Updater
AndreasArvidsson Sep 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions packages/app-web-docs/src/docs/user/languages/fixtures/xml.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,23 @@
}
]
},
{
"name": "scopes/xml/element2",
"languageId": "xml",
"facet": "element",
"code": "<name />",
"scopes": [
{
"targets": [
{
"content": "0:0-0:8",
"removal": "0:0-0:8"
}
],
"domain": "0:0-0:8"
}
]
},
{
"name": "scopes/xml/endTag",
"languageId": "xml",
Expand Down
2 changes: 2 additions & 0 deletions packages/app-web-docs/src/docs/user/languages/xml.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ Below are visualizations of all our scope tests for this language. These were cr

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

<ScopeVisualizer fixtureName="scopes/xml/element2" languageId="xml" />

### Xml end tag

#### 1. End tag
Expand Down
17 changes: 17 additions & 0 deletions packages/app-web-docs/src/docs/user/scopes/fixtures/xmlElement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,22 @@
"domain": "0:0-0:13"
}
]
},
{
"name": "scopes/xml/element2",
"languageId": "xml",
"facet": "element",
"code": "<name />",
"scopes": [
{
"targets": [
{
"content": "0:0-0:8",
"removal": "0:0-0:8"
}
],
"domain": "0:0-0:8"
}
]
}
]
2 changes: 2 additions & 0 deletions packages/app-web-docs/src/docs/user/scopes/xmlElement.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@ Default: `element`

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

<ScopeVisualizer fixtureName="scopes/xml/element2" />

</ScopeVisualizerProvider>
10 changes: 10 additions & 0 deletions resources/fixtures/scopes/xml/element2.scope
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<name />
---

[Content] =
[Removal] =
[Domain] = 0:0-0:8
>--------<
0| <name />

[Insertion delimiter] = "\n"
20 changes: 8 additions & 12 deletions resources/queries/xml.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,13 @@
;;! ^^^^
(CharData) @textFragment

;;!! <aaa>text</aaa>
;;! ^^^^^^^^^^^^^^^
;;! ^^^^
(element
(STag) @interior.start.endOf
(ETag) @interior.end.startOf
) @xmlElement

;;!! <aaa>text</aaa>
;;! ^^^^^ ^^^^^^
;;! ---------------
;;! ^^^^
(element
(STag) @xmlStartTag
(ETag) @xmlEndTag
) @_.domain
(STag) @xmlStartTag @interior.start.endOf
(ETag) @xmlEndTag @interior.end.startOf
) @xmlStartTag.domain @xmlEndTag.domain

(element
[
Expand All @@ -70,6 +62,10 @@
(#allow-multiple! @xmlBothTags)
) @_.domain

;;!! <aaa>text</aaa>
;;!! <aaa/>
(element) @xmlElement

(element
(STag) @xmlElement.iteration.start.endOf @xmlBothTags.iteration.start.endOf
(content
Expand Down
Loading