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

1 files changed, 35 insertions, 2 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index d1ea9de43..f63cedcdc 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -36,6 +36,7 @@ using Tango.Scripting.Editors.Highlighting.Xshd;
 using Tango.Scripting.Editors.Intellisense;
 using Tango.Scripting.Editors.Popups;
 using Tango.Scripting.Editors.Rendering;
+using Tango.Scripting.Formatting;
 using Tango.Scripting.Parsing;
 
 namespace Tango.Scripting.Editors
@@ -1501,7 +1502,7 @@ namespace Tango.Scripting.Editors
         //    _isLoadingCachedAssemblies = false;
         //}
 
-        private void InvalidateHighlighting(bool loadKnownTypes = true)
+        public void InvalidateHighlighting(bool loadKnownTypes = true)
         {
             if (!_isLoadingTypes)
             {
@@ -1681,7 +1682,8 @@ namespace Tango.Scripting.Editors
 
         private void IndentCode()
         {
-            Text = Indentation.CSharp.CSharpIndentationHelper.IndentCSharpCode(Text);
+            Text = CodeFormatter.Format(Text);
+            //Text = Indentation.CSharp.CSharpIndentationHelper.IndentCSharpCode(Text);
             //Text = _parser.IndentCSharpCode(Text);
         }
 
@@ -2100,5 +2102,36 @@ namespace Tango.Scripting.Editors
         }
 
         #endregion
+
+        #region Public Methods
+
+        public void FormatCode()
+        {
+            try
+            {
+                int index = CaretOffset;
+                Document.BeginUpdate();
+                IndentCode();
+                Document.EndUpdate();
+                CaretOffset = index;
+            }
+            catch
+            {
+                Debug.WriteLine("Error formatting code.");
+            }
+        }
+
+        public void Highlight(int position, int length, int line)
+        {
+            Select(position, Math.Max(length, 1));
+            ScrollToLine(line);
+        }
+
+        public void InsertCode(String code)
+        {
+            Document.Insert(TextArea.Caret.Offset, code);
+        }
+
+        #endregion
     }
 }