From f59e9a4657bda6f4e8533922c8f29f2c93c3ae00 Mon Sep 17 00:00:00 2001 From: Robert Machmer Date: Mon, 18 May 2015 04:20:17 +0200 Subject: [PATCH 01/10] Change 'and', 'or' and 'not' to control instead of operator keyword --- grammars/lua.cson | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/grammars/lua.cson b/grammars/lua.cson index 3d748fa..4ab41a5 100644 --- a/grammars/lua.cson +++ b/grammars/lua.cson @@ -130,7 +130,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)\\b' 'name': 'keyword.control.lua' } { @@ -149,10 +149,6 @@ 'match': '(? Date: Mon, 18 May 2015 16:31:34 +0300 Subject: [PATCH 02/10] Fix highlighting for indented multiline comments Multiline comments of the form --[=[ ]=] (one or more '=' characters) were highlighted only if the start of the comment was not indented. One of the patterns was missing '=*', but it should be fixed now. --- grammars/lua.cson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grammars/lua.cson b/grammars/lua.cson index 3d748fa..5ec71eb 100644 --- a/grammars/lua.cson +++ b/grammars/lua.cson @@ -113,7 +113,7 @@ 'name': 'comment.block.lua' } { - 'begin': '(^[ \\t]+)?(?=--(?!\\[\\[))' + 'begin': '(^[ \\t]+)?(?=--(?!\\[(=*)\\[))' 'beginCaptures': '1': 'name': 'punctuation.whitespace.comment.leading.lua' From 80ac3f58422e50fa0757f5223eaa260e809e09b7 Mon Sep 17 00:00:00 2001 From: Jorge Garrido Date: Sun, 28 Jun 2015 16:27:18 +0200 Subject: [PATCH 03/10] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f51ba4e..12878ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "language-lua", - "version": "0.9.3", + "version": "0.9.4", "private": false, "author": "FireZenk ", "description": "Add syntax highlighting and snippets to Lua files in Atom", From 5892233f0cf921bcfc821f1f81c1552a635c2c6c Mon Sep 17 00:00:00 2001 From: xpol Date: Thu, 25 Feb 2016 09:41:23 +0800 Subject: [PATCH 04/10] Add rockspec to file types. --- grammars/lua.cson | 1 + 1 file changed, 1 insertion(+) diff --git a/grammars/lua.cson b/grammars/lua.cson index cbe2a54..b00a1bc 100644 --- a/grammars/lua.cson +++ b/grammars/lua.cson @@ -2,6 +2,7 @@ 'fileTypes': [ 'lua' 'nse' + 'rockspec' ] 'firstLineMatch': '\\A#!.*?\\blua\\b' 'name': 'Lua' From 313cb20d6685d47b738dc40e683860728eccdc83 Mon Sep 17 00:00:00 2001 From: xpol Date: Thu, 25 Feb 2016 09:54:27 +0800 Subject: [PATCH 05/10] and luacheckrc and lakefile is lua file. --- grammars/lua.cson | 2 ++ 1 file changed, 2 insertions(+) diff --git a/grammars/lua.cson b/grammars/lua.cson index b00a1bc..7765ce8 100644 --- a/grammars/lua.cson +++ b/grammars/lua.cson @@ -3,6 +3,8 @@ 'lua' 'nse' 'rockspec' + 'luacheckrc' + 'lakefile' ] 'firstLineMatch': '\\A#!.*?\\blua\\b' 'name': 'Lua' From ba4f1f13c1230b4b6ea32e36feeb5378ae540fe5 Mon Sep 17 00:00:00 2001 From: Robert Machmer Date: Tue, 17 May 2016 13:25:29 +0200 Subject: [PATCH 06/10] Add goto to the list of control keywords The goto statement was added in Lua 5.2.0-beta-rc1. Closes #21. --- grammars/lua.cson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grammars/lua.cson b/grammars/lua.cson index 7765ce8..2c9209a 100644 --- a/grammars/lua.cson +++ b/grammars/lua.cson @@ -133,7 +133,7 @@ ] } { - 'match': '\\b(and|or|not|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' } { From 383b8809b5c3d7fde0badc0e6b4a3de96bb5b84e Mon Sep 17 00:00:00 2001 From: Robert Machmer Date: Tue, 17 May 2016 13:29:54 +0200 Subject: [PATCH 07/10] Update version to 0.9.5 in package.json Closes #28. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 12878ee..ecbe114 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "language-lua", - "version": "0.9.4", + "version": "0.9.5", "private": false, "author": "FireZenk ", "description": "Add syntax highlighting and snippets to Lua files in Atom", From f1698c975c418ba3fe531faeda02079ae32cf789 Mon Sep 17 00:00:00 2001 From: Jorge Garrido Date: Tue, 14 Jun 2016 12:56:29 +0200 Subject: [PATCH 08/10] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ecbe114..4064ecd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "language-lua", - "version": "0.9.5", + "version": "0.9.6", "private": false, "author": "FireZenk ", "description": "Add syntax highlighting and snippets to Lua files in Atom", From 4300e39f5ecc38ef2cd8c5e33f0672ba589254b4 Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Mon, 27 Jun 2016 00:46:47 +0300 Subject: [PATCH 09/10] Attempt improving indentation This change tries to make - single line repeat-until not indent - 'end' not match in the middle of words like 'tend' Closes https://github.com/FireZenk/language-lua/issues/12 --- settings/language-lua.cson | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/language-lua.cson b/settings/language-lua.cson index ad3acab..5cb7c0a 100644 --- a/settings/language-lua.cson +++ b/settings/language-lua.cson @@ -1,5 +1,5 @@ '.source.lua': 'editor': 'commentStart': '-- ' - 'increaseIndentPattern': '\\b(else|elseif|(local\\s+)?function|then|do|repeat)\\b((?!end).)*$|\\{\\s*$' - 'decreaseIndentPattern': '^\\s*(elseif|else|end|until,?|\\}\\)?).*$' + 'increaseIndentPattern': '((\\b(else|function|then|do|repeat)\\b((?!\\b(end|until)\\b).)*)|(\\{\\s*))$' + 'decreaseIndentPattern': '^\\s*((\\b(elseif|else|end|until)\\b)|(\\})|(\\)))' From d86d05957dcfdb0824bf0e48aebd18d2e118c5d4 Mon Sep 17 00:00:00 2001 From: Jorge Garrido Date: Mon, 4 Jul 2016 22:33:52 +0200 Subject: [PATCH 10/10] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4064ecd..860eab8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "language-lua", - "version": "0.9.6", + "version": "0.9.7", "private": false, "author": "FireZenk ", "description": "Add syntax highlighting and snippets to Lua files in Atom",