Skip to content

Commit 7dcc1ee

Browse files
sheetalkamatsheetalkamat
committed
Remove scopes meta.tag.open.tsx and meta.tag.close.tsx and use meta.tag.tsx instead
1 parent 6222a18 commit 7dcc1ee

File tree

6 files changed

+170
-252
lines changed

6 files changed

+170
-252
lines changed

‎TypeScriptReact.YAML-tmLanguage

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,33 +1369,30 @@ repository:
13691369
- include: '#jsx-children'
13701370

13711371
jsx-tag:
1372+
name: meta.tag.tsx
13721373
begin: >-
13731374
(?x)
13741375
(<)
13751376
([_$a-zA-Z][-$\w.]*(?<!\.|-))
13761377
(?=\s+(?!\?)|/?>)
13771378
beginCaptures:
1378-
'0': { name: meta.tag.open.tsx }
13791379
'1': { name: punctuation.definition.tag.begin.tsx }
13801380
'2': { name: entity.name.tag.tsx }
13811381
end: (/>)|(?:(</)([_$a-zA-Z][-$\w.]*(?<!\.|-))\s*(>))
13821382
endCaptures:
1383-
'0': { name: meta.tag.close.tsx }
13841383
'1': { name: punctuation.definition.tag.end.tsx }
13851384
'2': { name: punctuation.definition.tag.begin.tsx }
13861385
'3': { name: entity.name.tag.tsx }
13871386
'4': { name: punctuation.definition.tag.end.tsx }
13881387
patterns:
1389-
- name: meta.tag.open.tsx
1390-
begin: \G
1388+
- begin: \G
13911389
end: (?=[/]?>)
13921390
patterns:
13931391
- include: '#comment'
13941392
- include: '#jsx-tag-attributes'
13951393
- include: '#jsx-tag-attributes-illegal'
13961394
- begin: (>)
13971395
beginCaptures:
1398-
'0': { name: meta.tag.open.tsx }
13991396
'1': { name: punctuation.definition.tag.end.tsx }
14001397
end: (?=</)
14011398
contentName: meta.jsx.children.tsx

‎TypeScriptReact.tmLanguage

Lines changed: 2 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,11 +2078,6 @@
20782078
(?=\s+(?!\?)|/?&gt;)</string>
20792079
<key>beginCaptures</key>
20802080
<dict>
2081-
<key>0</key>
2082-
<dict>
2083-
<key>name</key>
2084-
<string>meta.tag.open.tsx</string>
2085-
</dict>
20862081
<key>1</key>
20872082
<dict>
20882083
<key>name</key>
@@ -2098,11 +2093,6 @@
20982093
<string>(/&gt;)|(?:(&lt;/)([_$a-zA-Z][-$\w.]*(?&lt;!\.|-))\s*(&gt;))</string>
20992094
<key>endCaptures</key>
21002095
<dict>
2101-
<key>0</key>
2102-
<dict>
2103-
<key>name</key>
2104-
<string>meta.tag.close.tsx</string>
2105-
</dict>
21062096
<key>1</key>
21072097
<dict>
21082098
<key>name</key>
@@ -2124,15 +2114,15 @@
21242114
<string>punctuation.definition.tag.end.tsx</string>
21252115
</dict>
21262116
</dict>
2117+
<key>name</key>
2118+
<string>meta.tag.tsx</string>
21272119
<key>patterns</key>
21282120
<array>
21292121
<dict>
21302122
<key>begin</key>
21312123
<string>\G</string>
21322124
<key>end</key>
21332125
<string>(?=[/]?&gt;)</string>
2134-
<key>name</key>
2135-
<string>meta.tag.open.tsx</string>
21362126
<key>patterns</key>
21372127
<array>
21382128
<dict>
@@ -2154,11 +2144,6 @@
21542144
<string>(&gt;)</string>
21552145
<key>beginCaptures</key>
21562146
<dict>
2157-
<key>0</key>
2158-
<dict>
2159-
<key>name</key>
2160-
<string>meta.tag.open.tsx</string>
2161-
</dict>
21622147
<key>1</key>
21632148
<dict>
21642149
<key>name</key>
@@ -2237,77 +2222,13 @@
22372222
<key>name</key>
22382223
<string>invalid.illegal.attribute.tsx</string>
22392224
</dict>
2240-
<key>jsx-tag-close</key>
2241-
<dict>
2242-
<key>begin</key>
2243-
<string>(&lt;/)([_$a-zA-Z][-$\w.]*(?&lt;!\.|-))</string>
2244-
<key>beginCaptures</key>
2245-
<dict>
2246-
<key>1</key>
2247-
<dict>
2248-
<key>name</key>
2249-
<string>punctuation.definition.tag.begin.tsx</string>
2250-
</dict>
2251-
<key>2</key>
2252-
<dict>
2253-
<key>name</key>
2254-
<string>entity.name.tag.tsx</string>
2255-
</dict>
2256-
</dict>
2257-
<key>end</key>
2258-
<string>(&gt;)</string>
2259-
<key>endCaptures</key>
2260-
<dict>
2261-
<key>1</key>
2262-
<dict>
2263-
<key>name</key>
2264-
<string>punctuation.definition.tag.end.tsx</string>
2265-
</dict>
2266-
</dict>
2267-
<key>name</key>
2268-
<string>meta.tag.close.tsx</string>
2269-
<key>patterns</key>
2270-
<array>
2271-
<dict>
2272-
<key>include</key>
2273-
<string>#comment</string>
2274-
</dict>
2275-
</array>
2276-
</dict>
22772225
<key>jsx-tag-invalid</key>
22782226
<dict>
22792227
<key>match</key>
22802228
<string>&lt;\s*&gt;</string>
22812229
<key>name</key>
22822230
<string>invalid.illegal.tag.incomplete.tsx</string>
22832231
</dict>
2284-
<key>jsx-tag-open</key>
2285-
<dict>
2286-
<key>begin</key>
2287-
<string>(?x)
2288-
(&lt;)
2289-
([_$a-zA-Z][-$\w.]*(?&lt;!\.|-))
2290-
(?=\s+(?!\?)|/?&gt;)</string>
2291-
<key>end</key>
2292-
<string>(/?&gt;)</string>
2293-
<key>name</key>
2294-
<string>meta.tag.open.tsx</string>
2295-
<key>patterns</key>
2296-
<array>
2297-
<dict>
2298-
<key>include</key>
2299-
<string>#comment</string>
2300-
</dict>
2301-
<dict>
2302-
<key>include</key>
2303-
<string>#jsx-tag-attributes</string>
2304-
</dict>
2305-
<dict>
2306-
<key>include</key>
2307-
<string>#jsx-tag-attributes-illegal</string>
2308-
</dict>
2309-
</array>
2310-
</dict>
23112232
<key>jsx-tag-without-attributes</key>
23122233
<dict>
23132234
<key>begin</key>

‎TypeScriptReact.tmTheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163

164164
<!--<dict>
165165
<key>scope</key>
166-
<string>meta.tag.open.tsx string.quoted, meta.tag.open.tsx string.quoted punctuation.definition.string, meta.tag.open.tsx string.quoted constant.character.entity.tsx, meta.tag.open.tsx string.quoted constant.character.entity.tsx punctuation.definition.entity.tsx</string>
166+
<string>meta.tag.tsx string.quoted, meta.tag.tsx string.quoted punctuation.definition.string, meta.tag.tsx string.quoted constant.character.entity.tsx, meta.tag.tsx string.quoted constant.character.entity.tsx punctuation.definition.entity.tsx</string>
167167
<key>settings</key>
168168
<dict>
169169
<key>vsclassificationtype</key>

‎tests/baselines/Issue161.baseline.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ if (isViaPage) {
7575
^
7676
source.tsx meta.block.tsx
7777
^
78-
source.tsx meta.block.tsx meta.tag.open.tsx punctuation.definition.tag.begin.tsx
78+
source.tsx meta.block.tsx meta.tag.tsx punctuation.definition.tag.begin.tsx
7979
^^^^^^^
80-
source.tsx meta.block.tsx meta.tag.open.tsx entity.name.tag.tsx
80+
source.tsx meta.block.tsx meta.tag.tsx entity.name.tag.tsx
8181
^^
82-
source.tsx meta.block.tsx meta.tag.close.tsx punctuation.definition.tag.end.tsx
82+
source.tsx meta.block.tsx meta.tag.tsx punctuation.definition.tag.end.tsx
8383
^^^
8484
source.tsx meta.block.tsx
8585
> page = 'via';

0 commit comments

Comments
 (0)