Skip to content

Commit f95723c

Browse files
committed
Tests: removed checks for ~J.
Revert "Tests: fix: .star.sql scope changed to .wildcard.asterisk.sql"
1 parent d66eecf commit f95723c

File tree

3 files changed

+17
-79
lines changed

3 files changed

+17
-79
lines changed

tests/syntax_test_misc.ex

+12-12
Original file line numberDiff line numberDiff line change
@@ -595,9 +595,9 @@ end[]
595595
# ^^ constant.other.capture
596596

597597
&<%= num %>
598-
# ^ keyword.operator.comparison
598+
# ^ entity.name.tag.ex.eex
599599
# ^^^ variable.other
600-
# ^ keyword.operator.comparison
600+
# ^^ entity.name.tag.ex.eex
601601
#^ keyword.operator.capture
602602

603603
& 0.1
@@ -1257,7 +1257,7 @@ def f(<< { >>) }
12571257
def f(<< %{ >>) }
12581258
# ^ invalid.illegal.stray-closing-brace
12591259
def f(<< << >>) >>
1260-
# ^^ invalid.illegal.stray-closing-binary
1260+
^^ invalid.illegal.stray-closing-binary
12611261

12621262
def f(( ( )) )
12631263
# ^ punctuation.definition.parameters.end
@@ -1268,7 +1268,7 @@ def f(( { )) }
12681268
def f(( %{ )) }
12691269
# ^ invalid.illegal.stray-closing-brace
12701270
def f(( << )) >>
1271-
# ^^ invalid.illegal.stray-closing-binary
1271+
^^ invalid.illegal.stray-closing-binary
12721272

12731273
def f([ ( ]) )
12741274
# ^ invalid.illegal.stray-closing-parenthesis
@@ -1279,7 +1279,7 @@ def f([ { ]) }
12791279
def f([ %{ ]) }
12801280
# ^ invalid.illegal.stray-closing-brace
12811281
def f([ << ]) >>
1282-
# ^^ invalid.illegal.stray-closing-binary
1282+
^^ invalid.illegal.stray-closing-binary
12831283

12841284
def f({ ( }) )
12851285
# ^ invalid.illegal.stray-closing-parenthesis
@@ -1290,7 +1290,7 @@ def f({ { }) }
12901290
def f({ %{ }) }
12911291
# ^ invalid.illegal.stray-closing-brace
12921292
def f({ << }) >>
1293-
# ^^ invalid.illegal.stray-closing-binary
1293+
^^ invalid.illegal.stray-closing-binary
12941294

12951295
def f(%{ ( }) )
12961296
# ^ invalid.illegal.stray-closing-parenthesis
@@ -1301,20 +1301,20 @@ def f(%{ { }) }
13011301
def f(%{ %{ }) }
13021302
# ^ invalid.illegal.stray-closing-brace
13031303
def f(%{ << }) >>
1304-
# ^^ invalid.illegal.stray-closing-binary
1304+
^^ invalid.illegal.stray-closing-binary
13051305

13061306
<%= ( %> <% ) %>
1307-
# ^ invalid.illegal.stray-closing-parenthesis
13081307
# ^ punctuation.section.group.begin
1308+
^ invalid.illegal.stray-closing-parenthesis
13091309
<%= [ %> <% ] %>
1310-
# ^ invalid.illegal.stray-closing-bracket
13111310
# ^ punctuation.section.brackets.begin
1311+
^ invalid.illegal.stray-closing-bracket
13121312
<%= { %> <% } %>
1313-
# ^ invalid.illegal.stray-closing-brace
13141313
# ^ punctuation.section.sequence.begin
1314+
^ invalid.illegal.stray-closing-brace
13151315
<%= %{ %> <% } %>
1316-
# ^ invalid.illegal.stray-closing-brace
13171316
# ^ punctuation.section.mapping.begin
1317+
^ invalid.illegal.stray-closing-brace
13181318
<%= << %> <% >> %>
1319-
# ^^ invalid.illegal.stray-closing-binary
13201319
# ^^ punctuation.definition.string.begin
1320+
^^ invalid.illegal.stray-closing-binary

tests/syntax_test_sql_fragments.ex

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fragment("\
5353
# ^^ source.ex.sql punctuation.separator.continuation
5454
SELECT *\
5555
# ^^ source.ex.sql punctuation.separator.continuation
56-
# ^ variable.language.wildcard.asterisk.sql
56+
# ^ variable.language.star.sql
5757
# ^^^^^^ keyword.other.DML.sql
5858
-- Interpolations are not accepted by fragment(), but we match them anyway:
5959
FROM #{:posts}
@@ -109,7 +109,7 @@ fragment(
109109
# ^^^^^^^^^ meta.string.elixir meta.interpolation.elixir
110110
# ^^ keyword.operator.psql
111111
# ^^^^^^^^^^^^^^^^^^^^^^^^ support.function.psql
112-
# ^ variable.language.wildcard.asterisk.sql
112+
# ^ variable.language.star.sql
113113
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.elixir source.ex.sql
114114
# ^ punctuation.section.arguments.begin
115115
# ^^^^^^^ keyword.other.unquote
@@ -129,7 +129,7 @@ fragment(
129129
sql("SELECT * FROM posts")
130130
# ^^^^^ source.ex.sql
131131
# ^^^^ keyword.other.DML.sql
132-
# ^ variable.language.wildcard.asterisk.sql
132+
# ^ variable.language.star.sql
133133
# ^^^^^^ keyword.other.DML.sql
134134
# ^^^^^^^^^^^^^^^^^^^^^ meta.string.elixir
135135
#^^^ variable.function

tests/syntax_test_strings.ex

+2-64
Original file line numberDiff line numberDiff line change
@@ -191,22 +191,8 @@ heredoc text
191191
# ^ storage.type.string
192192
#^^^ punctuation.definition.string.end
193193
#^^^^ meta.string.elixir
194-
~L"<div>\"</div>"m
195-
# ^ punctuation.definition.string.end
196-
# ^^ -constant.character.escape.char.elixir
197-
# ^^^ entity.name.tag.block.any.html
198-
~L'<div>\'</div>'m
199-
# ^ punctuation.definition.string.end
200-
# ^^ -constant.character.escape.char.elixir
201-
# ^^^ entity.name.tag.block.any.html
202-
203-
~L/\//m ~L|\||m ~L{\}}m ~L[\]]m ~L<\>>m ~L(\))m
204-
# ^ string.quoted.modifiers
205-
# ^ string.quoted.modifiers
206-
# ^ string.quoted.modifiers
207-
# ^ string.quoted.modifiers
208-
# ^ string.quoted.modifiers
209-
# ^ string.quoted.modifiers
194+
195+
~L/\//m ~L|\||m ~L{\}}m ~L[\]]m ~L<\>>m ~L(\))m
210196

211197
~L'''
212198
\
@@ -275,14 +261,6 @@ key: "#{value}\"""
275261
#// ^^^^^^ meta.interpolation.elixir
276262
}
277263
"""
278-
~J"""
279-
{
280-
"key": "#{value}",
281-
#// ^^^^^^^^ string.quoted.double.json
282-
"#{key}": "value"
283-
#// ^^^^^^^^ string.quoted.double.json
284-
}
285-
"""
286264

287265
~j"1234"m
288266
# ^ storage.type.string
@@ -299,46 +277,6 @@ key: "#{value}\"""
299277
# ^ punctuation.definition.string.end
300278
# ^ punctuation.definition.string.end
301279

302-
~J"1234"
303-
# ^ punctuation.definition.string.end.elixir
304-
# ^^^^ constant.numeric
305-
# ^ punctuation.definition.string.begin.elixir
306-
# ^^^^^^ meta.string.elixir
307-
308-
# TODO: how to handle JSON double quotes when escaped by Elixir rules?
309-
~J"\"1234\""
310-
311-
~J'"\u0000"'
312-
313-
~J'"\'"'
314-
315-
~J'"\""'
316-
317-
~J"""
318-
{
319-
"k\u0065y\"": "J"
320-
}
321-
\"""
322-
#^^ -constant.character.escape.char.elixir
323-
"""a
324-
# ^ storage.type.string
325-
#^^^ punctuation.definition.string.end
326-
327-
~J'''
328-
\'''
329-
#^^ -constant.character.escape.char
330-
'''m
331-
# ^ storage.type.string
332-
#^^^ punctuation.definition.string.end
333-
334-
~J/\//m ~J|\||m ~J{\}}m ~J[\]]m ~J<\>>m ~J(\))m
335-
# ^ punctuation.definition.string.end
336-
# ^ punctuation.definition.string.end
337-
# ^ punctuation.definition.string.end
338-
# ^ punctuation.definition.string.end
339-
# ^ punctuation.definition.string.end
340-
# ^ punctuation.definition.string.end
341-
342280

343281
## Regular expression strings
344282

0 commit comments

Comments
 (0)