diff options
author | Mike Krüger <mikkrg@microsoft.com> | 2018-10-15 13:05:34 +0300 |
---|---|---|
committer | Mike Krüger <mikkrg@microsoft.com> | 2018-10-16 10:05:12 +0300 |
commit | 0923721f139dc0e298678e9bbeb21a18d88afa31 (patch) | |
tree | 00edecb31c56d9ae31a9bd8881c6889b7d0f5c27 /main/src/core/Mono.TextEditor.Shared/Mono.TextEditor | |
parent | b58fedcea3ff7e61f3aeb80eab502905556f236c (diff) |
Fixes VSTS Bug 701970: [Feedback] "Show Invisible Characters" setting
keeps being reset in 7.6
https://devdiv.visualstudio.com/DevDiv/_workitems/edit/701970
Diffstat (limited to 'main/src/core/Mono.TextEditor.Shared/Mono.TextEditor')
-rw-r--r-- | main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/ITextEditorOptions.cs | 17 | ||||
-rw-r--r-- | main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs | 8 |
2 files changed, 5 insertions, 20 deletions
diff --git a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/ITextEditorOptions.cs b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/ITextEditorOptions.cs index 2ea9d7a5af..87031f2987 100644 --- a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/ITextEditorOptions.cs +++ b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/ITextEditorOptions.cs @@ -26,25 +26,10 @@ using System; using Mono.TextEditor.Highlighting; +using MonoDevelop.Ide.Editor; namespace Mono.TextEditor { - enum ShowWhitespaces - { - Never, - Selection, - Always - } - - [Flags] - enum IncludeWhitespaces - { - None = 0, - Space = 1, - Tab = 2, - LineEndings = 4, - All = Space | Tab | LineEndings - } interface ITextEditorOptions : IDisposable { diff --git a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs index e2bc62f70c..2fa9fc3426 100644 --- a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs +++ b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs @@ -477,8 +477,8 @@ namespace Mono.TextEditor } } - ShowWhitespaces showWhitespaces = ShowWhitespaces.Never; - public virtual ShowWhitespaces ShowWhitespaces { + MonoDevelop.Ide.Editor.ShowWhitespaces showWhitespaces = MonoDevelop.Ide.Editor.ShowWhitespaces.Never; + public virtual MonoDevelop.Ide.Editor.ShowWhitespaces ShowWhitespaces { get { return showWhitespaces; } @@ -490,8 +490,8 @@ namespace Mono.TextEditor } } - IncludeWhitespaces includeWhitespaces = IncludeWhitespaces.All; - public virtual IncludeWhitespaces IncludeWhitespaces { + MonoDevelop.Ide.Editor.IncludeWhitespaces includeWhitespaces = MonoDevelop.Ide.Editor.IncludeWhitespaces.All; + public virtual MonoDevelop.Ide.Editor.IncludeWhitespaces IncludeWhitespaces { get { return includeWhitespaces; } |