diff options
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs | 4 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs index 5b3c3ad055..d7a6a7fba7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs @@ -884,9 +884,7 @@ namespace MonoDevelop.Ide.Gui adhocSolution = new Solution (); adhocSolution.AddConfiguration ("", true); adhocSolution.DefaultSolutionFolder.AddItem (newProject); - MonoDevelopWorkspace.LoadingFinished -= TypeSystemService_WorkspaceItemLoaded; - return TypeSystemService.Load (adhocSolution, new ProgressMonitor (), token).ContinueWith (task => { - MonoDevelopWorkspace.LoadingFinished += TypeSystemService_WorkspaceItemLoaded; + return TypeSystemService.Load (adhocSolution, new ProgressMonitor (), token, false).ContinueWith (task => { if (token.IsCancellationRequested) return; UnsubscribeRoslynWorkspace (); diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs index 3e3c656480..98fb53d313 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.TypeSystem/TypeSystemService_WorkspaceHandling.cs @@ -112,16 +112,16 @@ namespace MonoDevelop.Ide.TypeSystem } } - internal static async Task<List<MonoDevelopWorkspace>> Load (WorkspaceItem item, ProgressMonitor progressMonitor, CancellationToken cancellationToken = default(CancellationToken)) + internal static async Task<List<MonoDevelopWorkspace>> Load (WorkspaceItem item, ProgressMonitor progressMonitor, CancellationToken cancellationToken = default (CancellationToken), bool showStatusIcon = true) { using (Counters.ParserService.WorkspaceItemLoaded.BeginTiming ()) { var wsList = new List<MonoDevelopWorkspace> (); //If we want BeginTiming to work correctly we need to `await` - return await InternalLoad (wsList, item, progressMonitor, cancellationToken).ContinueWith (t => { t.Wait (); return wsList; }); + return await InternalLoad (wsList, item, progressMonitor, cancellationToken, showStatusIcon).ContinueWith (t => { t.Wait (); return wsList; }); } } - static Task InternalLoad (List<MonoDevelopWorkspace> list, MonoDevelop.Projects.WorkspaceItem item, ProgressMonitor progressMonitor, CancellationToken cancellationToken = default(CancellationToken)) + static Task InternalLoad (List<MonoDevelopWorkspace> list, MonoDevelop.Projects.WorkspaceItem item, ProgressMonitor progressMonitor, CancellationToken cancellationToken = default(CancellationToken), bool showStatusIcon = true) { return Task.Run (async () => { var ws = item as MonoDevelop.Projects.Workspace; @@ -138,14 +138,16 @@ namespace MonoDevelop.Ide.TypeSystem lock (workspaceLock) workspaces = workspaces.Add (workspace); list.Add (workspace); - workspace.ShowStatusIcon (); + if (showStatusIcon) + workspace.ShowStatusIcon (); await workspace.TryLoadSolution (cancellationToken).ConfigureAwait (false); solution.SolutionItemAdded += OnSolutionItemAdded; solution.SolutionItemRemoved += OnSolutionItemRemoved; TaskCompletionSource<MonoDevelopWorkspace> request; if (workspaceRequests.TryGetValue (solution, out request)) request.TrySetResult (workspace); - workspace.HideStatusIcon (); + if (showStatusIcon) + workspace.HideStatusIcon (); } } }); |