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

2 files changed, 40 insertions, 3 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
     }
 }
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj
index cabacbc28..5f9548262 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Tango.Scripting.Editors.csproj
@@ -590,6 +590,10 @@
       <Project>{5812E1C6-ABAA-4066-94AC-971C27B4F46A}</Project>
       <Name>Tango.Scripting.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Tango.Scripting.Formatting\Tango.Scripting.Formatting.csproj">
+      <Project>{8d8f06ed-7f75-4933-b0c5-829b0ff654d0}</Project>
+      <Name>Tango.Scripting.Formatting</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Tango.Scripting\Tango.Scripting.csproj">
       <Project>{1e938fd2-c669-4738-98c9-77f96ce4d451}</Project>
       <Name>Tango.Scripting</Name>
@@ -642,7 +646,7 @@
   </ItemGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UseGlobalSettings="True" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file