Merge pull request #9381 from mono/fix-1027657

nosami · web-flow · commit c02dc2e4ac56 · 2019-11-26T20:23:58.000Z
Scaffolding is enabled for Project + Folder
diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/ScaffoldCommandHandler.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/ScaffoldCommandHandler.cs
@@ -52,12 +52,12 @@ public void Scaffold ()
 		public void ScaffoldUpdate (CommandInfo info)
 		{
 			var project = CurrentNode.GetParentDataItem (typeof (DotNetProject), true) as DotNetProject;
-			info.Enabled = info.Visible = NodeIsFileOrFolder(CurrentNode) && IsAspNetCoreProject (project);
+			info.Enabled = info.Visible = NodeIsProjectOrFolder(CurrentNode) && IsAspNetCoreProject (project);
 		}
 
-		static bool NodeIsFileOrFolder (ITreeNavigator node)
-		{
-			return node.DataItem is ProjectFile || node.DataItem is ProjectFolder;
+		static bool NodeIsProjectOrFolder (ITreeNavigator node)
+		{
+			return node.DataItem is Project || node.DataItem is ProjectFolder;
 		}
 
 		bool IsAspNetCoreProject (Project project)

Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,12 @@ public void Scaffold ()`
`52`	`52`	`public void ScaffoldUpdate (CommandInfo info)`
`53`	`53`	`{`
`54`	`54`	`var project = CurrentNode.GetParentDataItem (typeof (DotNetProject), true) as DotNetProject;`
`55`		`- info.Enabled = info.Visible = NodeIsFileOrFolder(CurrentNode) && IsAspNetCoreProject (project);`
	`55`	`+ info.Enabled = info.Visible = NodeIsProjectOrFolder(CurrentNode) && IsAspNetCoreProject (project);`
`56`	`56`	`}`
`57`	`57`
`58`		`- static bool NodeIsFileOrFolder (ITreeNavigator node)`
`59`		`- {`
`60`		`- return node.DataItem is ProjectFile \|\| node.DataItem is ProjectFolder;`
	`58`	`+ static bool NodeIsProjectOrFolder (ITreeNavigator node)`
	`59`	`+ {`
	`60`	`+ return node.DataItem is Project \|\| node.DataItem is ProjectFolder;`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`bool IsAspNetCoreProject (Project project)`