diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2017-05-18 20:14:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-18 20:14:41 +0300 |
| commit | 73a6cfabfa59c36254e39fab9282b90845245f92 (patch) | |
| tree | 8e6f504d15a52055b7bed736184977591af14204 | |
| parent | d1ec1320f933e60359dc52933935003a2b4fb300 (diff) | |
| parent | 30c5a9db7f234d93c1c6f4e60367276d3576aa93 (diff) | |
Merge pull request #2440 from mono/d15-2-fix56078
[D15.2][VCS] Don't set tabs to spaces due to default policy in the diff editor.
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<Cairo.Rectangle> 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; |