Merge pull request #381 from xuhuanzy/completion

update

Author: CppCXY

crates/emmylua_code_analysis/resources/schema.json

@@ -143,6 +143,7 @@
     "strict": {
       "default": {
         "arrayIndex": true,
+        "metaOverrideFileDefine": true,
         "requirePath": false,
         "typeCall": false
       },
@@ -852,6 +853,11 @@
           "default": true,
           "type": "boolean"
         },
+        "metaOverrideFileDefine": {
+          "description": "meta define overrides file define",
+          "default": true,
+          "type": "boolean"
+        },
         "requirePath": {
           "description": "Whether to enable strict mode require path.",
           "default": false,

crates/emmylua_code_analysis/resources/std/builtin.lua

@@ -55,6 +55,8 @@
 --- integrity of data owned by the host program.
 ---@class userdata
 
+---@class lightuserdata
+
 ---
 --- The type *thread* represents independent threads of execution and it is 
 --- used to implement coroutines. Lua threads are not related to 

crates/emmylua_code_analysis/resources/std/debug.lua

@@ -63,6 +63,17 @@ function debug.gethook(thread) end
 ---@field ntransfer       integer
 ---@field activelines     table
 
+---@alias debuglib.InfoWhat
+---|+"n"     # `name` 和 `namewhat`
+---|+"S"     # `source`，`short_src`，`linedefined`，`lalinedefined`，和 `what`
+---|+"l"     # `currentline`
+---|+"t"     # `istailcall`
+---|+"u"     # `nups`、`nparams` 和 `isvararg`
+---|+"f"     # `func`
+---|+"r"     # `ftransfer` 和 `ntransfer`
+---|+"L"     # `activelines`
+---| string
+
 ---
 --- Returns a table with information about a function. You can give the
 --- function directly, or you can give a number as the value of `f`,
@@ -83,10 +94,10 @@ function debug.gethook(thread) end
 --- with a name for the current function, if a reasonable name can be found,
 --- and the expression `debug.getinfo(print)` returns a table with all available
 --- information about the `print` function.
----@overload fun(f: int|function, what?: string):debuglib.DebugInfo
+---@overload fun(f: int|function, what?: debuglib.InfoWhat):debuglib.DebugInfo
 ---@param thread thread
----@param f function
----@param what? string
+---@param f integer|function
+---@param what? debuglib.InfoWhat
 ---@return debuglib.DebugInfo
 ---@nodiscard
 function debug.getinfo(thread, f, what) end
@@ -146,10 +157,10 @@ function debug.getlocal(thread, lvl, index) end
 ---
 --- Returns the metatable of the given `value` or **nil** if it does not have
 --- a metatable.
----@param value table
+---@param object any
 ---@return table?
 ---@nodiscard
-function debug.getmetatable(value) end
+function debug.getmetatable(object) end
 
 ---
 --- Returns the registry table.
@@ -164,7 +175,7 @@ function debug.getregistry() end
 ---
 --- Variable names starting with '(' (open parenthesis) represent variables with
 --- no known names (variables from chunks saved without debug information).
----@param f async fun(...):any...
+---@param f function
 ---@param up integer
 ---@return string name
 ---@return any    value
@@ -176,6 +187,7 @@ function debug.getupvalue(f, up) end
 --- **false** if the userdata does not have that value.
 ---@param u userdata
 ---@param n integer
+---@return any
 ---@return boolean
 function debug.getuservalue(u, n) end
 
@@ -304,9 +316,10 @@ function debug.traceback(thread, message, level) end
 --- access a same external local variable) will return identical ids for those
 --- upvalue indices.
 ---@version >5.2, JIT
----@param f fun():integer
+---@param f function
 ---@param n integer
----@return integer
+---@return lightuserdata id
+---@nodiscard
 function debug.upvalueid(f, n) end
 
 

crates/emmylua_code_analysis/resources/std/global.lua

@@ -150,11 +150,11 @@ function ipairs(t) end
 ---
 --- Lua does not check the consistency of binary chunks. Maliciously crafted
 --- binary chunks can crash the interpreter.
----@param chunk (fun():string) | string
+---@param chunk (fun(...:any):string) | string
 ---@param chunkname? string
 ---@param mode? std.loadmode
 ---@param env? table
----@return fun():any
+---@return fun(...:any):any
 ---@return string?   error_message
 ---@nodiscard
 function load(chunk, chunkname, mode, env) end

crates/emmylua_code_analysis/resources/std/io.lua

@@ -55,7 +55,7 @@ function io.input(file) end
 ---@return fun():any
 function io.lines(filename, ...) end
 
----@alias iolib.OpenMode "r" | "w" | "a" | "r+" | "w+" | "a+" | "rb" | "wb" | "ab" | "rb+" | "wb+" | "ab+"
+---@alias iolib.OpenMode "r" | "w" | "a" | "r+" | "w+" | "a+" | "rb" | "wb" | "ab" | "rb+" | "wb+" | "ab+" | "r+b" | "w+b" | "a+b"
 ---
 --- This function opens a file, in the mode specified in the string `mode`.  In
 --- case of success, it returns a new file handle. The `mode` string can be

crates/emmylua_code_analysis/resources/std/math.lua

@@ -194,8 +194,8 @@ function math.tointeger(x) end
 ---
 --- Returns "`integer`" if `x` is an integer, "`float`" if it is a float, or
 --- **nil** if `x` is not a number.
----@param x number
----@return 'integer'|'float'|nil
+---@param x any
+---@return 'integer'|'float'|'nil'
 function math.type(x) end
 
 ---@version >5.3

crates/emmylua_code_analysis/resources/std/string.lua

@@ -190,11 +190,12 @@ function string.gmatch(s, pattern) end
 --- `local t = {name="lua", version="5.3"}`
 --- `x = string.gsub("$name-$version.tar.gz", "%$(%w+)", t)`
 --- > x="lua-5.3.tar.gz"
----@param s string
----@param pattern string
----@param repl string|fun(param:string)
+---@param s       string|number
+---@param pattern string|number
+---@param repl string|number|table|fun(param:string)
 ---@param n? integer
----@return string, integer
+---@return string
+---@return integer count
 function string.gsub(s, pattern, repl, n) end
 
 ---
@@ -289,7 +290,8 @@ function string.sub(s, i, j) end
 ---@param fmt string
 ---@param s string
 ---@param pos? integer
----@return string
+---@return any ...
+---@return integer offset
 function string.unpack(fmt, s, pos) end
 
 ---

crates/emmylua_code_analysis/resources/std/table.lua

@@ -107,7 +107,7 @@ function table.sort(list, comp) end
 --- return `list[i]`, `list[i+1]`, `···`, `list[j]`
 --- By default, i is 1 and j is #list.
 ---@generic T
----@param list [T...] | table<any, T>
+---@param list [T...] | T[] | table<any, T>
 ---@param i? integer
 ---@param j? integer
 ---@return T...

crates/emmylua_code_analysis/src/compilation/analyzer/flow/mod.rs

@@ -59,7 +59,7 @@ fn analyze_flow(
                 }
             }
         }
-
+        let last_flow_id = var_trace.get_current_flow_id();
         let mut guard_count = 0;
         while var_trace.has_unresolve_traces() {
             resolve_flow_analyze(db, &mut var_trace);
@@ -68,6 +68,9 @@ fn analyze_flow(
                 break;
             }
         }
+        if let Some(last_flow_id) = last_flow_id {
+            var_trace.set_current_flow_id(last_flow_id);
+        }
     }
 
     for (_, var_trace) in var_trace_map {
@@ -79,11 +82,12 @@ fn analyze_flow(
 fn resolve_flow_analyze(db: &mut DbIndex, var_trace: &mut VarTrace) -> Option<()> {
     let all_trace = var_trace.pop_all_unresolve_traces();
     for (trace_id, uresolve_trace_info) in all_trace {
+        var_trace.set_current_flow_id(uresolve_trace_info.0);
         match trace_id {
             UnResolveTraceId::Expr(expr) => {
                 let binary_expr = expr.get_parent::<LuaBinaryExpr>()?;
                 let op = binary_expr.get_op_token()?.get_op();
-                let trace_info = uresolve_trace_info.get_trace_info()?;
+                let trace_info = uresolve_trace_info.1.get_trace_info()?;
                 if op == BinaryOperator::OpAnd || op == BinaryOperator::OpOr {
                     broadcast_up(
                         db,
@@ -99,6 +103,7 @@ fn resolve_flow_analyze(db: &mut DbIndex, var_trace: &mut VarTrace) -> Option<()
             }
             UnResolveTraceId::If(if_stat) => {
                 let asserts = uresolve_trace_info
+                    .1
                     .get_trace_infos()?
                     .into_iter()
                     .map(|trace_info| trace_info.type_assertion.clone())

crates/emmylua_code_analysis/src/compilation/analyzer/flow/var_analyze/broadcast_up.rs

@@ -210,7 +210,7 @@ pub fn broadcast_up_and(
     } else {
         let left_id = UnResolveTraceId::Expr(left);
         if let Some(left_unresolve_trace_info) = var_trace.pop_unresolve_trace(&left_id) {
-            let left_trace_info = left_unresolve_trace_info.get_trace_info()?;
+            let left_trace_info = left_unresolve_trace_info.1.get_trace_info()?;
             let new_assert = left_trace_info
                 .type_assertion
                 .and_assert(trace_info.type_assertion.clone());
@@ -260,7 +260,7 @@ pub fn broadcast_up_or(
     } else {
         let left_id = UnResolveTraceId::Expr(left);
         if let Some(left_unresolve_trace_info) = var_trace.pop_unresolve_trace(&left_id) {
-            let left_trace_info = left_unresolve_trace_info.get_trace_info()?;
+            let left_trace_info = left_unresolve_trace_info.1.get_trace_info()?;
             let new_assert = left_trace_info
                 .type_assertion
                 .or_assert(trace_info.type_assertion.clone());