fix #29：解析require函数调用的返回值；用于支持setmetatable

package.json

@@ -3,7 +3,7 @@
   "displayName": "LuaCoderAssist",
   "description": "lua coder assistant in javascript for vscode",
   "icon": "images/icon.png",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "publisher": "liwangqian",
   "engines": {
     "vscode": "^1.25.0"
@@ -252,4 +252,4 @@
     "type": "git",
     "url": "https://github.com/liwangqian/LuaCoderAssist"
   }
-}
+}

server/lib/engine/completion.js

@@ -98,16 +98,21 @@ function completionProvider(context) {
     }
 
     const filter = item => context.functionOnly && !Is.luaFunction(item.type);
-    const children = Object.create(null);
-    def.type.walk(fields => {
-        for (const name in fields) {
-            const symbol = fields[name];
-            if (!children[name]) {
-                children[name] = symbol;
+    let children
+    if (Is.luaModule(def.type)) {
+        children = def.type.fields;
+    } else {
+        children = Object.create(null);
+        def.type.walk(fields => {
+            for (const name in fields) {
+                const symbol = fields[name];
+                if (!children[name]) {
+                    children[name] = symbol;
+                }
             }
-        }
+        });
+    }
 
-    });
     return object2Array(def.type.return || children, filter);
 }
 

server/lib/engine/core.js

@@ -168,7 +168,9 @@ function analysis(code, uri) {
                         parent.type = symbol.type;  // local xzy; xzy = 1
                     }
                 } else {
+                    (currentFunc || theModule).addChild(symbol);
                     if (moduleType.moduleMode) {
+                        currentScope.push(symbol);
                         moduleType.set(name, symbol);
                     } else {
                         _G.set(name, symbol);

server/lib/engine/definition.js

@@ -60,7 +60,7 @@ function definitionProvider(context) {
 
     for (let i = 1; i < (length - 1); i++) {
         const name = names[i];
-        def = def.type.search(name).value;
+        def = def.type.search(name, context.range).value;
         if (!def || !Is.luaTable(typeOf(def))) {
             return [];
         }

server/lib/engine/typeof.js

@@ -54,7 +54,7 @@ function typeOf(symbol) {
     }
 
     symbol.type = type;
-    return symbol.type;
+    return type;
 }
 
 function deduceType(type) {
@@ -111,13 +111,29 @@ function parseCallExpression(node, type) {
         return null;
     }
 
+    const fname = node.base.name;
+    if (fname === 'require') {
+        let moduleName = node.arguments[0].value;
+        let shortPath = moduleName.replace('.', '/');
+        let mdls = LoadedPackages[moduleName]
+        // TODO：增加配置项，用来配置搜索路径，然后模拟lua的搜索方法搜索最优匹配模块
+        for (const uri in mdls) {
+            if (uri.includes(shortPath)) { // 查找最优匹配，如果存在多个最优匹配，则返回第一个
+                const ret = mdls[uri].type.return;
+                return ret && ret.type;
+            }
+        }
+
+        return null;
+    }
+
     let R = ftype.returns[type.index || 0];
     if (!Is.lazyValue(R.type)) {
         return R.type;
     }
 
     // 推导调用参数类型，用来支持推导返回值类型
-    const func_argt = type.node.arguments.map((arg, index) => {
+    const func_argt = node.arguments.map((arg, index) => {
         return { name: ftype.args[index].name, type: parseAstNode(arg, type) };
     });
 
@@ -161,7 +177,7 @@ function parseMemberExpression(node, type) {
             return null;
         }
         const name = names[i];
-        def = t.search(name).value;
+        def = t.search(name, node.base.range).value;
     }
 
     return typeOf(def);

stdlibs/lua_5_1.lua

@@ -41,7 +41,7 @@ function _new.iterator()
 end
 
 function _as.table()
-    return _table
+    return {}
 end
 
 function _as.number()
@@ -564,6 +564,10 @@ function rawset(table, index, value)
     return _as.table(table)
 end
 
+function require(fileName)
+    return _as.table()
+end
+
 function select(index, ...)
     return _as.any('value') or _as.number('for index is #')
 end