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

2 files changed, 11 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
index 7abcbb42d..fef43a35f 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Basic/Project.cs
@@ -123,6 +123,8 @@ namespace Tango.Scripting.Basic
 
                 var compileResults = s.Compile();
 
+                GC.Collect();
+
                 foreach (var error in compileResults.Where(x => x.Severity == Microsoft.CodeAnalysis.DiagnosticSeverity.Error))
                 {
                     CompilationError cError = new CompilationError();
@@ -178,6 +180,10 @@ namespace Tango.Scripting.Basic
                 {
                     session.Failed(ex.InnerException);
                 }
+                finally
+                {
+                    GC.Collect();
+                }
             });
 
             scriptThread.SetApartmentState(ApartmentState);
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index d7d72ec0b..2da7d3e46 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -2126,6 +2126,11 @@ namespace Tango.Scripting.Editors
             Select(position, Math.Max(length, 1));
         }
 
+        public void InsertCode(String code)
+        {
+            Document.Insert(TextArea.Caret.Offset, code);
+        }
+
         #endregion
     }
 }