Start implementing types

Author: Hexer10

SourcepawnCondenser/SourcepawnCondenser/SMDefinition/SMDefinition.cs

@@ -39,6 +39,7 @@ 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()
         {
@@ -131,11 +132,19 @@ 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"));
+                var currentFunc = currentFunctions.FirstOrDefault(e =>
+                    e.Index < caret && caret <= e.EndPos + 5 && e.File.EndsWith(".sp"));
                 if (currentFunc != null)
                 {
-                    
                     constantNames.AddRange(currentFunc.FuncVariables.Select(v => v.Name));
+                    var stringParams = currentFunc.Parameters.Select(e => e.Split('=').First().Trim())
+                        .Select(e => e.Split(' ').Last()).Where(e => !string.IsNullOrWhiteSpace(e)).ToList();
+                    constantNames.AddRange(stringParams);
+                    currentVariables.AddRange(stringParams);
+                }
+                else
+                {
+                    currentVariables.Clear();
                 }
             }
 
@@ -205,16 +214,17 @@ public void MergeDefinitions(SMDefinition def)
             }
         }
 
-        public SMDefinition ProduceTemporaryExpandedDefinition(SMDefinition[] definitions, int caret, List<SMFunction> currentFunctions)
+        public SMDefinition ProduceTemporaryExpandedDefinition(SMDefinition[] definitions, int caret,
+            List<SMFunction> currentFunctions)
         {
             var def = new SMDefinition();
-                def.MergeDefinitions(this);
-                foreach (var definition in definitions)
-                    if (definition != null)
-                        def.MergeDefinitions(definition);
+            def.MergeDefinitions(this);
+            foreach (var definition in definitions)
+                if (definition != null)
+                    def.MergeDefinitions(definition);
 
-                def.Sort();
-                def.ProduceStringArrays(caret, currentFunctions);
+            def.Sort();
+            def.ProduceStringArrays(caret, currentFunctions);
             return def;
         }
 

UI/Components/IntelliSenseController.cs

@@ -42,8 +42,10 @@ public partial class EditorElement
 
         public ulong LastSMDefUpdateUID = 0;
 
+        // TODO Add EnumStructs
         private SMMethodmap[] methodMaps;
-
+        private SMVariable[] smVariables;
+        
         private readonly Regex multilineCommentRegex = new Regex(@"/\*.*?\*/",
             RegexOptions.Compiled | RegexOptions.ExplicitCapture | RegexOptions.Singleline);
 
@@ -70,12 +72,13 @@ public void LoadAutoCompletes()
             acEntrys = def.ProduceACNodes();
             isEntrys = def.ProduceISNodes();
             methodMaps = def.Methodmaps.ToArray();
+            smVariables = def.Variables.ToArray();
             AutoCompleteBox.ItemsSource = acEntrys;
             MethodAutoCompleteBox.ItemsSource = isEntrys;
         }
 
         public void InterruptLoadAutoCompletes(string[] FunctionStrings, SMFunction[] FunctionArray, ACNode[] acNodes,
-            ISNode[] isNodes)
+            ISNode[] isNodes, SMMethodmap[] newMethodMaps, SMVariable[] newVariables)
         {
             Dispatcher?.Invoke(() =>
             {
@@ -85,6 +88,8 @@ public void InterruptLoadAutoCompletes(string[] FunctionStrings, SMFunction[] Fu
                 isEntrys = isNodes;
                 AutoCompleteBox.ItemsSource = acEntrys;
                 MethodAutoCompleteBox.ItemsSource = isEntrys;
+                methodMaps = newMethodMaps;
+                smVariables = newVariables;
             });
         }
 
@@ -210,6 +215,7 @@ private void EvaluateIntelliSense()
                                             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);

UI/MainWindowBackgroundParser.cs

@@ -56,7 +56,7 @@ private void ParseDistributorTimer_Elapsed(object sender, ElapsedEventArgs args)
                     }
 
                     e.InterruptLoadAutoCompletes(currentSMDef.FunctionStrings, currentSMFunctions, currentACNodes,
-                        currentISNodes);
+                        currentISNodes, currentSMDef.Methodmaps.ToArray(), currentSMDef.Variables.ToArray());
                     e.LastSMDefUpdateUID = currentSMDefUID;
                 }
         }