Fix autocomplete for functions with assigment.

#3

Author: Hexer10

SourcepawnCondenser/SourcepawnCondenser/CondenserFunctions/SMFunctionConsumer.cs

@@ -381,7 +381,8 @@ public static List<SMVariable> ConsumeSMVariableLocal(Token[] t, string FileName
                     // Assign var match: "int x = 5"
                     case TokenKind.Assignment when t[position + 4].Kind == TokenKind.Semicolon &&
                                                    (t[position + 3].Kind == TokenKind.Number ||
-                                                    t[position + 3].Kind == TokenKind.Quote):
+                                                    t[position + 3].Kind == TokenKind.Quote ||
+                                                    t[position + 3].Kind == TokenKind.Identifier):
                         variables.Add(new SMVariable
                         {
                             Index = startIndex, Length = t[position + 4].Index - startIndex, File = FileName,

SourcepawnCondenser/SourcepawnCondenser/CondenserFunctions/SMVariableConsumer.cs

@@ -89,7 +89,8 @@ private int ConsumeSMVariable()
                     // Assign var match: "int x = 5"
                     case TokenKind.Assignment when t[position + 4].Kind == TokenKind.Semicolon &&
                                                    (t[position + 3].Kind == TokenKind.Number ||
-                                                    t[position + 3].Kind == TokenKind.Quote):
+                                                    t[position + 3].Kind == TokenKind.Quote ||
+                                                    t[position + 3].Kind == TokenKind.Identifier ):
                         def.Variables.Add(new SMVariable
                         {
                             Index = startIndex, Length = t[position + 4].Index - startIndex, File = FileName,

SourcepawnCondenser/SourcepawnCondenser/SourcemodDefinition/SMDefinition.cs

@@ -12,6 +12,8 @@ public class SMDefinition
         public string[]
             ConstantsStrings = new string[0]; //ATTENTION: THIS IS NOT THE LIST OF ALL CONSTANTS - IT INCLUDES MUCH MORE
 
+        public List<string> currentVariables = new List<string>();
+
         //public string[] EnumStrings = new string[0]; NOT NEEDED
         //public string[] StructStrings = new string[0]; NOT NEEDED
         //public string[] DefinesStrings = new string[0]; NOT NEEDED
@@ -39,7 +41,6 @@ public string[]
         public List<SMTypedef> Typedefs = new List<SMTypedef>();
         public string[] TypeStrings = new string[0];
         public List<SMVariable> Variables = new List<SMVariable>();
-        public List<string> currentVariables = new List<string>();
 
         public void Sort()
         {
@@ -133,7 +134,7 @@ private void ProduceStringArrays(int caret = -1, List<SMFunction> currentFunctio
                 // 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"));
+                    e.Index < caret && caret <= e.EndPos);
                 if (currentFunc != null)
                 {
                     constantNames.AddRange(currentFunc.FuncVariables.Select(v => v.Name));
@@ -160,7 +161,7 @@ private void ProduceStringArrays(int caret = -1, List<SMFunction> currentFunctio
             typeNames.AddRange(Typedefs.Select(i => i.Name));
             typeNames.AddRange(EnumStructs.Select(i => i.Name));
             typeNames.Sort(string.Compare);
-            TypeStrings = typeNames.ToArray();
+            TypeStrings = typeNames.Where(e => !string.IsNullOrWhiteSpace(e)).ToArray();
         }
 
         public ACNode[] ProduceACNodes()

UI/Components/EditorElement.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -18,6 +19,7 @@
 using ICSharpCode.AvalonEdit.Rendering;
 using ICSharpCode.AvalonEdit.Utils;
 using MahApps.Metro.Controls.Dialogs;
+using SourcepawnCondenser;
 using SourcepawnCondenser.SourcemodDefinition;
 using Spcode.Utils.SPSyntaxTidy;
 using Xceed.Wpf.AvalonDock.Layout;
@@ -631,8 +633,61 @@ private void Caret_PositionChanged(object sender, EventArgs e)
             EvaluateIntelliSense();
             var result = bracketSearcher.SearchBracket(editor.Document, editor.CaretOffset);
             bracketHighlightRenderer.SetHighlight(result);
-            //TODO: Remove this in release
-            // StatusLine_Work.Text = editor.CaretOffset.ToString();
+
+
+            if (Program.OptionsObject.Program_DynamicISAC)
+            {
+                var ee = Program.MainWindow.GetAllEditorElements();
+                var ce = Program.MainWindow.GetCurrentEditorElement();
+
+                var caret = -1;
+
+                if (ee != null)
+                {
+                    var definitions = new SMDefinition[ee.Length];
+                    List<SMFunction> currentFunctions = null;
+                    for (var i = 0; i < ee.Length; ++i)
+                    {
+                        var el = ee[i];
+                        var fInfo = new FileInfo(el.FullFilePath);
+                        var text = el.editor.Document.Text;
+                        if (fInfo.Extension.Trim('.').ToLowerInvariant() == "inc")
+                            definitions[i] =
+                                new Condenser(text
+                                    , fInfo.Name).Condense();
+
+                        if (fInfo.Extension.Trim('.').ToLowerInvariant() == "sp")
+                        {
+                            if (el.IsLoaded)
+                            {
+                                caret = el.editor.CaretOffset;
+                                definitions[i] =
+                                    new Condenser(text, fInfo.Name)
+                                        .Condense();
+                                currentFunctions = definitions[i].Functions;
+                            }
+                        }
+                    }
+
+                    var smDef = Program.Configs[Program.SelectedConfig].GetSMDef()
+                        .ProduceTemporaryExpandedDefinition(definitions, caret, currentFunctions);
+                    var smFunctions = smDef.Functions.ToArray();
+                    var acNodes = smDef.ProduceACNodes();
+                    var isNodes = smDef.ProduceISNodes();
+
+                    foreach (var el in ee)
+                    {
+                        if (el == ce)
+                        {
+                            Debug.Assert(ce != null, nameof(ce) + " != null");
+                            if (ce.ISAC_Open) continue;
+                        }
+
+                        el.InterruptLoadAutoCompletes(smDef.FunctionStrings, smFunctions, acNodes,
+                            isNodes, smDef.Methodmaps.ToArray(), smDef.Variables.ToArray());
+                    }
+                }
+            }
         }
 
         private void TextArea_TextEntered(object sender, TextCompositionEventArgs e)

UI/MainWindow.xaml.cs

@@ -90,7 +90,7 @@ public MainWindow(SplashScreen sc)
                 if (!args[i].EndsWith("exe"))
                     TryLoadSourceFile(args[i], false, true, i == 0);
             sc.Close(TimeSpan.FromMilliseconds(500.0));
-            StartBackgroundParserThread();
+            // StartBackgroundParserThread();
             FullyInitialized = true;
         }
 

UI/MainWindowBackgroundParser.cs

@@ -13,12 +13,12 @@ namespace Spcode.UI
     public partial class MainWindow
     {
         private Thread backgroundParserThread;
-        private ACNode[] currentACNodes;
-        private ISNode[] currentISNodes;
-        private SMDefinition currentSMDef;
-        private ulong currentSMDefUID;
-
-        private SMFunction[] currentSMFunctions;
+        internal ACNode[] currentACNodes;
+        internal ISNode[] currentISNodes;
+        internal SMDefinition currentSMDef;
+        internal ulong currentSMDefUID;
+        internal SMFunction[] currentSMFunctions;
+        
         private Timer parseDistributorTimer;
 
         private void StartBackgroundParserThread()
@@ -63,7 +63,7 @@ private void ParseDistributorTimer_Elapsed(object sender, ElapsedEventArgs args)
 
         private void BackgroundParser_Worker()
         {
-            while (true)
+            while (false)
             while (Program.OptionsObject.Program_DynamicISAC)
             {
                 Thread.Sleep(3000);