diff --git a/PowerEditor/Test/FunctionList/cs/unitTest b/PowerEditor/Test/FunctionList/cs/unitTest
index db6064cf0..5c6acf933 100644
--- a/PowerEditor/Test/FunctionList/cs/unitTest
+++ b/PowerEditor/Test/FunctionList/cs/unitTest
@@ -11,8 +11,16 @@ using Microsoft.Owin.Security.OpenIdConnect;
 
 namespace $OwinNamespace$
 {
+    // check if comments are causing parsing problems
+    /* check if comments are causing parsing problems
+       check if comments are causing parsing problems
+    */
     public partial class $OwinClass$
     {
+        // check if comments are causing parsing problems
+        /* check if comments are causing parsing problems
+           check if comments are causing parsing problems
+        */
         private static string clientId = ConfigurationManager.AppSettings["ida:ClientId"];
         private static string aadInstance = ConfigurationManager.AppSettings["ida:AADInstance"];
         private static string tenantId = ConfigurationManager.AppSettings["ida:TenantId"];
@@ -25,6 +33,11 @@ namespace $OwinNamespace$
 
             app.UseCookieAuthentication(new CookieAuthenticationOptions());
 
+            // check if comments are causing parsing problems
+            /* check if comments are causing parsing problems
+               check if comments are causing parsing problems
+            */
+
             app.UseOpenIdConnectAuthentication(
                 new OpenIdConnectAuthenticationOptions
                 {
@@ -34,4 +47,9 @@ namespace $OwinNamespace$
                 });
         }
     }
-}
\ No newline at end of file
+}
+
+// check if comments are causing parsing problems
+/* check if comments are causing parsing problems
+   check if comments are causing parsing problems
+*/
diff --git a/PowerEditor/installer/functionList/cs.xml b/PowerEditor/installer/functionList/cs.xml
index 4ccba0411..2d5e24ebe 100644
--- a/PowerEditor/installer/functionList/cs.xml
+++ b/PowerEditor/installer/functionList/cs.xml
@@ -38,6 +38,16 @@
 					</functionName>
 				</function>
 			</classRange>
+			<function
+				mainExpr="^[\t\x20]*((static|const|virtual)\s+)?\w+(\s+\w+)?(\s+|(\*|\*\*|&amp;)\s+|\s+(\*|\*\*|&amp;)|\s+(\*|\*\*|&amp;)\s+)(\w+\s*::)?(?!(if|while|for))\w+\s*\([^\)\(]*\)(\s*const\s*)?[\n\s]*\{">
+				<functionName>
+					<nameExpr expr="(?!(if|while|for))\w+\s*\(" />
+					<nameExpr expr="(?!(if|while|for))\w+" />
+				</functionName>
+				<className>
+					<nameExpr expr="\w+(?=\s*::)" />
+				</className>
+			</function>
 		</parser>
 	</functionList>
 </NotepadPlus>
\ No newline at end of file