Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 5 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 6c248b63d..9ff78912f 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -1230,7 +1230,7 @@ namespace Tango.Scripting.Editors
                     else
                     {
                         //Maybe static...
-                        var type = _knownTypes.FirstOrDefault(x => x.Name == variableName);
+                        var type = _knownTypes.FirstOrDefault(x => x.Name == variableName || x.Alias == variableName);
                         return type != null ? new KnownTypeResult(type) { IsStatic = true } : null;
                     }
                 }
@@ -1566,6 +1566,10 @@ namespace Tango.Scripting.Editors
                                     knownType.Alias = "uint";
                                 }
                             }
+                            else if (type == typeof(String))
+                            {
+                                knownType.Alias = "string";
+                            }
 
                             _knownTypesCache.Add(type, knownType);
                             cachedUsing.KnownTypes.Add(knownType);