Skip to content

Commit 2b287d9

Browse files
Improved sorting of collection item iteration scopes (#3362)
1 parent cbf1f45 commit 2b287d9

28 files changed

Lines changed: 818 additions & 214 deletions

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,14 +1233,6 @@
12331233
],
12341234
"domain": "0:11-2:0"
12351235
},
1236-
{
1237-
"targets": [
1238-
{
1239-
"content": "1:4-1:25"
1240-
}
1241-
],
1242-
"domain": "1:0-1:25"
1243-
},
12441236
{
12451237
"targets": [
12461238
{

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -836,14 +836,6 @@
836836
],
837837
"domain": "0:0-0:8"
838838
},
839-
{
840-
"targets": [
841-
{
842-
"content": "0:0-0:16"
843-
}
844-
],
845-
"domain": "0:0-0:16"
846-
},
847839
{
848840
"targets": [
849841
{

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

Lines changed: 187 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,14 +1251,6 @@
12511251
],
12521252
"domain": "0:18-2:0"
12531253
},
1254-
{
1255-
"targets": [
1256-
{
1257-
"content": "1:4-1:17"
1258-
}
1259-
],
1260-
"domain": "1:0-1:17"
1261-
},
12621254
{
12631255
"targets": [
12641256
{
@@ -1291,14 +1283,6 @@
12911283
],
12921284
"domain": "1:16-3:4"
12931285
},
1294-
{
1295-
"targets": [
1296-
{
1297-
"content": "2:8-2:21"
1298-
}
1299-
],
1300-
"domain": "2:0-2:21"
1301-
},
13021286
{
13031287
"targets": [
13041288
{
@@ -1326,18 +1310,42 @@
13261310
{
13271311
"targets": [
13281312
{
1329-
"content": "1:4-1:47"
1313+
"content": "1:22-1:44"
13301314
}
13311315
],
1332-
"domain": "1:0-1:47"
1333-
},
1316+
"domain": "1:15-1:44"
1317+
}
1318+
]
1319+
},
1320+
{
1321+
"name": "scopes/java/collectionItem.unenclosed.iteration4",
1322+
"languageId": "java",
1323+
"facet": "collectionItem.unenclosed.iteration",
1324+
"code": "sealed class Foo implements Bar, Baz {}",
1325+
"scopes": [
13341326
{
13351327
"targets": [
13361328
{
1337-
"content": "1:22-1:44"
1329+
"content": "0:28-0:36"
13381330
}
13391331
],
1340-
"domain": "1:15-1:44"
1332+
"domain": "0:17-0:36"
1333+
}
1334+
]
1335+
},
1336+
{
1337+
"name": "scopes/java/collectionItem.unenclosed.iteration5",
1338+
"languageId": "java",
1339+
"facet": "collectionItem.unenclosed.iteration",
1340+
"code": "sealed interface Foo permits Bar, Baz {}",
1341+
"scopes": [
1342+
{
1343+
"targets": [
1344+
{
1345+
"content": "0:29-0:37"
1346+
}
1347+
],
1348+
"domain": "0:21-0:37"
13411349
}
13421350
]
13431351
},
@@ -1482,6 +1490,76 @@
14821490
}
14831491
]
14841492
},
1493+
{
1494+
"name": "scopes/java/collectionItem.unenclosed.multiLine4",
1495+
"languageId": "java",
1496+
"facet": "collectionItem.unenclosed.multiLine",
1497+
"code": "sealed class Foo\n implements Bar,\n Baz {}",
1498+
"scopes": [
1499+
{
1500+
"targets": [
1501+
{
1502+
"content": "1:4-1:18",
1503+
"removal": "1:4-1:19"
1504+
}
1505+
],
1506+
"domain": "1:4-1:18"
1507+
},
1508+
{
1509+
"targets": [
1510+
{
1511+
"content": "1:15-1:18",
1512+
"removal": "1:15-2:4"
1513+
}
1514+
],
1515+
"domain": "1:15-1:18"
1516+
},
1517+
{
1518+
"targets": [
1519+
{
1520+
"content": "2:4-2:7",
1521+
"removal": "1:18-2:7"
1522+
}
1523+
],
1524+
"domain": "2:4-2:7"
1525+
}
1526+
]
1527+
},
1528+
{
1529+
"name": "scopes/java/collectionItem.unenclosed.multiLine5",
1530+
"languageId": "java",
1531+
"facet": "collectionItem.unenclosed.multiLine",
1532+
"code": "sealed interface Foo\n permits Bar,\n Baz {}",
1533+
"scopes": [
1534+
{
1535+
"targets": [
1536+
{
1537+
"content": "1:4-1:15",
1538+
"removal": "1:4-1:16"
1539+
}
1540+
],
1541+
"domain": "1:4-1:15"
1542+
},
1543+
{
1544+
"targets": [
1545+
{
1546+
"content": "1:12-1:15",
1547+
"removal": "1:12-2:4"
1548+
}
1549+
],
1550+
"domain": "1:12-1:15"
1551+
},
1552+
{
1553+
"targets": [
1554+
{
1555+
"content": "2:4-2:7",
1556+
"removal": "1:15-2:7"
1557+
}
1558+
],
1559+
"domain": "2:4-2:7"
1560+
}
1561+
]
1562+
},
14851563
{
14861564
"name": "scopes/java/collectionItem.unenclosed.singleLine",
14871565
"languageId": "java",
@@ -1623,6 +1701,94 @@
16231701
}
16241702
]
16251703
},
1704+
{
1705+
"name": "scopes/java/collectionItem.unenclosed.singleLine4",
1706+
"languageId": "java",
1707+
"facet": "collectionItem.unenclosed.singleLine",
1708+
"code": "sealed class Foo implements Bar, Baz {}",
1709+
"scopes": [
1710+
{
1711+
"targets": [
1712+
{
1713+
"content": "0:0-0:31",
1714+
"removal": "0:0-0:33"
1715+
}
1716+
],
1717+
"domain": "0:0-0:31"
1718+
},
1719+
{
1720+
"targets": [
1721+
{
1722+
"content": "0:28-0:31",
1723+
"removal": "0:28-0:33"
1724+
}
1725+
],
1726+
"domain": "0:28-0:31"
1727+
},
1728+
{
1729+
"targets": [
1730+
{
1731+
"content": "0:33-0:36",
1732+
"removal": "0:31-0:36"
1733+
}
1734+
],
1735+
"domain": "0:33-0:36"
1736+
},
1737+
{
1738+
"targets": [
1739+
{
1740+
"content": "0:33-0:39",
1741+
"removal": "0:31-0:39"
1742+
}
1743+
],
1744+
"domain": "0:33-0:39"
1745+
}
1746+
]
1747+
},
1748+
{
1749+
"name": "scopes/java/collectionItem.unenclosed.singleLine5",
1750+
"languageId": "java",
1751+
"facet": "collectionItem.unenclosed.singleLine",
1752+
"code": "sealed interface Foo permits Bar, Baz {}",
1753+
"scopes": [
1754+
{
1755+
"targets": [
1756+
{
1757+
"content": "0:0-0:32",
1758+
"removal": "0:0-0:34"
1759+
}
1760+
],
1761+
"domain": "0:0-0:32"
1762+
},
1763+
{
1764+
"targets": [
1765+
{
1766+
"content": "0:29-0:32",
1767+
"removal": "0:29-0:34"
1768+
}
1769+
],
1770+
"domain": "0:29-0:32"
1771+
},
1772+
{
1773+
"targets": [
1774+
{
1775+
"content": "0:34-0:37",
1776+
"removal": "0:32-0:37"
1777+
}
1778+
],
1779+
"domain": "0:34-0:37"
1780+
},
1781+
{
1782+
"targets": [
1783+
{
1784+
"content": "0:34-0:40",
1785+
"removal": "0:32-0:40"
1786+
}
1787+
],
1788+
"domain": "0:34-0:40"
1789+
}
1790+
]
1791+
},
16261792
{
16271793
"name": "scopes/java/comment.block",
16281794
"languageId": "java",

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -711,14 +711,6 @@
711711
"facet": "collectionItem.unenclosed.iteration",
712712
"code": "local a, b, c = 1, 2, 3",
713713
"scopes": [
714-
{
715-
"targets": [
716-
{
717-
"content": "0:0-0:23"
718-
}
719-
],
720-
"domain": "0:0-0:23"
721-
},
722714
{
723715
"targets": [
724716
{

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,14 +1377,6 @@
13771377
"facet": "collectionItem.unenclosed.iteration",
13781378
"code": "def foo():\n global bar, baz",
13791379
"scopes": [
1380-
{
1381-
"targets": [
1382-
{
1383-
"content": "1:4-1:19"
1384-
}
1385-
],
1386-
"domain": "1:0-1:19"
1387-
},
13881380
{
13891381
"targets": [
13901382
{
@@ -1401,14 +1393,6 @@
14011393
"facet": "collectionItem.unenclosed.iteration",
14021394
"code": "for key, value in map.items():\n pass",
14031395
"scopes": [
1404-
{
1405-
"targets": [
1406-
{
1407-
"content": "0:0-0:30"
1408-
}
1409-
],
1410-
"domain": "0:0-0:30"
1411-
},
14121396
{
14131397
"targets": [
14141398
{

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

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

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

388+
<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.multiLine4" languageId="java" />
389+
390+
<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.multiLine5" languageId="java" />
391+
388392
#### 2. Collection item: Unenclosed single line
389393

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

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

402+
<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.singleLine4" languageId="java" />
403+
404+
<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.singleLine5" languageId="java" />
405+
398406
#### 3. Collection item: Unenclosed (iteration)
399407

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

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

416+
<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.iteration4" languageId="java" />
417+
418+
<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.iteration5" languageId="java" />
419+
408420
### Comment
409421

410422
#### 1. Comment: Block

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ Default: `item`
9797

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

100+
<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.multiLine4" />
101+
102+
<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.multiLine5" />
103+
100104
##### JavaScript
101105

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

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

158+
<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.singleLine4" />
159+
160+
<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.singleLine5" />
161+
154162
##### JavaScript
155163

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

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

238+
<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.iteration4" />
239+
240+
<ScopeVisualizer fixtureName="scopes/java/collectionItem.unenclosed.iteration5" />
241+
230242
##### JavaScript
231243

232244
<ScopeVisualizer fixtureName="scopes/javascript.core/collectionItem.unenclosed.iteration" />

0 commit comments

Comments
 (0)