Skip to content

Commit 5784d8b

Browse files
authored
Update lua grammar (microsoft#183107)
1 parent eb1dd49 commit 5784d8b

File tree

2 files changed

+11
-29
lines changed

2 files changed

+11
-29
lines changed

extensions/lua/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "sumneko/lua.tmbundle",
88
"repositoryUrl": "https://github.com/sumneko/lua.tmbundle",
9-
"commitHash": "d0d89a3734dd36938d8498a3c16bc734291727cb"
9+
"commitHash": "3a18700941737c3ab66ac5964696f141aee61800"
1010
}
1111
},
1212
"licenseDetail": [

extensions/lua/syntaxes/lua.tmLanguage.json

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/sumneko/lua.tmbundle/commit/d0d89a3734dd36938d8498a3c16bc734291727cb",
7+
"version": "https://github.com/sumneko/lua.tmbundle/commit/3a18700941737c3ab66ac5964696f141aee61800",
88
"name": "Lua",
99
"scopeName": "source.lua",
1010
"patterns": [
@@ -184,7 +184,7 @@
184184
},
185185
{
186186
"match": "\\b(and|or|not|\\|\\||\\&\\&|\\!)\\b",
187-
"name": "keyword.operator.logical.lua"
187+
"name": "keyword.operator.lua"
188188
},
189189
{
190190
"match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[))",
@@ -372,7 +372,10 @@
372372
"name": "comment.block.lua",
373373
"patterns": [
374374
{
375-
"include": "#comment_documentation_bracket"
375+
"include": "#emmydoc"
376+
},
377+
{
378+
"include": "#ldoc_tag"
376379
}
377380
]
378381
},
@@ -437,36 +440,15 @@
437440
"name": "comment.block.lua",
438441
"patterns": [
439442
{
440-
"include": "#comment_documentation_asterisk"
443+
"include": "#emmydoc"
444+
},
445+
{
446+
"include": "#ldoc_tag"
441447
}
442448
]
443449
}
444450
]
445451
},
446-
"comment_documentation_asterisk": {
447-
"begin": "(?<=/\\*\\*)([^*]|\\*(?!/))*$",
448-
" ": "^[ \\t]*\\*(?!/)(?=([^*]|[*](?!/))*$)",
449-
"patterns": [
450-
{
451-
"include": "#emmydoc"
452-
},
453-
{
454-
"include": "#ldoc_tag"
455-
}
456-
]
457-
},
458-
"comment_documentation_bracket": {
459-
"begin": "(?<=--\\[\\[)([^-]|\\-(?!\\]\\]))*$",
460-
"while": "^[ \\t]*-*(?!\\]\\])(?=([^-]|[-](?!\\]\\]))*$)",
461-
"patterns": [
462-
{
463-
"include": "#emmydoc"
464-
},
465-
{
466-
"include": "#ldoc_tag"
467-
}
468-
]
469-
},
470452
"emmydoc": {
471453
"patterns": [
472454
{

0 commit comments

Comments
 (0)