From 855b1a262f3a769d44765e78f94e566d875b9286 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Tue, 29 Jul 2025 07:35:58 -0700
Subject: [Language Server]: Show signature help on generic parameters. (#7913)

* Show signature help on generic parameters.

* Fix.

* Update tests.

* slang-test: make vvl error go through stderr.

* update slang-rhi

* Update slang-rhi
---
 source/slang/slang-language-server-ast-lookup.cpp | 39 ++++++++++++++---------
 1 file changed, 24 insertions(+), 15 deletions(-)

(limited to 'source/slang/slang-language-server-ast-lookup.cpp')

diff --git a/source/slang/slang-language-server-ast-lookup.cpp b/source/slang/slang-language-server-ast-lookup.cpp
index 1f01baadc..aa3040f08 100644
--- a/source/slang/slang-language-server-ast-lookup.cpp
+++ b/source/slang/slang-language-server-ast-lookup.cpp
@@ -166,6 +166,26 @@ public:
         return dispatchIfNotNull(expr->right);
     }
 
+    bool visitAppExprCommon(AppExprBase* expr)
+    {
+        if (context->findType == ASTLookupType::Invoke && expr->argumentDelimeterLocs.getCount())
+        {
+            String fileName;
+            Loc start = context->getLoc(expr->argumentDelimeterLocs.getFirst(), &fileName);
+            Loc end = context->getLoc(expr->argumentDelimeterLocs.getLast(), nullptr);
+            if (fileName.getUnownedSlice().endsWithCaseInsensitive(context->sourceFileName) &&
+                start < context->cursorLoc && context->cursorLoc <= end)
+            {
+                ASTLookupResult result;
+                result.path = context->nodePath;
+                result.path.add(expr);
+                context->results.add(result);
+                return true;
+            }
+        }
+        return false;
+    }
+
     bool visitGenericAppExpr(GenericAppExpr* genericAppExpr)
     {
         PushNode pushNodeRAII(context, genericAppExpr);
@@ -174,6 +194,8 @@ public:
         for (auto arg : genericAppExpr->arguments)
             if (dispatchIfNotNull(arg))
                 return true;
+        if (visitAppExprCommon(genericAppExpr))
+            return true;
         return false;
     }
 
@@ -189,21 +211,8 @@ public:
         for (auto arg : expr->arguments)
             if (dispatchIfNotNull(arg))
                 return true;
-        if (context->findType == ASTLookupType::Invoke && expr->argumentDelimeterLocs.getCount())
-        {
-            String fileName;
-            Loc start = context->getLoc(expr->argumentDelimeterLocs.getFirst(), &fileName);
-            Loc end = context->getLoc(expr->argumentDelimeterLocs.getLast(), nullptr);
-            if (fileName.getUnownedSlice().endsWithCaseInsensitive(context->sourceFileName) &&
-                start < context->cursorLoc && context->cursorLoc <= end)
-            {
-                ASTLookupResult result;
-                result.path = context->nodePath;
-                result.path.add(expr);
-                context->results.add(result);
-                return true;
-            }
-        }
+        if (visitAppExprCommon(expr))
+            return true;
         return false;
     }
 
-- 
cgit v1.2.3