From 5c4152c99bc191658c8a3ad1b045b894ad01d9ac Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Wed, 14 Jul 2021 23:20:11 +0200
Subject: [PATCH] halstead, show full func sig

---
 CHANGELOG.md           |  1 +
 dexed-d/src/common.d   | 17 +++++++++++++++++
 dexed-d/src/halstead.d |  2 +-
 dexed-d/src/symlist.d  | 14 +-------------
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62ae4925..e6d146fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Enhancement
 
+- Halstead metrics: show full function signatures.
 - DUB projects: added support for the _syntax_ build type. (#83)
 
 # v3.9.11
diff --git a/dexed-d/src/common.d b/dexed-d/src/common.d
index 1facd161..202f8907 100644
--- a/dexed-d/src/common.d
+++ b/dexed-d/src/common.d
@@ -501,3 +501,20 @@ unittest
     assert(fpcString.length == test.length);
     assert(fpcString.data[0..fpcString.length] == test);
 }
+
+string funcDeclText(const FunctionDeclaration fd)
+{
+    import dparse.formatter : Formatter;
+
+    alias Fmt = Formatter!(Array!char*);
+    __gshared Array!char app;
+    __gshared Fmt fmt;
+
+    if (!fmt)
+        fmt = construct!Fmt(&app);
+
+    app.length = 0;
+    app.put(cast() fd.name.text);
+    fmt.format(fd.parameters);
+    return app[].idup;
+}
diff --git a/dexed-d/src/halstead.d b/dexed-d/src/halstead.d
index 1587b7e2..12dd8ac6 100644
--- a/dexed-d/src/halstead.d
+++ b/dexed-d/src/halstead.d
@@ -222,7 +222,7 @@ private final class HalsteadMetric: ASTVisitor
         if (!decl.functionBody)
             return;
         decl.accept(this);
-        endFunction(decl.name.text, decl.name.line);
+        endFunction(patchPascalString(funcDeclText(decl)), decl.name.line);
     }
 
     void visitFunction(T)(const(T) decl)
diff --git a/dexed-d/src/symlist.d b/dexed-d/src/symlist.d
index 6398f7e6..0e89a203 100644
--- a/dexed-d/src/symlist.d
+++ b/dexed-d/src/symlist.d
@@ -110,8 +110,6 @@ static assert (!MustAddGcRange!(SymbolListBuilder!(ListFmt.Pas)));
         JSONValue* jarray;
     }
 
-    Array!char funcNameApp;
-    Formatter!(Array!char*) fmtVisitor;
     uint utc;
 
     this(Appender!(AstErrors) errors, bool deep)
@@ -126,14 +124,11 @@ static assert (!MustAddGcRange!(SymbolListBuilder!(ListFmt.Pas)));
             json = parseJSON("[]");
             jarray = &json;
         }
-        fmtVisitor = construct!(typeof(fmtVisitor))(&funcNameApp);
         addAstErrors(errors.data);
     }
 
     ~this()
     {
-        destruct(funcNameApp);
-        destruct(fmtVisitor);
         static if (Fmt == ListFmt.Pas)
         {
             destruct(pasStream);
@@ -199,14 +194,7 @@ static assert (!MustAddGcRange!(SymbolListBuilder!(ListFmt.Pas)));
             pasStream.put(format("col=%d\r", dt.name.column));
             static if (is(DT == FunctionDeclaration))
             {
-                if (dt.parameters && dt.parameters.parameters &&
-                    dt.parameters.parameters.length)
-                {
-                    funcNameApp.length = 0;
-                    fmtVisitor.format(dt.parameters);
-                    pasStream.put(format("name='%s%s'\r", dt.name.text, patchPascalString(funcNameApp[])));
-                }
-                else pasStream.put(format("name='%s'\r", dt.name.text));
+                pasStream.put(format("name='%s'\r", funcDeclText(dt).patchPascalString()));
             }
             else
             {