Fix generic inference where generics are used within parameters that …

…are functions
Benjamin-Dobell · Nov 12, 2023 · 20e97a0 · 20e97a0
1 parent ff6e079
commit 20e97a0
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/src/main/java/com/tang/intellij/lua/ty/TySubstitutor.kt b/src/main/java/com/tang/intellij/lua/ty/TySubstitutor.kt
@@ -285,6 +285,16 @@ class GenericAnalyzer(
     }
 
     private fun visitSig(arg: IFunSignature, par: IFunSignature) {
+        par.params?.let { parParams ->
+            arg.params?.asSequence()?.zip(parParams.asSequence())?.forEach { (argParam, parParam) ->
+                if (argParam.ty != null) {
+                    warp(argParam.ty) {
+                        accept(Ty.resolve(context, parParam.ty ?: Primitives.UNKNOWN))
+                    }
+                }
+            }
+        }
+
         arg.returnTy?.let {
             warp(it) {
                 par.returnTy?.let {

diff --git a/src/test/resources/inspections/function_generics.lua b/src/test/resources/inspections/function_generics.lua
@@ -808,3 +808,25 @@ numberArray = <error descr="Type mismatch. Required: 'number[]' Found: '(number
 stringOrNumberArray = arrayWithUnionOfGenerics(stringArray, numberArray)
 stringArray = <error descr="Type mismatch. Required: 'string[]' Found: '(number | string)[]'">arrayWithUnionOfGenerics(stringArray, numberArray)</error>
 numberArray = <error descr="Type mismatch. Required: 'number[]' Found: '(number | string)[]'">arrayWithUnionOfGenerics(stringArray, numberArray)</error>
+
+
+---@generic R
+---@param fn fun(resume: (fun(result: R): void)): void
+---@return R
+local function nestedFunctionParameterInference(fn)
+    ---@type R
+    local r
+
+    fn(function(userR)
+        r = userR
+    end)
+
+    return r
+end
+
+nestedFunctionParameterInference(
+    ---@param resume fun(result: number): void
+    function(resume)
+        resume(1)
+    end
+)