diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-08-26 11:04:59 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-08-26 11:04:59 +0300 |
| commit | f851e980e49a4737e03335665b9c3a3a529ea326 (patch) | |
| tree | f9a2877bd8cd4886f9d5fa4a86805f47cf1e2fb1 /Software/Visual_Studio/Scripting/Tango.Scripting.Editors | |
| parent | ce95311e3ca782c405591d12da7cf4366c8dcfb2 (diff) | |
| parent | d493603b5c99e0f0ba6858ba9011c83baa780d3b (diff) | |
| download | Tango-f851e980e49a4737e03335665b9c3a3a529ea326.tar.gz Tango-f851e980e49a4737e03335665b9c3a3a529ea326.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors')
| -rw-r--r-- | Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs | 6 |
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); |