Merge pull request #9208 from mono/fix-1013322

Fix 1013322

Author: nosami

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

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Threading;
 using MonoDevelop.AspNetCore.Scaffolding;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;

main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/Fields/ComboField.cs

@@ -24,19 +24,20 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using System.Linq;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.AspNetCore.Scaffolding
 {
 	class ComboField : ScaffolderField
 	{
-		public ComboField (string commandLineName, string displayName, string [] options, bool isEditable = false) : base (commandLineName, displayName)
+		public ComboField (string commandLineName, string displayName, Task<IEnumerable<string>> options, bool isEditable = false) : base (commandLineName, displayName)
 		{
 			Options = options;
 			IsEditable = isEditable;
 		}
 
 		public bool IsEditable { get; }
-		public string [] Options { get; }
+		public Task<IEnumerable<string>> Options { get; }
 	}
 }

main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ModelVisitor.cs

@@ -23,23 +23,50 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
 using Microsoft.CodeAnalysis;
+using MonoDevelop.Ide.TypeSystem;
 
 namespace MonoDevelop.AspNetCore.Scaffolding
 {
+	/// <summary>
+	/// Return any type that doesn't have one of the filtered base classes, or one of the filtered assembly
+	/// public keys
+	/// </summary>
 	class ModelVisitor : SymbolVisitor
 	{
+		static readonly string [] _filteredBaseClasses = new string [] {
+			"System.Web.WebPages.WebPageExecutingBase",     // Base class for Razor views
+			"System.Web.UI.TemplateControl",                // Base class for ASPX views
+			"System.Web.HttpApplication",                   // Base class for Global.asax
+			"System.Web.Mvc.Controller",                    // Base class for MVC controllers
+			"System.Web.Http.ApiController"                 // Base class for API controllers
+		};
+
+		static readonly string [] _filteredPublicKeys = new string [] {
+			"b77a5c561934e089",     // CLR types (mscorlib, System.dll, System.Core.dll, etc.)
+			"b03f5f7f11d50a3a",     // System.Web and friends
+			"31bf3856ad364e35",     // System.ComponentModel.DataAnnotations and friends
+			"89845dcd8080cc91",     // System.Data.SqlServerCE
+			"30ad4fe6b2a6aeed",     // Newtonsoft.Json
+			"2780ccd10d57b246",     // DotNetOpenAuth
+		};
+
+		static readonly Dictionary<AssemblyIdentity, bool> _assemblyKeyFilteredCache = new Dictionary<AssemblyIdentity, bool> ();
+
 		public static List<ITypeSymbol> FindModelTypes (IAssemblySymbol assembly)
 		{
 			var visitor = new ModelVisitor ();
 			visitor.Visit (assembly);
 			return visitor._types;
 		}
 
-		private readonly List<ITypeSymbol> _types;
+		readonly List<ITypeSymbol> _types;
 
-		private ModelVisitor ()
+		ModelVisitor ()
 		{
 			_types = new List<ITypeSymbol> ();
 		}
@@ -62,7 +89,46 @@ public override void VisitNamespace (INamespaceSymbol symbol)
 
 		public override void VisitNamedType (INamedTypeSymbol symbol)
 		{
-			_types.Add (symbol);
+			foreach (var type in symbol.GetTypeMembers ()) {
+				Visit (type);
+			}
+
+			if (IncludeTypeInAddViewModelClassDropdown (symbol))
+				_types.Add (symbol);
+		}
+
+		public static bool IncludeTypeInAddViewModelClassDropdown (INamedTypeSymbol symbol)
+		{
+			return symbol.DeclaredAccessibility == Accessibility.Public
+				   && !symbol.IsStatic
+				   && !symbol.IsGenericType
+				   && !symbol.IsImplicitClass
+				   && !symbol.IsAnonymousType
+				   && !symbol.GetAttributes ().OfType<CompilerGeneratedAttribute> ().Any ()
+				   && !IsSignedWithFilteredPublicKey (symbol)
+				   && !IsDerivedFromFilteredBaseClass (symbol);
+		}
+
+		static bool IsDerivedFromFilteredBaseClass (INamedTypeSymbol t)
+		{
+			if (_filteredBaseClasses.Any (baseClass => t.GetFullMetadataName ().Equals (baseClass, StringComparison.Ordinal))) {
+				return true;
+			}
+			if (t.BaseType != null) {
+				return IsDerivedFromFilteredBaseClass (t.BaseType);
+			}
+			return false;
+		}
+
+		static bool IsSignedWithFilteredPublicKey (INamedTypeSymbol t)
+		{
+			var assembly = t.ContainingAssembly;
+			if (!_assemblyKeyFilteredCache.TryGetValue (assembly.Identity, out var isFilteredKey)) {
+				string publicKeyToken = BitConverter.ToString (assembly.Identity.PublicKeyToken.ToArray ()).Replace ("-", string.Empty);
+				isFilteredKey = _filteredPublicKeys.Any (key => publicKeyToken.Equals (key, StringComparison.OrdinalIgnoreCase));
+				_assemblyKeyFilteredCache [assembly.Identity] = isFilteredKey;
+			}
+			return isFilteredKey;
 		}
 	}
 }

main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderArgs.cs

@@ -23,10 +23,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Reflection;
-using MonoDevelop.Components;
+using System.Threading;
 using MonoDevelop.Core;
 using MonoDevelop.Projects;
 
@@ -43,5 +40,6 @@ public override int GetHashCode ()
 
 		public DotNetProject Project { get; internal set; }
 		public FilePath ParentFolder { get; internal set; }
+		public CancellationToken CancellationToken { get; internal set; }
 	}
 }

main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderDialogController.cs

@@ -40,8 +40,7 @@ class ScaffolderDialogController : WizardDialogControllerBase
 		readonly ScaffolderArgs args;
 
 		readonly IWizardDialogPage firstPage;
-
-		Dictionary<ScaffolderArgs, ScaffolderTemplateConfigurePage> cachedPages
+		readonly Dictionary<ScaffolderArgs, ScaffolderTemplateConfigurePage> cachedPages
 			= new Dictionary<ScaffolderArgs, ScaffolderTemplateConfigurePage> ();
 
 		public override bool CanGoBack {
@@ -61,13 +60,13 @@ public ScaffolderDialogController (string title, Image icon, IWizardDialogPage f
 			this.args = args;
 		}
 
-		ScaffolderTemplateConfigurePage GetConfigurePage (ScaffolderArgs args)
+		ScaffolderTemplateConfigurePage GetConfigurePage (ScaffolderArgs args, CancellationToken token)
 		{
 			// we want to return the same instance for the same args
 			if (cachedPages.ContainsKey (args)) {
 				return cachedPages [args];
 			} else {
-				var page = new ScaffolderTemplateConfigurePage (args);
+				var page = new ScaffolderTemplateConfigurePage (args, token);
 				cachedPages.Add (args, page);
 				return page;
 			}
@@ -77,7 +76,7 @@ protected override Task<IWizardDialogPage> OnGoNext (CancellationToken token)
 		{
 			switch (CurrentPage) {
 			case ScaffolderTemplateSelectPage _:
-				IWizardDialogPage configPage = GetConfigurePage (args);
+				IWizardDialogPage configPage = GetConfigurePage (args, token);
 				return Task.FromResult (configPage);
 			}
 			return Task.FromException<IWizardDialogPage> (new InvalidOperationException ());

main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs

@@ -24,18 +24,22 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MonoDevelop.Core;
 using Xwt;
 
 namespace MonoDevelop.AspNetCore.Scaffolding
 {
 	class ScaffolderTemplateConfigurePage : ScaffolderWizardPageBase
 	{
-		ScaffolderBase scaffolder;
+		readonly ScaffolderBase scaffolder;
 
-		public ScaffolderTemplateConfigurePage (ScaffolderArgs args) : base (args)
+		public ScaffolderTemplateConfigurePage (ScaffolderArgs args, CancellationToken token) : base (args)
 		{
 			scaffolder = args.Scaffolder;
-			this.SubSubTitle = scaffolder.Name;
+			SubSubTitle = scaffolder.Name;
+			args.CancellationToken = token;
 		}
 
 		protected override Widget GetMainControl ()
@@ -45,16 +49,16 @@ protected override Widget GetMainControl ()
 
 			var rowCount = fields.Count ();
 			int rowAdditionCount = 0;
-			for(int fieldIndex = 0; fieldIndex < rowCount; fieldIndex++) {
+			for (int fieldIndex = 0; fieldIndex < rowCount; fieldIndex++) {
 				int rowIndex = fieldIndex + rowAdditionCount;
-				var field = fields[fieldIndex];
+				var field = fields [fieldIndex];
 				var label = new Label ();
 
 				switch (field) {
 				case StringField s:
 					var input = new TextEntry ();
 					label.Text = s.DisplayName;
-					table.Add (label, 0, rowIndex, hpos:WidgetPlacement.End);
+					table.Add (label, 0, rowIndex, hpos: WidgetPlacement.End);
 					table.Add (input, 1, rowIndex);
 					input.Changed += (sender, args) => s.SelectedValue = input.Text;
 					input.SetFocus ();
@@ -65,38 +69,50 @@ protected override Widget GetMainControl ()
 						var comboBoxEntry = new ComboBoxEntry ();
 						comboBoxEntry.TextEntry.Changed += (sender, args) => comboField.SelectedValue = comboBoxEntry.TextEntry.Text;
 						comboBox = comboBoxEntry;
-                    } else {
+					} else {
 						comboBox = new ComboBox ();
-                    }
-
-					foreach (var option in comboField.Options) {
-						comboBox.Items.Add (option);
 					}
 
+					Task.Run (async () => {
+						var options = await comboField.Options;
+						await Runtime.RunInMainThread (() => {
+							if (Args.CancellationToken.IsCancellationRequested) {
+								return;
+							}
+							Xwt.Toolkit.NativeEngine.Invoke (() => {
+								foreach (var option in options) {
+									comboBox.Items.Add (option);
+								}
+								comboField.SelectedValue = options.FirstOrDefault ();
+								if (comboBox.Items.Count > 0)
+									comboBox.SelectedIndex = 0;
+							});
+
+						});
+					}, Args.CancellationToken);
+
 					label.Text = comboField.DisplayName;
 
-					table.Add (label, 0, rowIndex, hpos:WidgetPlacement.End);
+					table.Add (label, 0, rowIndex, hpos: WidgetPlacement.End);
 					table.Add (comboBox, 1, rowIndex);
-					comboField.SelectedValue = comboField.Options.FirstOrDefault ();
 					comboBox.TextInput += (sender, args) => comboField.SelectedValue = comboBox.SelectedText;
 
 					comboBox.SelectionChanged += (sender, args) => comboField.SelectedValue = comboBox.SelectedText;
 
-					if (comboBox.Items.Count > 0)
-						comboBox.SelectedIndex = 0;
 					break;
 				case BoolFieldList boolFieldList:
 					label.Text = boolFieldList.DisplayName;
-					table.Add (label, 0, rowIndex, hpos:WidgetPlacement.End, vpos:WidgetPlacement.Start);
+					table.Add (label, 0, rowIndex, hpos: WidgetPlacement.End, vpos: WidgetPlacement.Start);
 					var vbox = new VBox ();
-                    for(int i = 0; i < boolFieldList.Options.Count; i++) {
+					for (int i = 0; i < boolFieldList.Options.Count; i++) {
 						var boolField = boolFieldList.Options [i];
-						var checkbox = new CheckBox (boolField.DisplayName);
-						checkbox.Active = boolField.Selected;
-						checkbox.Sensitive = boolField.Enabled;
+						var checkbox = new CheckBox (boolField.DisplayName) {
+							Active = boolField.Selected,
+							Sensitive = boolField.Enabled
+						};
 						checkbox.Toggled += (sender, args) => boolField.Selected = checkbox.Active;
 						vbox.PackStart (checkbox);
-                    }
+					}
 					table.Add (vbox, 1, rowIndex);
 					break;
 				case FileField fileField:
@@ -105,15 +121,15 @@ protected override Widget GetMainControl ()
 						// This doesn't work with native toolkit!
 						var filter = new FileDialogFilter (fileField.FilterWildcard, fileField.FilterWildcard);
 						fileSelector.Filters.Add (filter);
-                    }
-					table.Add (fileSelector, 0, rowIndex, colspan:2);
+					}
+					table.Add (fileSelector, 0, rowIndex, colspan: 2);
 					label.Text = fileField.DisplayName;
-					table.Add (label, 0, rowIndex + 1, colspan:2);
+					table.Add (label, 0, rowIndex + 1, colspan: 2);
 					rowAdditionCount++;
 					fileSelector.FileChanged += (sender, args) => fileField.SelectedValue = fileSelector.FileName;
 					break;
 				}
-				
+
 			}
 			return table;
 		}

main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateSelectPage.cs

@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using System.Threading;
 using Xwt;
 using Xwt.Drawing;
 

main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderWizard.cs

@@ -1,4 +1,4 @@
-//
+//
 // Scaffolder.cs
 //
 // Author:
@@ -26,6 +26,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using MonoDevelop.Components;
 using MonoDevelop.Core;
@@ -153,7 +154,7 @@ internal string GetArguments (ScaffolderArgs args)
 			argBuilder.AddQuoted (project.FileName);
 			argBuilder.Add (args.Scaffolder.CommandLineName);
 
-			foreach(var field in args.Scaffolder.Fields) {
+			foreach (var field in args.Scaffolder.Fields) {
 				argBuilder.Add (field.CommandLineName);
 				argBuilder.Add (field.SelectedValue);
 			}

main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderWizardPageBase.cs

@@ -44,7 +44,7 @@ public string SubSubTitle {
 			protected set => subSubTitle = value;
 		}
 
-		public ScaffolderArgs Args { get; }
+		protected ScaffolderArgs Args { get; }
 
 		protected override Control CreateControl ()
 		{

main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/Scaffolders/ApiControllerEntityFrameworkScaffolder.cs

@@ -44,8 +44,8 @@ public ApiControllerEntityFrameworkScaffolder (ScaffolderArgs args) : base (args
 		IEnumerable<ScaffolderField> GetFields ()
 		{
 			fields = new ScaffolderField [] {
-				GetModelField(args.Project),
-				GetDbContextField(args.Project),
+				GetModelField(args),
+				GetDbContextField(args),
 new StringField ("-name", "Controller name:"),
 
 			};