Fix #136 - Function defs in comments not transpiled

sancarn · sancarn · commit aae14f27124b · 2025-07-05T16:30:03.000+01:00
diff --git a/Tools/VBA-stdError-Wrapper/main.ts b/Tools/VBA-stdError-Wrapper/main.ts
@@ -142,7 +142,7 @@ function main() {
 
     //Loop through each public function
     const functionFinder =
-      /(?<header>(?<!')(?:Public|Private|Friend) (?:(?<type>Function|Sub|Property) ?(?<access>Get|Let|Set)?) (?<name>\w+)\((?<params>(?:\(\)|[^)])*)\)(?: as (?<retType>(?:\w+\.)?\w+(?:\(\))?))?)(?<body>(?:.|\s)+?)\b(?<footer>End\s+(?:Function|Sub|Property))/gim;
+      /^[ \t]*(?<header>(?:Public|Private|Friend) (?:(?<type>Function|Sub|Property) ?(?<access>Get|Let|Set)?) (?<name>\w+)\((?<params>(?:\(\)|[^)])*)\)(?: as (?<retType>(?:\w+\.)?\w+(?:\(\))?))?)(?<body>(?:.|\s)+?)\b(?<footer>End\s+(?:Function|Sub|Property))/gim;
     content = content.replace(
       functionFinder,
       (

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ function main() {`
`142`	`142`
`143`	`143`	`//Loop through each public function`
`144`	`144`	`const functionFinder =`
`145`		`- /(?<header>(?<!')(?:Public\|Private\|Friend) (?:(?<type>Function\|Sub\|Property) ?(?<access>Get\|Let\|Set)?) (?<name>\w+)\((?<params>(?:\(\)\|[^)])*)\)(?: as (?<retType>(?:\w+\.)?\w+(?:\(\))?))?)(?<body>(?:.\|\s)+?)\b(?<footer>End\s+(?:Function\|Sub\|Property))/gim;`
	`145`	`+ /^[ \t](?<header>(?:Public\|Private\|Friend) (?:(?<type>Function\|Sub\|Property) ?(?<access>Get\|Let\|Set)?) (?<name>\w+)\((?<params>(?:\(\)\|[^)]))\)(?: as (?<retType>(?:\w+\.)?\w+(?:\(\))?))?)(?<body>(?:.\|\s)+?)\b(?<footer>End\s+(?:Function\|Sub\|Property))/gim;`
`146`	`146`	`content = content.replace(`
`147`	`147`	`functionFinder,`
`148`	`148`	`(`