Code cleanup.

3 files changed, 11 insertions, 38 deletions

diff --git a/modules/cpp/snippets.lua b/modules/cpp/snippets.lua
index 1b91157d..a482c55e 100644
--- a/modules/cpp/snippets.lua
+++ b/modules/cpp/snippets.lua
@@ -14,7 +14,6 @@ if type(snippets) == 'table' then
 
     -- Lua snippets
     lf = 'static int %1(function)(lua_State *%2(lua)) {\n\t%0\n\treturn 0;\n}',
-    lff = 'LF %1(function)(lua_State *%2(lua)) {\n\t%0\n\treturn 0;\n}',
     ls = 'lua_State',
     lgf = 'lua_getfield(%1(lua), %2(-1), %3(field));',
     lgg = 'lua_getglobal(%1(lua), %2(global));',
diff --git a/modules/lua/snippets.lua b/modules/lua/snippets.lua
index 93f36078..068903d8 100644
--- a/modules/lua/snippets.lua
+++ b/modules/lua/snippets.lua
@@ -8,40 +8,12 @@ local snippets = _G.snippets
 
 if type(snippets) == 'table' then
   snippets.lua = {
-    l    = "local %1(expr)%2( = %3(value))",
-    p    = "print(%0)",
-    f    = "function %1(name)(%2(args))\n\t%0\nend",
-    fori = "for %1(i), %2(val) in ipairs(%3(table)) do\n\t%0\nend",
+    l = "local %1(expr)%2( = %3(value))",
+    p = "print(%0)",
+    f = "function %1(name)(%2(args))\n\t%0\nend",
     ['for'] = "for i=%1(1), %2(10)%3(, -1) do\n\t%0\nend",
+    fori = "for %1(i), %2(val) in ipairs(%3(table)) do\n\t%0\nend",
     forp = "for %1(k), %2(v) in pairs(%3(table)) do\n\t%0\nend",
-    find = "string.find(%1(str), %2(pattern))",
-    len  = "string.len(%1(str))",
-    gsub = "string.gsub(%1(str), %2(pattern), %3(repl))",
-    gfind = "for %1(match) in string.gfind(%2(str), %3(pattern)) do\n\t%0\nend",
-    c    = "-- ",
-
-    tc  = "local %1(tc) = lunit.TestCase('%2(description)')",
-    ae  = "lunit.assert_equal(%1(expected), %2(actual))",
-    ane = "lunit.assert_not_equal(%1(unexpected), %2(actual))",
-    at  = "lunit.assert_true(%1(actual))",
-    af  = "lunit.assert_false(%1(actual))",
-    run = "lunit.run()",
-    abool  = "lunit.assert_boolean(%1(expr))",
-    anbool = "lunit.assert_not_boolean(%1(expr))",
-    ['anil'] = "lunit.assert_nil(%1(expr))",
-    annil  = "lunit.assert_not_nil(%1(expr))",
-    anum   = "lunit.assert_number(%1(expr))",
-    annum  = "lunit.assert_not_number(%1(expr))",
-    astr   = "lunit.assert_string(%1(expr))",
-    anstr  = "lunit.assert_not_string(%1(expr))",
-    atab   = "lunit.assert_table(%1(expr))",
-    antab  = "lunit.assert_not_table(%1(expr))",
-    athr   = "lunit.assert_thread(%1(expr))",
-    anthr  = "lunit.assert_not_thread(%1(expr))",
-    afunc  = "lunit.assert_function(%1(expr))",
-    anfunc = "lunit.assert_not_function(%1(expr))",
-    aud    = "lunit.assert_userdata(%1(expr))",
-    anud   = "lunit.assert_not_userdata(%1(expr))"
   }
 end
 
diff --git a/modules/textadept/snippets.lua b/modules/textadept/snippets.lua
index 6ea39563..4d426532 100755
--- a/modules/textadept/snippets.lua
+++ b/modules/textadept/snippets.lua
@@ -270,11 +270,13 @@ local function next_tab_stop()
     -- Place additional carets at mirrors.
     local _, _, text = snippet_info()
     text = text:gsub('(%%%d+%b())',
-      function(mirror)
-        -- Lua code in replacement mirrors may contain '%' sequences; do not
-        -- treat as mirrors
-        if mirror:find('|') then return string.rep('_', #mirror) end
-      end)
+                     function(mirror)
+                       -- Lua code in replacement mirrors may contain '%'
+                       -- sequences; do not treat as mirrors
+                       if mirror:find('|') then
+                         return string.rep('_', #mirror)
+                       end
+                     end)
     for s, e in text:gmatch('()%%'..index..'()[^(]') do
       buffer:add_selection(s_start + s - 1, s_start + e - 1)
     end