Make type discovery async

Author: nosami

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

@@ -93,7 +93,7 @@ public override void VisitNamedType (INamedTypeSymbol symbol)
 				Visit (type);
 			}
 
-            if(IncludeTypeInAddViewModelClassDropdown(symbol))
+			if (IncludeTypeInAddViewModelClassDropdown (symbol))
 				_types.Add (symbol);
 		}
 
@@ -111,7 +111,7 @@ public static bool IncludeTypeInAddViewModelClassDropdown (INamedTypeSymbol symb
 
 		static bool IsDerivedFromFilteredBaseClass (INamedTypeSymbol t)
 		{
-			if (_filteredBaseClasses.Any (baseClass => t.GetFullMetadataName().Equals (baseClass, StringComparison.Ordinal))) {
+			if (_filteredBaseClasses.Any (baseClass => t.GetFullMetadataName ().Equals (baseClass, StringComparison.Ordinal))) {
 				return true;
 			}
 			if (t.BaseType != null) {

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

@@ -24,6 +24,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System.Linq;
+using System.Threading.Tasks;
+using MonoDevelop.Core;
 using Xwt;
 
 namespace MonoDevelop.AspNetCore.Scaffolding
@@ -69,21 +71,30 @@ protected override Widget GetMainControl ()
 						comboBox = new ComboBox ();
                     }
 
-					foreach (var option in comboField.Options) {
-						comboBox.Items.Add (option);
-					}
+					Task.Run (async () => {
+						var options = await comboField.Options.ConfigureAwait (false);
+
+						await Runtime.RunInMainThread (() =>
+						 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;
+						 }));
+					});
+					
+					
 
 					label.Text = comboField.DisplayName;
 
 					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;

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

@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace MonoDevelop.AspNetCore.Scaffolding
 {
@@ -49,11 +50,11 @@ IEnumerable<ScaffolderField> GetFields()
 				LayoutPageField
 			};
 
-			string [] viewTemplateOptions = new [] { "Empty", "Create", "Edit", "Delete", "Details", "List" };
+			IEnumerable<string> viewTemplateOptions = new [] { "Empty", "Create", "Edit", "Delete", "Details", "List" };
 
 			fields = new ScaffolderField [] {
 				NameField,
-				new ComboField ("", "The template to use, supported view templates", viewTemplateOptions),
+				new ComboField ("", "The template to use, supported view templates", Task.FromResult(viewTemplateOptions)),
 				GetModelField(args.Project),
 				GetDbContextField(args.Project),
 				new BoolFieldList(options),

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

@@ -23,8 +23,10 @@
 // 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.Threading.Tasks;
 using Microsoft.CodeAnalysis.FindSymbols;
 using MonoDevelop.Ide;
 using MonoDevelop.Projects;
@@ -46,42 +48,39 @@ abstract class ScaffolderBase
 
 		protected ComboField GetDbContextField (DotNetProject project)
 		{
-			var dbContexts = GetDbContextClasses (project);
-			return new ComboField ("--dataContext", "DbContext class to use", dbContexts.ToArray (), isEditable: true);
+			return new ComboField ("--dataContext", "DbContext class to use", GetDbContextClassesAsync(project), isEditable: true);
 		}
 
 		protected ComboField GetModelField (DotNetProject project)
 		{
-			var dbModels = GetModelClasses (project);
-			return new ComboField ("--model", "Model class to use", dbModels.ToArray (), isEditable: true);
+			return new ComboField ("--model", "Model class to use", GetModelClassesAsync(project), isEditable: true);
 		}
 
-		IEnumerable<string> GetDbContextClasses (DotNetProject project)
+		async Task<IEnumerable<string>> GetDbContextClassesAsync (DotNetProject project)
 		{
-			//TODO: make async
-			var compilation = IdeApp.TypeSystemService.GetCompilationAsync (project).Result;
+			var compilation = await IdeApp.TypeSystemService.GetCompilationAsync (project);
 			if (compilation != null) {
 				var dbContext = compilation.GetTypeByMetadataName (EFCDbContextTypeName)
 							 ?? compilation.GetTypeByMetadataName (DbContextTypeName)
 							 ?? compilation.GetTypeByMetadataName (EF7DbContextTypeName);
 
 				if (dbContext != null) {
-					var result = SymbolFinder.FindDerivedClassesAsync (dbContext, IdeApp.TypeSystemService.Workspace.CurrentSolution).Result;
+					var result = await SymbolFinder.FindDerivedClassesAsync (dbContext, IdeApp.TypeSystemService.Workspace.CurrentSolution);
 
 					return result.Where (ModelVisitor.IncludeTypeInAddViewModelClassDropdown).Select (c => c.MetadataName).Distinct().OrderBy (x => x);
 				}
 			}
+
 			return Enumerable.Empty<string> ();
 		}
 
-		IEnumerable<string> GetModelClasses (DotNetProject project)
+		async Task<IEnumerable<string>> GetModelClassesAsync (DotNetProject project)
 		{
-			//TODO: make async
-			var compilation = IdeApp.TypeSystemService.GetCompilationAsync (project).Result;
+			var compilation = await IdeApp.TypeSystemService.GetCompilationAsync (project);
 			if (compilation != null) {
-
 				var modelTypes = ModelVisitor.FindModelTypes (compilation.Assembly);
-				return modelTypes.Select (t => t.MetadataName).Distinct().OrderBy (x => x);
+				var dbContextTypes = await GetDbContextClassesAsync (project);
+				return modelTypes.Select (t => t.MetadataName).Except(dbContextTypes).Distinct().OrderBy (x => x);
 			}
 			return Enumerable.Empty<string> ();
 		}