Pull functions back out to reduce confusion about how to call

jakebailey · jakebailey · commit e7bd4fd33f6d · 2024-03-28T10:39:08.000-07:00
diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
@@ -286,7 +286,7 @@ function getArgumentOrParameterListInfo(node: Node, position: number, sourceFile
     if (!info) return undefined;
     const { list, argumentIndex } = info;
 
-    const argumentCount = getArgumentIndexOrCount(checker, list, /*node*/ undefined);
+    const argumentCount = getArgumentCount(checker, list);
     if (argumentIndex !== 0) {
         Debug.assertLessThan(argumentIndex, argumentCount);
     }
@@ -307,7 +307,7 @@ function getArgumentOrParameterListAndIndex(node: Node, sourceFile: SourceFile,
         //   - On the target of the call (parent.func)
         //   - On the 'new' keyword in a 'new' expression
         const list = findContainingList(node);
-        return list && { list, argumentIndex: getArgumentIndexOrCount(checker, list, node) };
+        return list && { list, argumentIndex: getArgumentIndex(checker, list, node) };
     }
 }
 
@@ -492,6 +492,14 @@ function getSpreadElementCount(node: SpreadElement, checker: TypeChecker) {
     return 0;
 }
 
+function getArgumentIndex(checker: TypeChecker, argumentsList: Node, node: Node) {
+    return getArgumentIndexOrCount(checker, argumentsList, node);
+}
+
+function getArgumentCount(checker: TypeChecker, argumentsList: Node) {
+    return getArgumentIndexOrCount(checker, argumentsList, /*node*/ undefined);
+}
+
 function getArgumentIndexOrCount(checker: TypeChecker, argumentsList: Node, node: Node | undefined) {
     // The list we got back can include commas. In the presence of errors it may
     // also just have nodes without commas. For example "Foo(a b c)" will have 3
