New Scaffolding should not appear on Dependencies node. Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1024771

nosami · nosami · commit 601a90410111 · 2019-11-21T15:48:58.000-05:00
diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/ScaffoldCommandHandler.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Commands/ScaffoldCommandHandler.cs
@@ -49,8 +49,12 @@ public async void Scaffold ()
 		public void ScaffoldUpdate (CommandInfo info)
 		{
 			var project = CurrentNode.GetParentDataItem (typeof (DotNetProject), true) as DotNetProject;
-
-			info.Enabled = info.Visible = IsAspNetCoreProject (project);
+			info.Enabled = info.Visible = NodeIsFileOrFolder(CurrentNode) && IsAspNetCoreProject (project);
+		}
+
+		bool NodeIsFileOrFolder (ITreeNavigator node)
+		{
+			return node.DataItem is ProjectFile || node.DataItem is ProjectFolder;
 		}
 
 		bool IsAspNetCoreProject (Project project)

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