Reuh/language-candran
1
0
Fork 0
mirror of https://github.com/Reuh/language-candran.git synced 2025-10-27 20:29:31 +00:00
Code Releases Activity

Merge branch 'master' of https://github.com/FireZenk/language-lua

Browse source
This commit is contained in:
firezenk 2016-08-08 17:42:58 +02:00
commit 5ec3137c6a
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
grammars/lua.cson
View file

@ -2,6 +2,9 @@
'fileTypes': [ 'fileTypes': [
'lua' 'lua'
'nse' 'nse'
'rockspec'
'luacheckrc'
'lakefile'
] ]
'firstLineMatch': '\\A#!.*?\\blua\\b' 'firstLineMatch': '\\A#!.*?\\blua\\b'
'name': 'Lua' 'name': 'Lua'
@ -113,7 +116,7 @@
'name': 'comment.block.lua' 'name': 'comment.block.lua'
} }
{ {
'begin': '(^[ \\t]+)?(?=--(?!\\[\\[))' 'begin': '(^[ \\t]+)?(?=--(?!\\[(=*)\\[))'
'beginCaptures': 'beginCaptures':
'1': '1':
'name': 'punctuation.whitespace.comment.leading.lua' 'name': 'punctuation.whitespace.comment.leading.lua'
@ -130,7 +133,7 @@
] ]
} }
{ {
'match': '\\b(break|do|else|for|if|elseif|return|then|repeat|while|until|end|function|local|in)\\b' 'match': '\\b(and|or|not|break|do|else|for|if|elseif|return|then|repeat|while|until|end|function|local|in|goto)\\b'
'name': 'keyword.control.lua' 'name': 'keyword.control.lua'
} }
{ {
@ -149,10 +152,6 @@
'match': '(?<![^.]\\.|:)\\b(coroutine\\.(create|resume|running|status|wrap|yield)|string\\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|rep|reverse|sub|upper)|table\\.(concat|insert|maxn|remove|sort)|math\\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?)|io\\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\\.(cpath|loaded|loadlib|path|preload|seeall)|debug\\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|traceback))\\b(?=\\s*(?:[({"\']|\\[\\[))' 'match': '(?<![^.]\\.|:)\\b(coroutine\\.(create|resume|running|status|wrap|yield)|string\\.(byte|char|dump|find|format|gmatch|gsub|len|lower|match|rep|reverse|sub|upper)|table\\.(concat|insert|maxn|remove|sort)|math\\.(abs|acos|asin|atan2?|ceil|cosh?|deg|exp|floor|fmod|frexp|ldexp|log|log10|max|min|modf|pow|rad|random|randomseed|sinh?|sqrt|tanh?)|io\\.(close|flush|input|lines|open|output|popen|read|tmpfile|type|write)|os\\.(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)|package\\.(cpath|loaded|loadlib|path|preload|seeall)|debug\\.(debug|[gs]etfenv|[gs]ethook|getinfo|[gs]etlocal|[gs]etmetatable|getregistry|[gs]etupvalue|traceback))\\b(?=\\s*(?:[({"\']|\\[\\[))'
'name': 'support.function.library.lua' 'name': 'support.function.library.lua'
} }
{
'match': '\\b(and|or|not)\\b'
'name': 'keyword.operator.lua'
}
{ {
'match': '\\b([A-Za-z_]\\w*)\\b(?=\\s*(?:[({"\']|\\[\\[))' 'match': '\\b([A-Za-z_]\\w*)\\b(?=\\s*(?:[({"\']|\\[\\[))'
'name': 'support.function.any-method.lua' 'name': 'support.function.any-method.lua'

4
settings/language-lua.cson
View file

@ -1,5 +1,5 @@
'.source.lua': '.source.lua':
'editor': 'editor':
'commentStart': '-- ' 'commentStart': '-- '
'increaseIndentPattern': '\\b(else|elseif|(local\\s+)?function|then|do|repeat)\\b((?!end).)*$|\\{\\s*$' 'increaseIndentPattern': '((\\b(else|function|then|do|repeat)\\b((?!\\b(end|until)\\b).)*)|(\\{\\s*))$'
'decreaseIndentPattern': '^\\s*(elseif|else|end|until,?|\\}\\)?).*$' 'decreaseIndentPattern': '^\\s*((\\b(elseif|else|end|until)\\b)|(\\})|(\\)))'