Skip to content

Commit 6198707

Browse files
d-biehld-biehl
committed
fix(tmlang): recognize 2 or spaces between arguments to better work in intellj platform
1 parent f72ffee commit 6198707

4 files changed

Lines changed: 71 additions & 30 deletions

File tree

‎hatch.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ test-reset = "pytest --regtest2-reset {args}"
4141
create-json-schema = "python ./scripts/create_robot_toml_json_schema.py"
4242
generate-rf-options = "python ./scripts/generate_rf_options.py"
4343
install-packages = "python ./scripts/install_packages.py"
44+
generate-tmlanguage = "python ./scripts/generate_tmlanguage.py"
4445

4546
[envs.rfbeta]
4647
python = "3.13"

scripts/generate_tmllanguage.py renamed to scripts/generate_tmlanguage.py

File renamed without changes.

‎syntaxes/robotframework.tmLanguage.json‎

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/RedCMD/TmLanguage-Syntax-Highlighter/main/vscode.tmLanguage.schema.json",
33
"repository": {
4+
"arg_separator": {
5+
"name": "meta.arg.separator.robotframework",
6+
"match": "( {2}| ?\\t)+"
7+
},
48
"variable_setting": {
59
"name": "meta.variable.assign.robotframework",
610
"contentName": "string.unquoted.argument.robotframework",
@@ -20,7 +24,8 @@
2024
{ "include": "#comment" },
2125
{ "include": "#comment_line" },
2226
{ "include": "#line_continuation" },
23-
{ "include": "#variables" }
27+
{ "include": "#variables" },
28+
{ "include": "#arg_separator"}
2429
]
2530
},
2631
"variables_section": {
@@ -146,7 +151,8 @@
146151
{ "include": "#documentation_bold" },
147152
{ "include": "#escape" },
148153
{ "include": "#variables" },
149-
{ "include": "#line_continuation" }
154+
{ "include": "#line_continuation" },
155+
{ "include": "#arg_separator"}
150156
]
151157
},
152158
"documentation_bold": {
@@ -162,7 +168,8 @@
162168
{ "include": "#comment" },
163169
{ "include": "#comment_line" },
164170
{ "include": "#variables" },
165-
{ "include": "#line_continuation" }
171+
{ "include": "#line_continuation" },
172+
{ "include": "#arg_separator"}
166173
]
167174
},
168175
"3": { "name": "punctuation.definition.italic.markdown" }
@@ -181,7 +188,8 @@
181188
{ "include": "#comment" },
182189
{ "include": "#comment_line" },
183190
{ "include": "#variables" },
184-
{ "include": "#line_continuation" }
191+
{ "include": "#line_continuation" },
192+
{ "include": "#arg_separator"}
185193
]
186194
},
187195
"3": { "name": "punctuation.definition.italic.markdown" }
@@ -197,7 +205,8 @@
197205
{ "include": "#comment" },
198206
{ "include": "#comment_line" },
199207
{ "include": "#variables" },
200-
{ "include": "#line_continuation" }
208+
{ "include": "#line_continuation" },
209+
{ "include": "#arg_separator"}
201210
]
202211
},
203212
"testcase_name": {
@@ -216,7 +225,9 @@
216225
{ "include": "#comment" },
217226
{ "include": "#comment_line" },
218227
{ "include": "#variables" },
219-
{ "include": "#line_continuation" }
228+
{ "include": "#line_continuation" },
229+
{ "include": "#arg_separator"}
230+
220231
]
221232
},
222233
"keyword_name": {
@@ -302,7 +313,8 @@
302313
{ "include": "#comment" },
303314
{ "include": "#comment_line" },
304315
{ "include": "#variables" },
305-
{ "include": "#line_continuation" }
316+
{ "include": "#line_continuation" },
317+
{ "include": "#arg_separator"}
306318
]
307319
},
308320
"unknown_setting": {
@@ -315,7 +327,8 @@
315327
{ "include": "#comment" },
316328
{ "include": "#comment_line" },
317329
{ "include": "#variables" },
318-
{ "include": "#line_continuation" }
330+
{ "include": "#line_continuation" },
331+
{ "include": "#arg_separator"}
319332
]
320333
},
321334
"testcase_settings": {
@@ -336,7 +349,8 @@
336349
{ "include": "#comment" },
337350
{ "include": "#comment_line" },
338351
{ "include": "#variables" },
339-
{ "include": "#line_continuation" }
352+
{ "include": "#line_continuation" },
353+
{ "include": "#arg_separator"}
340354
]
341355
},
342356
"other_testcase_settings": {
@@ -349,7 +363,8 @@
349363
{ "include": "#comment" },
350364
{ "include": "#comment_line" },
351365
{ "include": "#variables" },
352-
{ "include": "#line_continuation" }
366+
{ "include": "#line_continuation" },
367+
{ "include": "#arg_separator"}
353368
]
354369
},
355370
"keyword_call": {
@@ -360,15 +375,16 @@
360375
"beginCaptures": {
361376
"1": {
362377
"name": "entity.name.function.keyword-call.robotframework",
363-
"patterns": [ { "include": "#escape" }, { "include": "#variables" } ]
378+
"patterns": [{ "include": "#escape" }, { "include": "#variables" } ]
364379
}
365380
},
366381
"patterns": [
367382
{ "include": "#escape" },
368383
{ "include": "#comment" },
369384
{ "include": "#comment_line" },
370385
{ "include": "#variables" },
371-
{ "include": "#line_continuation" }
386+
{ "include": "#line_continuation" },
387+
{ "include": "#arg_separator"}
372388
]
373389
},
374390
"control_flow_expression_statements": {
@@ -385,7 +401,8 @@
385401
{ "include": "#comment" },
386402
{ "include": "#comment_line" },
387403
{ "include": "#variables" },
388-
{ "include": "#line_continuation" }
404+
{ "include": "#line_continuation" },
405+
{ "include": "#arg_separator"}
389406
]
390407
},
391408
"control_flow_statements": {
@@ -398,7 +415,8 @@
398415
{ "include": "#comment" },
399416
{ "include": "#comment_line" },
400417
{ "include": "#variables" },
401-
{ "include": "#line_continuation" }
418+
{ "include": "#line_continuation" },
419+
{ "include": "#arg_separator"}
402420
]
403421
},
404422
"other_statements": {
@@ -412,7 +430,8 @@
412430
{ "include": "#comment" },
413431
{ "include": "#comment_line" },
414432
{ "include": "#variables" },
415-
{ "include": "#line_continuation" }
433+
{ "include": "#line_continuation" },
434+
{ "include": "#arg_separator"}
416435
]
417436
},
418437
"returning_keyword_call": {
@@ -434,6 +453,7 @@
434453
"patterns": [
435454
{ "include": "#variables" },
436455
{ "include": "#line_continuation" },
456+
{ "include": "#arg_separator"},
437457
{ "include": "#comment" }
438458
]
439459
},
@@ -445,7 +465,7 @@
445465
"patterns": [ { "include": "#variables" } ]
446466
},
447467
"line_continuation": {
448-
"match": "^(\\s*\\.\\.\\.)(?! ?\\S)",
468+
"match": "^\\s*(\\.\\.\\.)(?! ?\\S)",
449469
"captures": { "1": { "name": "keyword.operator.continue.robotframework" } }
450470
},
451471
"impossible": {

‎syntaxes/robotframework.tmLanguage.template.json‎

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/RedCMD/TmLanguage-Syntax-Highlighter/main/vscode.tmLanguage.schema.json",
33
"repository": {
4+
"arg_separator": {
5+
"name": "meta.arg.separator.robotframework",
6+
"match": "( {2}| ?\\t)+"
7+
},
48
"variable_setting": {
59
"name": "meta.variable.assign.robotframework",
610
"contentName": "string.unquoted.argument.robotframework",
@@ -20,7 +24,8 @@
2024
{ "include": "#comment" },
2125
{ "include": "#comment_line" },
2226
{ "include": "#line_continuation" },
23-
{ "include": "#variables" }
27+
{ "include": "#variables" },
28+
{ "include": "#arg_separator"}
2429
]
2530
},
2631
"variables_section": {
@@ -146,7 +151,8 @@
146151
{ "include": "#documentation_bold" },
147152
{ "include": "#escape" },
148153
{ "include": "#variables" },
149-
{ "include": "#line_continuation" }
154+
{ "include": "#line_continuation" },
155+
{ "include": "#arg_separator"}
150156
]
151157
},
152158
"documentation_bold": {
@@ -162,7 +168,8 @@
162168
{ "include": "#comment" },
163169
{ "include": "#comment_line" },
164170
{ "include": "#variables" },
165-
{ "include": "#line_continuation" }
171+
{ "include": "#line_continuation" },
172+
{ "include": "#arg_separator"}
166173
]
167174
},
168175
"3": { "name": "punctuation.definition.italic.markdown" }
@@ -181,7 +188,8 @@
181188
{ "include": "#comment" },
182189
{ "include": "#comment_line" },
183190
{ "include": "#variables" },
184-
{ "include": "#line_continuation" }
191+
{ "include": "#line_continuation" },
192+
{ "include": "#arg_separator"}
185193
]
186194
},
187195
"3": { "name": "punctuation.definition.italic.markdown" }
@@ -197,7 +205,8 @@
197205
{ "include": "#comment" },
198206
{ "include": "#comment_line" },
199207
{ "include": "#variables" },
200-
{ "include": "#line_continuation" }
208+
{ "include": "#line_continuation" },
209+
{ "include": "#arg_separator"}
201210
]
202211
},
203212
"testcase_name": {
@@ -216,7 +225,9 @@
216225
{ "include": "#comment" },
217226
{ "include": "#comment_line" },
218227
{ "include": "#variables" },
219-
{ "include": "#line_continuation" }
228+
{ "include": "#line_continuation" },
229+
{ "include": "#arg_separator"}
230+
220231
]
221232
},
222233
"keyword_name": {
@@ -302,7 +313,8 @@
302313
{ "include": "#comment" },
303314
{ "include": "#comment_line" },
304315
{ "include": "#variables" },
305-
{ "include": "#line_continuation" }
316+
{ "include": "#line_continuation" },
317+
{ "include": "#arg_separator"}
306318
]
307319
},
308320
"unknown_setting": {
@@ -315,7 +327,8 @@
315327
{ "include": "#comment" },
316328
{ "include": "#comment_line" },
317329
{ "include": "#variables" },
318-
{ "include": "#line_continuation" }
330+
{ "include": "#line_continuation" },
331+
{ "include": "#arg_separator"}
319332
]
320333
},
321334
"testcase_settings": {
@@ -336,7 +349,8 @@
336349
{ "include": "#comment" },
337350
{ "include": "#comment_line" },
338351
{ "include": "#variables" },
339-
{ "include": "#line_continuation" }
352+
{ "include": "#line_continuation" },
353+
{ "include": "#arg_separator"}
340354
]
341355
},
342356
"other_testcase_settings": {
@@ -349,7 +363,8 @@
349363
{ "include": "#comment" },
350364
{ "include": "#comment_line" },
351365
{ "include": "#variables" },
352-
{ "include": "#line_continuation" }
366+
{ "include": "#line_continuation" },
367+
{ "include": "#arg_separator"}
353368
]
354369
},
355370
"keyword_call": {
@@ -368,7 +383,8 @@
368383
{ "include": "#comment" },
369384
{ "include": "#comment_line" },
370385
{ "include": "#variables" },
371-
{ "include": "#line_continuation" }
386+
{ "include": "#line_continuation" },
387+
{ "include": "#arg_separator"}
372388
]
373389
},
374390
"control_flow_expression_statements": {
@@ -385,7 +401,8 @@
385401
{ "include": "#comment" },
386402
{ "include": "#comment_line" },
387403
{ "include": "#variables" },
388-
{ "include": "#line_continuation" }
404+
{ "include": "#line_continuation" },
405+
{ "include": "#arg_separator"}
389406
]
390407
},
391408
"control_flow_statements": {
@@ -398,7 +415,8 @@
398415
{ "include": "#comment" },
399416
{ "include": "#comment_line" },
400417
{ "include": "#variables" },
401-
{ "include": "#line_continuation" }
418+
{ "include": "#line_continuation" },
419+
{ "include": "#arg_separator"}
402420
]
403421
},
404422
"other_statements": {
@@ -412,7 +430,8 @@
412430
{ "include": "#comment" },
413431
{ "include": "#comment_line" },
414432
{ "include": "#variables" },
415-
{ "include": "#line_continuation" }
433+
{ "include": "#line_continuation" },
434+
{ "include": "#arg_separator"}
416435
]
417436
},
418437
"returning_keyword_call": {
@@ -434,6 +453,7 @@
434453
"patterns": [
435454
{ "include": "#variables" },
436455
{ "include": "#line_continuation" },
456+
{ "include": "#arg_separator"},
437457
{ "include": "#comment" }
438458
]
439459
},

0 commit comments

Comments
 (0)