summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsumneko <sumneko@hotmail.com>2019-06-04 10:35:44 +0800
committersumneko <sumneko@hotmail.com>2019-06-04 10:35:44 +0800
commit515f5953d9aa526d40c305f32a97047697ce8dce (patch)
tree6000bd30d1d24af43ae630450919358420c69858
parent6314adcca618c06a6a1c09349aa2b7e17d0690c4 (diff)
downloadlua-language-server-515f5953d9aa526d40c305f32a97047697ce8dce.zip
允许local tag打空格
-rw-r--r--server/src/parser/grammar.lua2
-rw-r--r--syntaxes/lua.tmLanguage.json18
2 files changed, 13 insertions, 7 deletions
diff --git a/server/src/parser/grammar.lua b/server/src/parser/grammar.lua
index 7f8284a0..a876c3ba 100644
--- a/server/src/parser/grammar.lua
+++ b/server/src/parser/grammar.lua
@@ -482,7 +482,7 @@ RepeatBody <- REPEAT
BreakEnd
NeedUntil DirtyExp
-LocalTag <- (Sp '<' MustName LocalTagEnd)*
+LocalTag <- (Sp '<' Sp MustName Sp LocalTagEnd)*
-> LocalTag
LocalTagEnd <- '>' / {} -> MissGT
Local <- (LOCAL LocalTag NameList (ASSIGN ExpList)?)
diff --git a/syntaxes/lua.tmLanguage.json b/syntaxes/lua.tmLanguage.json
index b2ecc8eb..3fcbda67 100644
--- a/syntaxes/lua.tmLanguage.json
+++ b/syntaxes/lua.tmLanguage.json
@@ -225,16 +225,22 @@
"name": "keyword.control.lua"
},
{
- "match": "\\b(local)\\b(?:\\s*)*",
+ "match": "\\b(local)\\b",
"name": "keyword.local.lua"
},
{
- "captures": {
- "1": {
- "name": "string.tag.lua"
+ "begin": "(?<=local)",
+ "end": "(?=[a-zA-Z_=])",
+ "patterns": [
+ {
+ "match": "<\\s*([a-zA-Z_][a-zA-Z0-9_]*)",
+ "captures": {
+ "1": {
+ "name": "string.tag.lua"
+ }
+ }
}
- },
- "match": "<([a-zA-Z_][a-zA-Z0-9_]*)>"
+ ]
},
{
"match": "\\b(function)\\b",