Minor changes

Author: Hexer10

SourcepawnCondenser/SourcepawnCondenser/SMDefinition/SMDefinition.cs

@@ -89,7 +89,7 @@ public void AppendFiles(IEnumerable<string> paths)
             ProduceStringArrays();
         }
 
-        private void ProduceStringArrays(int caret = -1, string text = "")
+        private void ProduceStringArrays(int caret = -1, List<SMFunction> currentFunctions = null)
         {
             FunctionStrings = new string[Functions.Count];
             for (var i = 0; i < Functions.Count; ++i) FunctionStrings[i] = Functions[i].Name;
@@ -127,9 +127,11 @@ private void ProduceStringArrays(int caret = -1, string text = "")
             constantNames.AddRange(Defines.Select(i => i.Name));
             constantNames.AddRange(Variables.Select(v => v.Name));
 
-            if (caret != -1)
+            if (caret != -1 && currentFunctions != null)
             {
-                var currentFunc = Functions.FirstOrDefault(e => e.Index < caret && caret <= e.EndPos && e.File.EndsWith(".sp"));
+                // TODO: This somewhat works, but somethings when in the end of a function it's buggy and doesnt find
+                // the correct function or it finds nothing at all. The addition is a small hack that sometimes works 
+                var currentFunc = currentFunctions.FirstOrDefault(e => e.Index < caret && caret <= e.EndPos+5 && e.File.EndsWith(".sp"));
                 if (currentFunc != null)
                 {
 
@@ -203,7 +205,7 @@ public void MergeDefinitions(SMDefinition def)
             }
         }
 
-        public SMDefinition ProduceTemporaryExpandedDefinition(SMDefinition[] definitions, int caret, string text)
+        public SMDefinition ProduceTemporaryExpandedDefinition(SMDefinition[] definitions, int caret, List<SMFunction> currentFunctions)
         {
             var def = new SMDefinition();
                 def.MergeDefinitions(this);
@@ -212,7 +214,7 @@ public SMDefinition ProduceTemporaryExpandedDefinition(SMDefinition[] definition
                         def.MergeDefinitions(definition);
 
                 def.Sort();
-                def.ProduceStringArrays(caret, text);
+                def.ProduceStringArrays(caret, currentFunctions);
             return def;
         }
 

UI/MainWindowBackgroundParser.cs

@@ -1,4 +1,5 @@
-using System.Diagnostics;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Timers;
@@ -65,14 +66,15 @@ private void BackgroundParser_Worker()
             while (true)
             while (Program.OptionsObject.Program_DynamicISAC)
             {
-                Thread.Sleep(1000);
+                Thread.Sleep(3000);
                 var ee = GetAllEditorElements();
                 var caret = -1;
                 var text = string.Empty;
 
                 if (ee != null)
                 {
                     var definitions = new SMDefinition[ee.Length];
+                    List<SMFunction> currentFunctions = null;
                     for (var i = 0; i < ee.Length; ++i)
                     {
                         var fInfo = new FileInfo(ee[i].FullFilePath);
@@ -92,13 +94,14 @@ private void BackgroundParser_Worker()
                                     definitions[i1] =
                                         new Condenser(File.ReadAllText(fInfo.FullName), fInfo.Name)
                                             .Condense();
+                                    currentFunctions = definitions[i1].Functions;
                                 }
                             });
                         }
                     }
 
                     currentSMDef = Program.Configs[Program.SelectedConfig].GetSMDef()
-                        .ProduceTemporaryExpandedDefinition(definitions, caret, text);
+                        .ProduceTemporaryExpandedDefinition(definitions, caret, currentFunctions);
                     currentSMFunctions = currentSMDef.Functions.ToArray();
                     currentACNodes = currentSMDef.ProduceACNodes();
                     currentISNodes = currentSMDef.ProduceISNodes();