fix(parser+grammar): handle quoted ) in function defaults (fixes #243)

Author: loganch

src/parsers/MapParser.js

@@ -1,6 +1,12 @@
 /**
  * Parses AutoIt source code to extract Map variable information
  */
+import {
+  parseFunctionDeclarationLine,
+  parseParameterNames,
+  splitTopLevel,
+} from '../utils/functionSignatureParsing.js';
+
 export default class MapParser {
   constructor(source) {
     this.source = source;
@@ -117,22 +123,18 @@ export default class MapParser {
    */
   parseFunctionBoundaries() {
     this.functions = [];
-    const funcStartPattern = /^\s*Func\s+(\w+)\s*\((.*?)\)/i;
     const funcEndPattern = /^\s*EndFunc/i;
 
     let currentFunc = null;
 
     this.lines.forEach((line, index) => {
-      const funcStart = line.match(funcStartPattern);
-      if (funcStart) {
+      const funcDeclaration = parseFunctionDeclarationLine(line);
+      if (funcDeclaration) {
         // Parse parameters
-        const paramsStr = funcStart[2].trim();
-        const parameters = paramsStr
-          ? paramsStr.split(',').map(p => p.trim().split('=')[0].trim())
-          : [];
+        const parameters = parseParameterNames(funcDeclaration.paramsText);
 
         currentFunc = {
-          name: funcStart[1],
+          name: funcDeclaration.functionName,
           startLine: index,
           endLine: -1,
           parameters,
@@ -305,7 +307,7 @@ export default class MapParser {
       if (!match) return;
 
       const funcName = match[1];
-      const args = match[2].split(',').map(a => a.trim());
+      const args = splitTopLevel(match[2], ',').map(a => a.trim());
 
       // Check if our Map is passed as an argument
       const argIndex = args.indexOf(mapName);

src/parsers/VariableParser.js

@@ -4,6 +4,10 @@
  */
 
 import VariablePatterns from '../utils/VariablePatterns.js';
+import {
+  parseFunctionDeclarationLine,
+  parseParameterNames,
+} from '../utils/functionSignatureParsing.js';
 
 class VariableParser {
   constructor(source, filePath = '') {
@@ -22,26 +26,18 @@ class VariableParser {
    */
   parseFunctionBoundaries() {
     this.functions = [];
-    const funcStartPattern = /^\s*(?:Volatile\s+)?Func\s+(\w+)\s*\((.*?)\)/i;
     const funcEndPattern = /^\s*EndFunc/i;
 
     let currentFunc = null;
 
     this.lines.forEach((line, index) => {
-      const funcStart = line.match(funcStartPattern);
-      if (funcStart) {
+      const funcDeclaration = parseFunctionDeclarationLine(line);
+      if (funcDeclaration) {
         // Parse parameters from function signature
-        const paramsStr = funcStart[2].trim();
-        const parameters = paramsStr
-          ? paramsStr.split(',').map(p => {
-              const param = p.trim().split('=')[0].trim();
-              // Parameters should start with $
-              return param.startsWith('$') ? param : '$' + param;
-            })
-          : [];
+        const parameters = parseParameterNames(funcDeclaration.paramsText, true);
 
         currentFunc = {
-          name: funcStart[1],
+          name: funcDeclaration.functionName,
           startLine: index,
           endLine: -1,
           parameters,
@@ -192,31 +188,22 @@ class VariableParser {
    * @private
    */
   parseFunctionParameters(line, lineIndex) {
-    const funcMatch = line.match(/^\s*(?:Volatile\s+)?Func\s+(\w+)\s*\((.*?)\)/i);
-
-    if (!funcMatch) {
+    const funcDeclaration = parseFunctionDeclarationLine(line);
+    if (!funcDeclaration) {
       return;
     }
 
-    const functionName = funcMatch[1];
-    const paramsStr = funcMatch[2].trim();
+    const { functionName, paramsText: paramsStr, paramsStartIndex } = funcDeclaration;
 
     if (!paramsStr) {
       return; // No parameters
     }
 
     // Parse parameter list
-    const parameters = paramsStr
-      .split(',')
-      .map(p => {
-        const param = p.trim().split('=')[0].trim();
-        return param.startsWith('$') ? param : '$' + param;
-      })
-      .filter(p => p.length > 0);
+    const parameters = parseParameterNames(paramsStr, true);
 
     // Find opening parenthesis to search from there
-    const parenIndex = line.indexOf('(');
-    let searchFrom = parenIndex >= 0 ? parenIndex : 0;
+    let searchFrom = paramsStartIndex;
 
     // Add each parameter as a variable
     parameters.forEach(param => {

src/util.js

@@ -3,6 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import { CompletionItemKind, MarkdownString, window, workspace } from 'vscode';
 import aiConfig from './ai_config';
+import { splitTopLevel } from './utils/functionSignatureParsing';
 
 // ============================================================================
 // CONSTANTS AND CONFIGURATION
@@ -702,14 +703,12 @@ const getParams = (paramText, text, headerIndex) => {
     return params;
   }
 
-  const paramList = paramText
-    .split(',')
+  const paramList = splitTopLevel(paramText, ',')
     .map(param => param.trim())
     .filter(param => param.length > 0);
 
   paramList.forEach(param => {
-    const paramEntry = param
-      .split('=')[0]
+    const paramEntry = splitTopLevel(param, '=')[0]
       .trim()
       .replace(/^ByRef\s*/, '');