diff options
| author | Anže Vodovnik <anvod@microsoft.com> | 2019-07-22 22:04:47 +0300 |
|---|---|---|
| committer | Anže Vodovnik <anvod@microsoft.com> | 2019-07-29 21:21:34 +0300 |
| commit | 406a8f8d49a1ac38a401cc86e1e658dcb0e57706 (patch) | |
| tree | 74704ec0987a7bb09f0448f5600ea43c3e4998b2 /main/src/addins | |
| parent | c958843a8bd99b5db22b3db6897764bab6969a9e (diff) | |
Modify the way the editor reacts to Toggle Folding/Outlining.
We used to rely on the command being remapped to a handler in VSEC, but
that caused a few additional problems, like the menu text not always being
in sync. This fixes https://vsmac.dev/950315.
Diffstat (limited to 'main/src/addins')
| -rw-r--r-- | main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs | 3 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewImports.cs | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs index 558ec7c203..09722e3b1a 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs @@ -440,6 +440,9 @@ namespace MonoDevelop.TextEditor if (editorConfigContext.CurrentConventions.UniversalConventions.TryGetAllowTrailingWhitespace (out var allowTrailingWhitespace)) EditorOptions.SetOptionValue (DefaultOptions.TrimTrailingWhiteSpaceOptionName, !allowTrailingWhitespace); + var foldMargin = PropertyService.Get<bool>("ShowFoldMargin"); + Imports.OutliningManagerService.GetOutliningManager (this.TextView as ITextView).Enabled = foldMargin; + var setVerticalRulers = false; int [] verticalRulers = null; diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewImports.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewImports.cs index 1861089e23..e9cb83dd19 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewImports.cs +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewImports.cs @@ -32,6 +32,7 @@ using Microsoft.VisualStudio.Text.Classification; using Microsoft.VisualStudio.Text.Operations; using Microsoft.VisualStudio.Text.Find; using Microsoft.VisualStudio.Text.Projection; +using Microsoft.VisualStudio.Text.Outlining; namespace MonoDevelop.TextEditor { @@ -78,5 +79,8 @@ namespace MonoDevelop.TextEditor [Import(AllowDefault = true)] internal IInfoBarPresenterFactory InfoBarPresenterFactory { get; set; } + + [Import] + internal IOutliningManagerService OutliningManagerService { get; set; } } }
\ No newline at end of file |