Skip to content

Commit c3c32bf

Browse files
committed
fix(vscode): correct handling of comments in keyword calls with return
fixes #404
1 parent b14877c commit c3c32bf

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

syntaxes/robotframework-repl.tmLanguage.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@
403403
"end": "^(?!(\\s*(\\.\\.\\.((( {2}| ?\\t)\\s*\\S.*)|(\\s*))?$))|(\\s*#.*$)|(\\s*$))",
404404
"beginCaptures": { "1": { "name": "keyword.control.flow.robotframework" } },
405405
"patterns": [
406+
{ "include": "#escape" },
406407
{ "include": "#comment" },
407408
{ "include": "#comment_line" },
408409
{ "include": "#variables" },
@@ -437,9 +438,11 @@
437438
},
438439
"end": "^(?!(\\s*(\\.\\.\\.((( {2}| ?\\t)\\s*\\S.*)|(\\s*))?$))|(\\s*#.*$)|(\\s*$))",
439440
"patterns": [
441+
{ "include": "#escape" },
442+
{ "include": "#comment" },
443+
{ "include": "#comment_line" },
440444
{ "include": "#variables" },
441-
{ "include": "#line_continuation" },
442-
{ "include": "#comment" }
445+
{ "include": "#line_continuation" }
443446
]
444447
},
445448
"line_continuation": {

syntaxes/robotframework.tmLanguage.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@
412412
"end": "^(?!(\\s*(\\.\\.\\.((( {2}| ?\\t)\\s*\\S.*)|(\\s*))?$))|(\\s*#.*$)|(\\s*$))",
413413
"beginCaptures": { "1": { "name": "keyword.control.flow.robotframework" } },
414414
"patterns": [
415+
{ "include": "#escape" },
415416
{ "include": "#comment" },
416417
{ "include": "#comment_line" },
417418
{ "include": "#variables" },
@@ -451,10 +452,12 @@
451452
},
452453
"end": "^(?!(\\s*(\\.\\.\\.((( {2}| ?\\t)\\s*\\S.*)|(\\s*))?$))|(\\s*#.*$)|(\\s*$))",
453454
"patterns": [
455+
{ "include": "#escape" },
456+
{ "include": "#comment" },
457+
{ "include": "#comment_line" },
454458
{ "include": "#variables" },
455459
{ "include": "#line_continuation" },
456-
{ "include": "#arg_separator"},
457-
{ "include": "#comment" }
460+
{ "include": "#arg_separator"}
458461
]
459462
},
460463
"variable_assignment_from_kw": {

syntaxes/robotframework.tmLanguage.template.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@
412412
"end": "^(?!(\\s*(\\.\\.\\.((( {2}| ?\\t)\\s*\\S.*)|(\\s*))?$))|(\\s*#.*$)|(\\s*$))",
413413
"beginCaptures": { "1": { "name": "keyword.control.flow.robotframework" } },
414414
"patterns": [
415+
{ "include": "#escape" },
415416
{ "include": "#comment" },
416417
{ "include": "#comment_line" },
417418
{ "include": "#variables" },
@@ -451,10 +452,12 @@
451452
},
452453
"end": "^(?!(\\s*(\\.\\.\\.((( {2}| ?\\t)\\s*\\S.*)|(\\s*))?$))|(\\s*#.*$)|(\\s*$))",
453454
"patterns": [
455+
{ "include": "#escape" },
456+
{ "include": "#comment" },
457+
{ "include": "#comment_line" },
454458
{ "include": "#variables" },
455459
{ "include": "#line_continuation" },
456-
{ "include": "#arg_separator"},
457-
{ "include": "#comment" }
460+
{ "include": "#arg_separator"}
458461
]
459462
},
460463
"variable_assignment_from_kw": {

0 commit comments

Comments
 (0)