aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Scripting/Tango.Scripting.Editors
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-08-25 16:03:24 +0300
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-08-25 16:03:24 +0300
commitddcd370da70d9e2212450368df1499c3a1f1b71c (patch)
tree78993f9e75e61934b3d4dc295efd885d1f3b34b0 /Software/Visual_Studio/Scripting/Tango.Scripting.Editors
parentab3d239500196133f309b4a17fdd91aef645c356 (diff)
downloadTango-ddcd370da70d9e2212450368df1499c3a1f1b71c.tar.gz
Tango-ddcd370da70d9e2212450368df1499c3a1f1b71c.zip
Fixed issue with script editor not recognizing string => String alias.
Fixed issue with script FillVariables recursion hangs.
Diffstat (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors')
-rw-r--r--Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs6
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);