Merge pull request #199 from tmr232/reorder-args

Reorder arguments for `extractFunctionName`

Author: tmr232

src/control-flow/cfg-cpp.ts

@@ -233,7 +233,9 @@ function extractCppFunctionName(func: SyntaxNode): string | undefined {
   return undefined;
 }
 
-// Find the binding variable of a lambda function
+/**
+ * Find the binding variable of a lambda function
+ */
 function findVariableBinding(func: SyntaxNode): string | undefined {
   const parent = func.parent;
   if (!parent) return undefined;

src/control-flow/cfg-go.ts

@@ -445,7 +445,9 @@ const functionQuery = {
   captureName: "name",
 };
 
-// Find the variable or field name bound to a function literal
+/**
+ * Find the variable or field name bound to a function literal
+ */
 function findVariableBinding(func: SyntaxNode): string | undefined {
   const parent = func.parent;
   if (!parent) return undefined;

src/control-flow/cfg-typescript.ts

@@ -403,7 +403,9 @@ function extractTypeScriptFunctionName(func: SyntaxNode): string | undefined {
   }
 }
 
-// Find the variable, parameter, or field that this function is bound to
+/**
+ * Finds the variable, parameter, or field that this function is bound to
+ */
 function findVariableBinding(func: SyntaxNode): string | undefined {
   const parent = func.parent;
   if (!parent) return undefined;

src/control-flow/cfg.ts

@@ -59,8 +59,8 @@ export function newCFGBuilder(
 }
 
 export function extractFunctionName(
-  func: SyntaxNode,
   language: Language,
+  func: SyntaxNode,
 ): string | undefined {
   return languageDefinitions[language].extractFunctionName(func);
 }

src/render/src/App.svelte

@@ -293,7 +293,7 @@ function updateMetadata(CFG: CFG, func?: SyntaxNode, language?: Language) {
     | undefined = undefined;
 
   if (func && language) {
-    name = extractFunctionName(func, language) ?? "<anonymous>";
+    name = extractFunctionName(language, func) ?? "<anonymous>";
     lineCount = func.endPosition.row - func.startPosition.row + 1;
     functionData = { name, lineCount, language };
   }

src/test/extractNameC.test.ts

@@ -3,7 +3,7 @@ import { extractFunctionName } from "../control-flow/cfg.ts";
 import { iterFunctions } from "../file-parsing/bun.ts";
 
 const namesFrom = (code: string) =>
-  [...iterFunctions(code, "C")].map((f) => extractFunctionName(f, "C"));
+  [...iterFunctions(code, "C")].map((f) => extractFunctionName("C", f));
 describe("C: function name extraction", () => {
   test.each([
     [

src/test/extractNameCpp.test.ts

@@ -3,7 +3,7 @@ import { extractFunctionName } from "../control-flow/cfg.ts";
 import { iterFunctions } from "../file-parsing/bun.ts";
 
 const namesFrom = (code: string) =>
-  [...iterFunctions(code, "C++")].map((f) => extractFunctionName(f, "C++"));
+  [...iterFunctions(code, "C++")].map((f) => extractFunctionName("C++", f));
 
 describe("C++: basic functions & namespaces", () => {
   test.each([

src/test/extractNameGo.test.ts

@@ -3,7 +3,7 @@ import { extractFunctionName } from "../control-flow/cfg.ts";
 import { iterFunctions } from "../file-parsing/bun.ts";
 
 const namesFrom = (code: string) =>
-  [...iterFunctions(code, "Go")].map((f) => extractFunctionName(f, "Go"));
+  [...iterFunctions(code, "Go")].map((f) => extractFunctionName("Go", f));
 
 describe("Go: basic functions", () => {
   test("named top-level functions", () => {

src/test/extractNamePython.test.ts

@@ -4,7 +4,7 @@ import { iterFunctions } from "../file-parsing/bun.ts";
 
 const namesFrom = (code: string) =>
   [...iterFunctions(code, "Python")].map((f) =>
-    extractFunctionName(f, "Python"),
+    extractFunctionName("Python", f),
   );
 
 describe("Python: function definitions", () => {

src/test/extractNameTypescript.test.ts

@@ -4,7 +4,7 @@ import { iterFunctions } from "../file-parsing/bun.ts";
 
 const namesFrom = (code: string) =>
   [...iterFunctions(code, "TypeScript")].map((f) =>
-    extractFunctionName(f, "TypeScript"),
+    extractFunctionName("TypeScript", f),
   );
 
 describe("TypeScript: arrow functions", () => {