Find definition for methodmaps. #1

SPCodeOrg · Mar 27, 2020 · 3c0f740 · 3c0f740
1 parent f549f2a
commit 3c0f740
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/App/AssemblyInfo1.cs b/App/AssemblyInfo1.cs
@@ -33,5 +33,5 @@
 #if (DEBUG)
 [assembly: AssemblyVersion("1.13.*")]
 #else
-[assembly: AssemblyVersion("1.3.0.1")]
+[assembly: AssemblyVersion("1.3.0.2")]
 #endif
diff --git a/UI/Components/IntelliSenseController.cs b/UI/Components/IntelliSenseController.cs
@@ -199,13 +199,19 @@ private void EvaluateIntelliSense()
                                             found = true;
                                         }
 
+                                        // Try to find declaration
                                         if (!found)
                                         {
-                                            // Many any methodmap, since the ide is not aware of the types
-                                            foreach (var methodMap in methodMaps)
+                                            var pattern =
+                                                $@"\b((?<class>[a-zA-Z_]([a-zA-Z0-9_]?)+))\s+({classString})\s*(;|=)";
+                                            var findDecl = new Regex(pattern, RegexOptions.Compiled);
+                                            var match = findDecl.Match(editor.Text);
+                                            var classMatch = match.Groups["class"].Value;
+                                            if (classMatch.Length > 0)
                                             {
+                                                var methodMap = methodMaps.FirstOrDefault(e => e.Name == classMatch);
                                                 var method =
-                                                    methodMap.Methods.FirstOrDefault(e => e.Name == methodString);
+                                                    methodMap?.Methods.FirstOrDefault(e => e.Name == methodString);
                                                 if (method != null)
                                                 {
                                                     xPos = ISMatches[j].Groups["method"].Index +
@@ -214,9 +220,31 @@ private void EvaluateIntelliSense()
                                                     ISFuncNameStr = method.FullName;
                                                     ISFuncDescriptionStr = method.CommentString;
                                                     ForceReSet = true;
+                                                    found = true;
                                                 }
                                             }
                                         }
+
+                                        // Match the first found
+                                        if (!found)
+                                        {
+                                            // Many any methodmap, since the ide is not aware of the types
+                                            foreach (var methodMap in methodMaps)
+                                            {
+                                                var method =
+                                                    methodMap.Methods.FirstOrDefault(e => e.Name == methodString);
+
+                                                if (method == null)
+                                                    continue;
+
+                                                xPos = ISMatches[j].Groups["method"].Index +
+                                                       ISMatches[j].Groups["method"].Length;
+                                                ForwardShowIS = true;
+                                                ISFuncNameStr = method.FullName;
+                                                ISFuncDescriptionStr = method.CommentString;
+                                                ForceReSet = true;
+                                            }
+                                        }
                                     }
                                     else
                                     {