Merge pull request #9367 from mono/fix-1024771

New Scaffolding should not appear on Dependencies node. Fixes https:/…

Author: nosami

main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/ScaffoldCommandHandler.cs

@@ -1,63 +1,67 @@
-using System;
-using System.Linq;
-using System.Threading;
-using MonoDevelop.AspNetCore.Scaffolding;
-using MonoDevelop.Components.Commands;
-using MonoDevelop.Ide;
-using MonoDevelop.Ide.Gui.Components;
-using MonoDevelop.Ide.Gui.Pads.ProjectPad;
-using MonoDevelop.Projects;
-
-namespace MonoDevelop.AspNetCore.Commands
-{
-	enum AspNetCoreCommands
-	{
-		Scaffold
-	}
-
-	class ScaffoldNodeExtension : NodeBuilderExtension
-	{
-		public override Type CommandHandlerType {
-			get { return typeof (ScaffoldCommandHandler); }
-		}
-
-		public override bool CanBuildNode (Type dataType)
-		{
-			return true;
-		}
-	}
-
-	class ScaffoldCommandHandler : NodeCommandHandler
-	{
-		[CommandHandler (AspNetCoreCommands.Scaffold)]
-		public async void Scaffold ()
-		{
-			var project = IdeApp.ProjectOperations.CurrentSelectedProject as DotNetProject;
-			if (project == null)
-				return;
-
-			var folder = CurrentNode.GetParentDataItem (typeof (ProjectFolder), true) as ProjectFolder;
-			string parentFolder = folder?.Path ?? project.BaseDirectory;
-
-			Xwt.Toolkit.NativeEngine.Invoke (() => {
-				var w = new ScaffolderWizard (project, parentFolder);
-				var res = w.RunWizard ();
-			});
-		}
-
+using System;
+using System.Linq;
+using System.Threading;
+using MonoDevelop.AspNetCore.Scaffolding;
+using MonoDevelop.Components.Commands;
+using MonoDevelop.Ide;
+using MonoDevelop.Ide.Gui.Components;
+using MonoDevelop.Ide.Gui.Pads.ProjectPad;
+using MonoDevelop.Projects;
+
+namespace MonoDevelop.AspNetCore.Commands
+{
+	enum AspNetCoreCommands
+	{
+		Scaffold
+	}
+
+	class ScaffoldNodeExtension : NodeBuilderExtension
+	{
+		public override Type CommandHandlerType {
+			get { return typeof (ScaffoldCommandHandler); }
+		}
+
+		public override bool CanBuildNode (Type dataType)
+		{
+			return true;
+		}
+	}
+
+	class ScaffoldCommandHandler : NodeCommandHandler
+	{
+		[CommandHandler (AspNetCoreCommands.Scaffold)]
+		public void Scaffold ()
+		{
+			var project = IdeApp.ProjectOperations.CurrentSelectedProject as DotNetProject;
+			if (project == null)
+				return;
+
+			var folder = CurrentNode.GetParentDataItem (typeof (ProjectFolder), true) as ProjectFolder;
+			string parentFolder = folder?.Path ?? project.BaseDirectory;
+
+			Xwt.Toolkit.NativeEngine.Invoke (() => {
+				var w = new ScaffolderWizard (project, parentFolder);
+				var res = w.RunWizard ();
+			});
+		}
+
 		[CommandUpdateHandler (AspNetCoreCommands.Scaffold)]
 		public void ScaffoldUpdate (CommandInfo info)
 		{
 			var project = CurrentNode.GetParentDataItem (typeof (DotNetProject), true) as DotNetProject;
+			info.Enabled = info.Visible = NodeIsFileOrFolder(CurrentNode) && IsAspNetCoreProject (project);
+		}
+
+		static bool NodeIsFileOrFolder (ITreeNavigator node)
+		{
+			return node.DataItem is ProjectFile || node.DataItem is ProjectFolder;
+		}
 
-			info.Enabled = info.Visible = IsAspNetCoreProject (project);
-		}
-
 		bool IsAspNetCoreProject (Project project)
-		{
-			//TODO: this only checks for SDK style project
-			return project != null
+		{
+			//TODO: this only checks for SDK style project
+			return project != null
 				&& (project.MSBuildProject.GetReferencedSDKs ().FirstOrDefault (x => x.IndexOf ("Microsoft.NET.Sdk.Web", StringComparison.OrdinalIgnoreCase) != -1) != null);
 		}
-	}
-}
+	}
+}