1 files changed, 82 insertions, 9 deletions
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptParser.cs b/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptParser.cs
index 7accdbb83..e9cb8fc4c 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptParser.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting/Parsing/ScriptParser.cs
@@ -131,16 +131,32 @@ namespace Tango.Scripting.Parsing
 
                     if (prop != null)
                     {
-                        vars.Add(new ScriptSymbol()
+                        var type = ReplaceFakeScript(prop.GetValue(symbol).ToString());
+
+                        ScriptSymbol varSymbol = new ScriptSymbol();
+                        varSymbol.Name = symbol.Name;
+                        varSymbol.Type = type;
+                        varSymbol.Class = ReplaceFakeScript(symbol.ContainingType?.Name);
+                        varSymbol.Kind = symbol.Kind;
+                        varSymbol.Accessibility = symbol.DeclaredAccessibility;
+                        varSymbol.ContainingNamespace = ReplaceFakeScript(symbol.ContainingNamespace?.Name);
+                        varSymbol.Summary = GetSymbolDocumentation(symbol);
+                        vars.Add(varSymbol);
+
+                        if (type == "?")
                         {
-                            Name = symbol.Name,
-                            Type = ReplaceFakeScript(prop.GetValue(symbol).ToString()),
-                            Class = ReplaceFakeScript(symbol.ContainingType?.Name),
-                            Kind = symbol.Kind,
-                            Accessibility = symbol.DeclaredAccessibility,
-                            ContainingNamespace = ReplaceFakeScript(symbol.ContainingNamespace?.Name),
-                            Summary = GetSymbolDocumentation(symbol),
-                        });
+                            try
+                            {
+                                var variables = GetScriptVariables(code);
+                                var variable = variables.FirstOrDefault(x => x.Name == symbol.Name);
+
+                                if (variable != null)
+                                {
+                                    varSymbol.Type = variable.Type;
+                                }
+                            }
+                            catch { }
+                        }
                     }
                 }
             }
@@ -392,5 +408,62 @@ namespace Tango.Scripting.Parsing
             var ret = root.ToFullString();
             return ret;
         }
+
+        private List<ScriptVariable> GetScriptVariables(String code)
+        {
+            List<ScriptVariable> vars = new List<ScriptVariable>();
+
+            SyntaxTree tree = CSharpSyntaxTree.ParseText(code);
+            var root = (CompilationUnitSyntax)tree.GetRoot();
+
+            List<VariableDeclaratorSyntax> variables = new List<VariableDeclaratorSyntax>();
+            FillVariables(variables, root.Members[0]);
+            variables = variables.Distinct().ToList();
+
+            foreach (var item in variables)
+            {
+                ScriptVariable v = new ScriptVariable();
+                v.Name = item.Identifier.ToString();
+
+                if (item.Initializer.Value.GetType() == typeof(ObjectCreationExpressionSyntax))
+                {
+                    v.Type = (item.Initializer.Value as ObjectCreationExpressionSyntax).Type.ToString();
+                }
+                else if (item.Initializer.Value.GetType() == typeof(InvocationExpressionSyntax))
+                {
+                    v.Type = (((item.Initializer.Value as InvocationExpressionSyntax).Expression as MemberAccessExpressionSyntax).Name as GenericNameSyntax).TypeArgumentList.Arguments[0].ToString();
+                }
+
+                vars.Add(v);
+            }
+
+            return vars;
+        }
+
+        private void FillVariables(List<VariableDeclaratorSyntax> variables, SyntaxNode node)
+        {
+            foreach (var item in node.DescendantNodes(x => true))
+            {
+                if (item.GetType() == typeof(VariableDeclaratorSyntax))
+                {
+                    variables.Add(item as VariableDeclaratorSyntax);
+                }
+                else
+                {
+                    FillVariables(variables, item);
+                }
+            }
+        }
+
+        private class ScriptVariable
+        {
+            public String Name { get; set; }
+            public String Type { get; set; }
+
+            public override string ToString()
+            {
+                return String.Format("{0} : {1}", Type, Name);
+            }
+        }
     }
 }