Merge pull request #117 from kasecato/#115/innerTupple

Fixed #115 that is detected the inner tuple as parameter
kasecato · Nov 14, 2020 · eab97cb · eab97cb
2 parents 1277cb9 + 64450d9
commit eab97cb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 0.1.19 (Nov 14, 2020)
 
 * bug fix - Type is detected as parameter. See [#113](https://github.com/kasecato/vscode-docomment/issues/113).
+* bug fix - Generates param tags for inner tuple type instead of method parameters. See [#115](https://github.com/kasecato/vscode-docomment/issues/115).
 * upgrade libs
 
 ## 0.1.18 (Aug 12, 2020)

diff --git a/src/SyntacticAnalysis/SyntacticAnalysisCSharp.ts b/src/SyntacticAnalysis/SyntacticAnalysisCSharp.ts
@@ -199,7 +199,7 @@ export class SyntacticAnalysisCSharp {
         const removedExtendsCode: string = removedAttrCode.replace(/:.+/, ''); // FIXME:
         const removedLamdaCode: string = removedExtendsCode.replace(/=>.*/, ''); // FIXME:
         const removedArrayCode: string = removedLamdaCode.replace(/\[.*?\]/g, ''); // FIXME:
-        const params: RegExpMatchArray = removedArrayCode.match(/.+\(([^)]*)\)/);
+        const params: RegExpMatchArray = removedArrayCode.match(/\((.+)\)/s);
 
         const isMatched = (params === null || params.length !== 2);
         if (isMatched) return null;

diff --git a/test/TestData/X.cs b/test/TestData/X.cs
@@ -90,6 +90,14 @@ public static (object result, string name) ComplexFunctionSignatureTwo() { }
     public IEnumerable<int> ZipAdd(IList<int> a, IList<int> b) => a.Zip(b, (s, t) => s + t);
 
     private void CSVStringToIntArray( ref string[] pCSVData, ref int[,] pZone) { }
+
+    bool ArgsValid(
+      string commandName,
+      IReadOnlyList<string> requiredArgs,
+      int length,
+      IReadOnlyList<(string name, string value)> namedArgs,
+      IReadOnlyList<string> argNames
+    ) { }
 }
 
 namespace ns {