diff options
| -rw-r--r-- | modules/lua/init.lua | 3 | ||||
| -rw-r--r-- | scripts/adeptsensedoc.lua | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/modules/lua/init.lua b/modules/lua/init.lua index 1e88e8c6..cf43934e 100644 --- a/modules/lua/init.lua +++ b/modules/lua/init.lua @@ -53,7 +53,8 @@ sense.syntax.type_assignments = { ['^[\'"]'] = 'string', -- foo = 'bar' or foo = "bar" ['^([%w_%.]+)%s*$'] = '%1', -- foo = _m.textadept.adeptsense ['^(_m%.textadept%.adeptsense)%.new'] = '%1', - ['require%s*%(?%s*(["\'])([%w_%.]+)%1%)?'] = '%2' + ['require%s*%(?%s*(["\'])([%w_%.]+)%1%)?'] = '%2', + ['^io%.p?open%s*%b()%s*$'] = 'file' } sense.api_files = { _HOME..'/modules/lua/api' } sense:add_trigger('.') diff --git a/scripts/adeptsensedoc.lua b/scripts/adeptsensedoc.lua index 0ba564ab..c765b9af 100644 --- a/scripts/adeptsensedoc.lua +++ b/scripts/adeptsensedoc.lua @@ -95,10 +95,12 @@ function start(doc) if lua_luadoc then for _, f in ipairs(lua_luadoc.functions) do f = lua_luadoc.functions[f] - local module = f.name:match('^([^%.]+)%.') or '_G' + local module = f.name:match('^([^%.:]+)[%.:]') or '_G' if not modules[module] then modules[#modules + 1] = module modules[module] = { name = module, functions = {} } + -- For functions like file:read(), 'file' is not a module; fake it. + if f.name:find(':') then modules[module].fake = true end end local module = modules[module] module.description = 'Lua '..module.name..' module.' |