From ddcd370da70d9e2212450368df1499c3a1f1b71c Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Tue, 25 Aug 2020 16:03:24 +0300 Subject: Fixed issue with script editor not recognizing string => String alias. Fixed issue with script FillVariables recursion hangs. --- .../Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors') 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); -- cgit v1.3.1