Skip to content

Improved sorting of collection item iteration scopes #3362

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

Improved sorting of collection item iteration scopes #3362

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
3b9fc6d
Improved sorting of collection item iteration scopes
AndreasArvidsson Sep 19, 2026
4093b45
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
8 changes: 0 additions & 8 deletions packages/app-web-docs/src/docs/user/languages/fixtures/csharp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,14 +1233,6 @@
],
"domain": "0:11-2:0"
},
{
"targets": [
{
"content": "1:4-1:25"
}
],
"domain": "1:0-1:25"
},
{
"targets": [
{
Expand Down
8 changes: 0 additions & 8 deletions packages/app-web-docs/src/docs/user/languages/fixtures/go.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,14 +836,6 @@
],
"domain": "0:0-0:8"
},
{
"targets": [
{
"content": "0:0-0:16"
}
],
"domain": "0:0-0:16"
},
{
"targets": [
{
Expand Down
208 changes: 187 additions & 21 deletions packages/app-web-docs/src/docs/user/languages/fixtures/java.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,14 +1251,6 @@
],
"domain": "0:18-2:0"
},
{
"targets": [
{
"content": "1:4-1:17"
}
],
"domain": "1:0-1:17"
},
{
"targets": [
{
Expand Down Expand Up @@ -1291,14 +1283,6 @@
],
"domain": "1:16-3:4"
},
{
"targets": [
{
"content": "2:8-2:21"
}
],
"domain": "2:0-2:21"
},
{
"targets": [
{
Expand Down Expand Up @@ -1326,18 +1310,42 @@
{
"targets": [
{
"content": "1:4-1:47"
"content": "1:22-1:44"
}
],
"domain": "1:0-1:47"
},
"domain": "1:15-1:44"
}
]
},
{
"name": "scopes/java/collectionItem.unenclosed.iteration4",
"languageId": "java",
"facet": "collectionItem.unenclosed.iteration",
"code": "sealed class Foo implements Bar, Baz {}",
"scopes": [
{
"targets": [
{
"content": "1:22-1:44"
"content": "0:28-0:36"
}
],
"domain": "1:15-1:44"
"domain": "0:17-0:36"
}
]
},
{
"name": "scopes/java/collectionItem.unenclosed.iteration5",
"languageId": "java",
"facet": "collectionItem.unenclosed.iteration",
"code": "sealed interface Foo permits Bar, Baz {}",
"scopes": [
{
"targets": [
{
"content": "0:29-0:37"
}
],
"domain": "0:21-0:37"
}
]
},
Expand Down Expand Up @@ -1482,6 +1490,76 @@
}
]
},
{
"name": "scopes/java/collectionItem.unenclosed.multiLine4",
"languageId": "java",
"facet": "collectionItem.unenclosed.multiLine",
"code": "sealed class Foo\n implements Bar,\n Baz {}",
"scopes": [
{
"targets": [
{
"content": "1:4-1:18",
"removal": "1:4-1:19"
}
],
"domain": "1:4-1:18"
},
{
"targets": [
{
"content": "1:15-1:18",
"removal": "1:15-2:4"
}
],
"domain": "1:15-1:18"
},
{
"targets": [
{
"content": "2:4-2:7",
"removal": "1:18-2:7"
}
],
"domain": "2:4-2:7"
}
]
},
{
"name": "scopes/java/collectionItem.unenclosed.multiLine5",
"languageId": "java",
"facet": "collectionItem.unenclosed.multiLine",
"code": "sealed interface Foo\n permits Bar,\n Baz {}",
"scopes": [
{
"targets": [
{
"content": "1:4-1:15",
"removal": "1:4-1:16"
}
],
"domain": "1:4-1:15"
},
{
"targets": [
{
"content": "1:12-1:15",
"removal": "1:12-2:4"
}
],
"domain": "1:12-1:15"
},
{
"targets": [
{
"content": "2:4-2:7",
"removal": "1:15-2:7"
}
],
"domain": "2:4-2:7"
}
]
},
{
"name": "scopes/java/collectionItem.unenclosed.singleLine",
"languageId": "java",
Expand Down Expand Up @@ -1623,6 +1701,94 @@
}
]
},
{
"name": "scopes/java/collectionItem.unenclosed.singleLine4",
"languageId": "java",
"facet": "collectionItem.unenclosed.singleLine",
"code": "sealed class Foo implements Bar, Baz {}",
"scopes": [
{
"targets": [
{
"content": "0:0-0:31",
"removal": "0:0-0:33"
}
],
"domain": "0:0-0:31"
},
{
"targets": [
{
"content": "0:28-0:31",
"removal": "0:28-0:33"
}
],
"domain": "0:28-0:31"
},
{
"targets": [
{
"content": "0:33-0:36",
"removal": "0:31-0:36"
}
],
"domain": "0:33-0:36"
},
{
"targets": [
{
"content": "0:33-0:39",
"removal": "0:31-0:39"
}
],
"domain": "0:33-0:39"
}
]
},
{
"name": "scopes/java/collectionItem.unenclosed.singleLine5",
"languageId": "java",
"facet": "collectionItem.unenclosed.singleLine",
"code": "sealed interface Foo permits Bar, Baz {}",
"scopes": [
{
"targets": [
{
"content": "0:0-0:32",
"removal": "0:0-0:34"
}
],
"domain": "0:0-0:32"
},
{
"targets": [
{
"content": "0:29-0:32",
"removal": "0:29-0:34"
}
],
"domain": "0:29-0:32"
},
{
"targets": [
{
"content": "0:34-0:37",
"removal": "0:32-0:37"
}
],
"domain": "0:34-0:37"
},
{
"targets": [
{
"content": "0:34-0:40",
"removal": "0:32-0:40"
}
],
"domain": "0:34-0:40"
}
]
},
{
"name": "scopes/java/comment.block",
"languageId": "java",
Expand Down
8 changes: 0 additions & 8 deletions packages/app-web-docs/src/docs/user/languages/fixtures/lua.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,14 +711,6 @@
"facet": "collectionItem.unenclosed.iteration",
"code": "local a, b, c = 1, 2, 3",
"scopes": [
{
"targets": [
{
"content": "0:0-0:23"
}
],
"domain": "0:0-0:23"
},
{
"targets": [
{
Expand Down
16 changes: 0 additions & 16 deletions packages/app-web-docs/src/docs/user/languages/fixtures/python.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,14 +1377,6 @@
"facet": "collectionItem.unenclosed.iteration",
"code": "def foo():\n global bar, baz",
"scopes": [
{
"targets": [
{
"content": "1:4-1:19"
}
],
"domain": "1:0-1:19"
},
{
"targets": [
{
Expand All @@ -1401,14 +1393,6 @@
"facet": "collectionItem.unenclosed.iteration",
"code": "for key, value in map.items():\n pass",
"scopes": [
{
"targets": [
{
"content": "0:0-0:30"
}
],
"domain": "0:0-0:30"
},
{
"targets": [
{
Expand Down
12 changes: 12 additions & 0 deletions packages/app-web-docs/src/docs/user/languages/java.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,10 @@ Below are visualizations of all our scope tests for this language. These were cr

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.multiLine3" languageId="java" />

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.multiLine4" languageId="java" />

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.multiLine5" languageId="java" />

#### 2. Collection item: Unenclosed single line

<i>An item in a comma-separated single-line list without enclosing delimiters. This could be multi-variable declarations, import statements, etc.</i>
Expand All @@ -395,6 +399,10 @@ Below are visualizations of all our scope tests for this language. These were cr

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.singleLine3" languageId="java" />

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.singleLine4" languageId="java" />

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.singleLine5" languageId="java" />

#### 3. Collection item: Unenclosed (iteration)

<i>Iteration scope for items in a comma-separated list without enclosing delimiters</i>
Expand All @@ -405,6 +413,10 @@ Below are visualizations of all our scope tests for this language. These were cr

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.iteration3" languageId="java" />

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.iteration4" languageId="java" />

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.iteration5" languageId="java" />

### Comment

#### 1. Comment: Block
Expand Down
12 changes: 12 additions & 0 deletions packages/app-web-docs/src/docs/user/scopes/collectionItem.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ Default: `item`

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.multiLine3" />

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.multiLine4" />

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.multiLine5" />

##### JavaScript

<ScopeVisualizer fixtureName="scopes/javascript.core/collectionItem.unenclosed.multiLine" />
Expand Down Expand Up @@ -151,6 +155,10 @@ Default: `item`

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.singleLine3" />

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.singleLine4" />

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.singleLine5" />

##### JavaScript

<ScopeVisualizer fixtureName="scopes/javascript.core/collectionItem.unenclosed.singleLine" />
Expand Down Expand Up @@ -227,6 +235,10 @@ Default: `item`

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.iteration3" />

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.iteration4" />

<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.iteration5" />

##### JavaScript

<ScopeVisualizer fixtureName="scopes/javascript.core/collectionItem.unenclosed.iteration" />
Expand Down
Loading
Loading