Make sure the Folding menu item is enabled in the new editor as well.

1 files changed, 9 insertions, 0 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs
index 85b1da0ebf..fd1fd88339 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs
@@ -523,6 +523,14 @@ namespace MonoDevelop.Ide.Gui
 		{
 			info.Text = IsFoldMarkerMarginEnabled ? GettextCatalog.GetString ("Disable _Folding") : GettextCatalog.GetString ("Enable _Folding");
 			info.Enabled = GetContent<IFoldable> () != null;
+
+			// As we need to support both the new and the legacy editor, we need to check if perhaps
+			// we are running in the new one. The legacy editor already implements <see cref="ITextView"/>
+			// so we can't simply look for that and we do not want to import anything related to Cocoa. 
+			if (!info.Enabled) {
+				var textView = GetContent<Microsoft.VisualStudio.Text.Editor.ITextView3> ();
+				info.Enabled = textView != null;
+			}
 		}
 
 		[CommandUpdateHandler (EditCommands.ToggleAllFoldings)]
@@ -542,6 +550,7 @@ namespace MonoDevelop.Ide.Gui
 		[CommandHandler (EditCommands.FoldDefinitions)]
 		protected void FoldDefinitions ()
 		{
+			Microsoft.VisualStudio.Text.Editor.ITextView textView;
 			GetContent <IFoldable> ().FoldDefinitions ();
 		}