From bd1221e36ee3e493dc25bd32559f846519fe60d0 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Mon, 3 Aug 2020 12:16:21 +0300 Subject: Refactored RemoteSQL on procedures. Fixed issue with generic types display on code editor. Added line wrap toggle to procedure designer output. --- .../Tango.Scripting.Editors/ExtensionMethods.cs | 2 +- .../Scripting/Tango.Scripting.Editors/ScriptEditor.cs | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors') diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ExtensionMethods.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ExtensionMethods.cs index 1605ff281..d112c6141 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ExtensionMethods.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ExtensionMethods.cs @@ -22,7 +22,7 @@ namespace Tango.Scripting.Editors { List args = new List(); - foreach (var lGenericArgument in type.GetGenericTypeDefinition().GetGenericArguments()) + foreach (var lGenericArgument in type.GetGenericArguments()) { args.Add(lGenericArgument.Name); } diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs index 3c27118e2..0e32af6ed 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs @@ -260,6 +260,12 @@ namespace Tango.Scripting.Editors }" }); + + snippets.Add(new SnippetCompletionItem() + { + Name = "cw", + Code = "context.WriteLine(\"\");" + }); } /// @@ -1493,7 +1499,7 @@ namespace Tango.Scripting.Editors knownType.LoadDocumentation(); } - if (!BlockedUsingsCache.Exists(x => x == use)) + if (!BlockedUsingsCache.Exists(x => use.StartsWith(x))) { Task.Factory.StartNew(() => { @@ -1501,14 +1507,14 @@ namespace Tango.Scripting.Editors File.WriteAllText(useFileName, json); }); } - - if (_isUsingsLoadingStarted) - { - UsingsLoadingCompleted?.Invoke(this, new EventArgs()); - } } } + if (_isUsingsLoadingStarted) + { + UsingsLoadingCompleted?.Invoke(this, new EventArgs()); + } + LoadingSymbolsCompleted?.Invoke(null, new EventArgs()); } } -- cgit v1.3.1