支持更全面的代码补全；更加全面的符号hover信息；修复一些bug

Author: liwangqian

package.json

@@ -3,7 +3,7 @@
   "displayName": "LuaCoderAssist",
   "description": "lua coder assistant in javascript for vscode",
   "icon": "images/icon.png",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "publisher": "liwangqian",
   "engines": {
     "vscode": "^1.25.0"

server/lib/engine/completion.js

@@ -17,7 +17,7 @@
 
 const { LoadedPackages } = require('./luaenv');
 const { object2Array } = require('./utils');
-const { typeOf, searchInnerStackIndex } = require('./typeof');
+const { typeOf, findDef, searchInnerStackIndex } = require('./typeof');
 const { ScopeEnd } = require('./linear-stack');
 const Is = require('./is');
 
@@ -83,6 +83,9 @@ function completionProvider(context) {
     //TODO: support abc().xx
     const name = context.names[0];
     let value = completionMapCache.get(name);
+    if (!value) {
+        value = findDef(name, context.uri, context.range);
+    }
     if (!Is.luaTable(typeOf(value)) && !Is.luaModule(value)) {
         return [];
     }
@@ -92,7 +95,21 @@ function completionProvider(context) {
     for (let i = 1; i < size; ++i) {
         let name = context.names[i];
         def = def.type.get(name);
-        if (!def || !Is.luaTable(typeOf(def))) {
+        if (!def) {
+            return [];
+        }
+
+        let type = typeOf(def);
+
+        // func().abc
+        if (Is.luaFunction(type)) {
+            def = type.returns[0];
+            type = typeOf(def);
+        }
+
+        if (Is.luaTable(type)) {
+            continue;
+        } else {
             return [];
         }
     }

server/lib/engine/definition.js

@@ -61,7 +61,21 @@ function definitionProvider(context) {
     for (let i = 1; i < (length - 1); i++) {
         const name = names[i];
         def = def.type.search(name, context.range).value;
-        if (!def || !Is.luaTable(typeOf(def))) {
+        if (!def) {
+            return [];
+        }
+
+        let type = typeOf(def);
+
+        // func().abc
+        if (Is.luaFunction(type)) {
+            def = type.returns[0];
+            type = typeOf(def);
+        }
+
+        if (Is.luaTable(type)) {
+            continue;
+        } else {
             return [];
         }
     }

server/lib/engine/extend.js

@@ -56,6 +56,7 @@ function parseNamedTypes(json) {
     for (const name in types) {
         const value = types[name];
         const symbol = parseJsonObject(value, name);
+        symbol.type.typeName = name;
         symbol && namedTypes.set(name, symbol);
     }
 }
@@ -82,6 +83,13 @@ function parseModule(json) {
     }
 }
 
+/**
+ * Parse the json format interface desc data.
+ * @param {*} node JSON object 
+ * @param {String} name Name of the node
+ * 
+ * @returns {LuaSymbol}
+ */
 function parseJsonObject(node, name) {
     if (!node) {
         return undefined;
@@ -164,7 +172,7 @@ function parseArgumentsObject(args) {
 
 function parseReturnsObject(returns) {
     if (!returns) {
-        return [];
+        return undefined;
     }
     return returns.map((rt, index) => {
         return parseJsonObject(rt, rt.name || `R${index}`);
@@ -187,4 +195,3 @@ function parseRefJsonObject(node, name) {
 
 
 loadExtentLib('./stdlibs/5_1.json');
-console.log(namedTypes);

server/lib/engine/typeof.js

@@ -53,7 +53,10 @@ function typeOf(symbol) {
         return type;
     }
 
-    symbol.type = type;
+    if (type !== LuaBasicTypes.any) {
+        symbol.type = type
+    };
+
     return type;
 }
 
@@ -158,8 +161,9 @@ function parseCallExpression(node, type) {
 
     const fname = node.base.name;
     if (fname === 'require') {
-        let moduleName = node.arguments[0].value;
-        let shortPath = moduleName.replace('.', '/');
+        let modulePath = (node.argument || node.arguments[0]).value;
+        let moduleName = modulePath.match(/\w+$/)[0];
+        let shortPath = modulePath.replace('.', '/');
         let mdls = LoadedPackages[moduleName]
         // TODO：增加配置项，用来配置搜索路径，然后模拟lua的搜索方法搜索最优匹配模块
         for (const uri in mdls) {

server/providers/completion-provider.js

@@ -14,6 +14,7 @@ class CompletionProvider {
     provideCompletions(params) {
         let uri = params.textDocument.uri;
         let position = params.position;
+        position.character--;
         let document = this.coder.document(uri);
         let ref = utils.symbolAtPosition(position, document, { backward: true });
         if (ref === undefined) {

server/providers/definition-provider.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { DefinitionContext, definitionProvider } = require('../lib/engine/definition');
-const utils_2 = require('./lib/utils');
+const utils_1 = require('./lib/utils');
 const langserver_1 = require('vscode-languageserver');
 
 class DefinitionProvider {
@@ -13,7 +13,7 @@ class DefinitionProvider {
         let uri = params.textDocument.uri;
         let position = params.position;
         let document = this.coder.document(uri);
-        let ref = utils_2.symbolAtPosition(position, document, { backward: true, forward: true });
+        let ref = utils_1.symbolAtPosition(position, document, { backward: true, forward: true });
         if (ref === undefined) {
             return [];
         }

server/providers/lib/utils.js

@@ -109,31 +109,96 @@ function symbolKindDesc(kind) {
 
 exports.symbolKindDesc = symbolKindDesc;
 
-const backwardRegex = /[a-zA-Z0-9_.:]/; // parse all the bases
-const forwardRegex = /[a-zA-Z0-9_]/;   // parse only the name
-function extendTextRange(content, from, options) {
-    let range = { start: from, end: from };
+function isalpha(c) {
+    return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+}
 
-    let offset = from;
-    if (options.backward) {
-        while (offset-- >= 0) {
-            if (!backwardRegex.test(content.charAt(offset))) {
-                range.start = offset + 1;
+function isdigit(c) {
+    return c >= '0' && c <= '9';
+}
+
+function skip(pattern, content, offset, step) {
+    while (pattern.test(content.charAt(offset))) {
+        offset += step;
+    }
+    return offset;
+}
+
+function backward(content, offset, collection) {
+    let bracketDepth = 0;
+    while (true) {
+        let c = content.charAt(offset);
+        if (c === '.' || c === ':') {
+            if (bracketDepth === 0) {
+                collection.push(c);
+            }
+            offset--;
+            offset = skip(/\s/, content, offset, -1);
+            continue;
+        }
+
+        if (c === ')') {
+            bracketDepth++;
+            offset--;
+            continue;
+        }
+
+        if (c === '(') {
+            bracketDepth--;
+            if (bracketDepth < 0) {
+                break;
+            }
+            offset--;
+            continue;
+        }
+
+        if (isalpha(c) || isdigit(c) || c === '_') {
+            offset--;
+            if (bracketDepth === 0) {
+                collection.push(c);
+            }
+            continue;
+        }
+
+        if (c === ' ' || c === ',') {
+            if (bracketDepth === 0) {
                 break;
             }
+            offset--;
+            continue;
         }
+
+        break;
+    }
+
+    collection.reverse();
+    return offset + 1;
+}
+
+const forwardRegex = /[a-zA-Z0-9_]/;   // parse only the name
+function extendTextRange(content, from, options) {
+    let range = { start: from, end: from, text: '' };
+    let offset = from;
+    let collection = [];
+    if (options.backward) {
+        offset = backward(content, offset, collection);
+        range.start = offset;
     }
 
     if (options.forward) {
         offset = from;
         while (offset++ <= content.length) {
-            if (!forwardRegex.test(content.charAt(offset))) {
+            let c = content.charAt(offset);
+            if (!forwardRegex.test(c)) {
                 range.end = offset;
                 break;
             }
+            collection.push(c);
         }
     }
 
+    range.text = collection.join('');
+
     return range;
 }
 
@@ -168,10 +233,7 @@ function symbolAtPosition(position, doc, options) {
         return undefined;
     }
 
-    // let ref = parseContext(text.substring(range.start, range.end));
-    let ref = { name: text.substring(range.start, range.end), range: [range.start, range.end] };
-    // ref.location = { start: position, end: position };    // used for scope filter
-
+    let ref = { name: range.text, range: [range.start, range.end] };
     return ref;
 }
 
@@ -190,7 +252,11 @@ function symbolSignature(symbol, override) {
         return details.join('');
     }
 
-    let returns = (override !== undefined) ? type.variants[override].returns : type.returns;
+    let returns = type.returns;
+    if (!returns && override !== undefined) {
+        returns = type.variants[override].returns;
+    }
+    returns = returns || [];
     let ret = returns.map(item => {
         let typeName = engine.typeOf(item).typeName;
         typeName = typeName.startsWith('@') ? 'any' : typeName;

server/providers/symbol-provider.js

@@ -31,13 +31,13 @@ class SymbolProvider {
         }
 
         let depth = 0, maxDepth = 5; //防止循环引用导致死循环
-        let walker, forall;
+        let walker, collectAllChildren;
         walker = (def, collection) => {
             if (!(def instanceof LuaSymbol)) {
                 return;
             }
 
-            if (def.uri === null) {
+            if (def.uri !== uri) {
                 return;
             }
 
@@ -53,25 +53,25 @@ class SymbolProvider {
                 def.name, utils_2.symbolSignature(def), mapSymbolKind(def.kind),
                 RangeOf(def.range), RangeOf(def.location),
                 def.children
-                    ? forall(def.children)
+                    ? collectAllChildren(def.children)
                     : (is.luaTable(typeOf(def))
-                        ? forall(utils_1.object2Array(def.type.fields))
+                        ? collectAllChildren(utils_1.object2Array(def.type.fields))
                         : void 0)
             );
 
             collection.push(symbol);
             depth--;
         }
 
-        forall = (children) => {
+        collectAllChildren = (children) => {
             const collection = [];
             children.forEach(child => {
                 walker(child, collection);
             });
             return collection;
         }
 
-        let symbols = forall(mdl.children);
+        let symbols = collectAllChildren(mdl.children);
         return symbols;
     }
 };

stdlibs/5_1.json

@@ -549,6 +549,11 @@
             "type": "table",
             "displayName": "metatable: table"
           }
+        ],
+        "returnTypes": [
+          {
+            "type": "table"
+          }
         ]
       },
       "tonumber": {