From 30c5a9db7f234d93c1c6f4e60367276d3576aa93 Mon Sep 17 00:00:00 2001 From: therzok Date: Mon, 15 May 2017 17:12:12 +0300 Subject: [VCS] Don't set tabs to spaces due to default policy in the diff editor. When setting the local text, the text setter would end up formatting the tabs to spaces due to how the policy was set. Disable that setting. --- .../MonoDevelop.VersionControl.Views/ComparisonWidget.cs | 6 ++++-- .../EditorCompareWidgetBase.cs | 10 +++++++++- .../MonoDevelop.VersionControl.Views/MergeWidget.cs | 7 ++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs index ebfaaff77e..f828b3039e 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs @@ -35,6 +35,7 @@ using MonoDevelop.Components; using System.ComponentModel; using MonoDevelop.Core; using MonoDevelop.Ide.Gui; +using MonoDevelop.Ide.Gui.Content; namespace MonoDevelop.VersionControl.Views { @@ -68,9 +69,10 @@ namespace MonoDevelop.VersionControl.Views protected override void CreateComponents () { + var options = GetTextEditorOptions (); this.editors = new [] { - new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance), - new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance), + new MonoTextEditor (new TextDocument (), options), + new MonoTextEditor (new TextDocument (), options), }; if (!viewOnly) { diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs index c4fc0977e0..85a26669bf 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs @@ -250,7 +250,15 @@ namespace MonoDevelop.VersionControl.Views protected virtual void OnSetVersionControlInfo (VersionControlDocumentInfo info) { } - + + internal virtual TextEditorOptions GetTextEditorOptions () + { + var options = new TextEditorOptions (); + options.CopyFrom (CommonTextEditorOptions.Instance); + options.TabsToSpaces = false; + return options; + } + protected abstract void CreateComponents (); internal static ICollection GetDiffRectangles (MonoTextEditor editor, int startOffset, int endOffset) diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs index f15fbfb253..a4eb5f96ea 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs @@ -100,10 +100,11 @@ namespace MonoDevelop.VersionControl.Views protected override void CreateComponents () { + var options = GetTextEditorOptions (); this.editors = new [] { - new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance), - new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance), - new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance), + new MonoTextEditor (new TextDocument (), options), + new MonoTextEditor (new TextDocument (), options), + new MonoTextEditor (new TextDocument (), options), }; this.editors[0].Document.IsReadOnly = true; -- cgit v1.2.3