R3 SubscribeAwait ConfigureAwait false

Author: MattParkerDev

src/SharpIDE.Godot/Features/CodeEditor/CodeEditorPanel.cs

@@ -196,7 +196,7 @@ await this.InvokeAsync(() =>
 				{
 					var (name, isDirty) = x;
 					await UpdateTabFileName(newTab.GetIndex(), name, isDirty);
-				})
+				}, configureAwait: false)
 				.AddTo(newTab); // needs to be on ui thread
 		});
 

src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs

@@ -337,7 +337,7 @@ public async Task SetSharpIdeFile(SharpIdeFile file, SharpIdeFileLinePosition? f
 				{
 					var projectDiagnosticsForFile = project.Diagnostics.Where(s => s.FilePath == _currentFile.Path).ToImmutableArray();
 					await this.InvokeAsync(() => SetProjectDiagnostics(projectDiagnosticsForFile));
-				});
+				}, configureAwait: false);
 		}
 
 		var syntaxHighlighting = _roslynAnalysis.GetDocumentSyntaxHighlighting(_currentFile);

src/SharpIDE.Godot/Features/Problems/ProblemsPanel.cs

@@ -54,7 +54,7 @@ public void BindToTree(ObservableHashSet<SharpIdeProjectModel> list)
                 NotifyCollectionChangedAction.Add => CreateProjectTreeItem(_tree, _rootItem, e),
                 NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
                 _ => Task.CompletedTask
-            })).AddTo(this);
+            }), configureAwait: false).AddTo(this);
     }
 
     private async Task CreateProjectTreeItem(Tree tree, TreeItem parent, ViewChangedEvent<SharpIdeProjectModel, TreeItemContainer> e)
@@ -67,7 +67,7 @@ await this.InvokeAsync(() =>
             e.NewItem.View.Value = treeItem;
 
             Observable.EveryValueChanged(e.NewItem.Value, s => s.Diagnostics.Count).SubscribeOnThreadPool().ObserveOnThreadPool()
-                .SubscribeAwait(async (s, ct) => await this.InvokeAsync(() => treeItem.Visible = s is not 0)).AddTo(this);
+                .SubscribeAwait(async (s, ct) => await this.InvokeAsync(() => treeItem.Visible = s is not 0), configureAwait: false).AddTo(this);
 
             var projectDiagnosticsView = e.NewItem.Value.Diagnostics.CreateView(y => new TreeItemContainer());
             projectDiagnosticsView.ObserveChanged().SubscribeOnThreadPool().ObserveOnThreadPool()
@@ -76,7 +76,7 @@ await this.InvokeAsync(() =>
                     NotifyCollectionChangedAction.Add => CreateDiagnosticTreeItem(_tree, treeItem, innerEvent),
                     NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
                     _ => Task.CompletedTask
-                })).AddTo(this);
+                }), configureAwait: false).AddTo(this);
         });
     }
 

src/SharpIDE.Godot/Features/SolutionExplorer/SolutionExplorerPanel.cs

@@ -174,7 +174,7 @@ public async Task BindToSolution(SharpIdeSolutionModel solution)
 			    NotifyCollectionChangedAction.Add => this.InvokeAsync(() => e.NewItem.View.Value = CreateProjectTreeItem(_tree, _rootItem, e.NewItem.Value)),
 	            NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
 	            _ => Task.CompletedTask
-	        })).AddToDeferred(this);
+	        }), configureAwait: false).AddToDeferred(this);
 
 	    // Observe Solution Folders
 	    var foldersView = solution.SlnFolders.CreateView(y => new TreeItemContainer());
@@ -185,7 +185,7 @@ public async Task BindToSolution(SharpIdeSolutionModel solution)
 	            NotifyCollectionChangedAction.Add => this.InvokeAsync(() => e.NewItem.View.Value = CreateSlnFolderTreeItem(_tree, _rootItem, e.NewItem.Value)),
 	            NotifyCollectionChangedAction.Remove => FreeTreeItem(e.OldItem.View.Value),
 	            _ => Task.CompletedTask
-	        })).AddToDeferred(this);
+	        }), configureAwait: false).AddToDeferred(this);
 
 	    rootItem.SetCollapsedRecursive(true);
 	    rootItem.Collapsed = false;
@@ -213,7 +213,7 @@ private TreeItem CreateSlnFolderTreeItem(Tree tree, TreeItem parent, SharpIdeSol
                 NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateSlnFolderTreeItem(_tree, folderItem, innerEvent.NewItem.Value)),
                 NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
                 _ => Task.CompletedTask
-            })).AddToDeferred(this);
+            }), configureAwait: false).AddToDeferred(this);
 
         var projectsView = slnFolder.Projects.CreateView(y => new TreeItemContainer());
         projectsView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateProjectTreeItem(_tree, folderItem, s.Value));
@@ -223,7 +223,7 @@ private TreeItem CreateSlnFolderTreeItem(Tree tree, TreeItem parent, SharpIdeSol
                 NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateProjectTreeItem(_tree, folderItem, innerEvent.NewItem.Value)),
                 NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
                 _ => Task.CompletedTask
-            })).AddToDeferred(this);
+            }), configureAwait: false).AddToDeferred(this);
 
         var filesView = slnFolder.Files.CreateView(y => new TreeItemContainer());
         filesView.Unfiltered.ToList().ForEach(s => s.View.Value = CreateFileTreeItem(_tree, folderItem, s.Value));
@@ -233,7 +233,7 @@ private TreeItem CreateSlnFolderTreeItem(Tree tree, TreeItem parent, SharpIdeSol
                 NotifyCollectionChangedAction.Add => this.InvokeAsync(() => innerEvent.NewItem.View.Value = CreateFileTreeItem(_tree, folderItem, innerEvent.NewItem.Value, innerEvent.NewStartingIndex)),
                 NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
                 _ => Task.CompletedTask
-            })).AddToDeferred(this);
+            }), configureAwait: false).AddToDeferred(this);
         return folderItem;
 	}
 
@@ -263,7 +263,7 @@ await this.InvokeAsync(() =>
 				projectItem.SetIcon(0, newIcon);
 				projectItem.SetSuffix(0, suffix);
 			});
-		}).AddToDeferred(this);
+		}, configureAwait: false).AddToDeferred(this);
 
 		// Observe project folders
 		var foldersView = projectModel.Folders.CreateView(y => new TreeItemContainer());
@@ -276,7 +276,7 @@ await this.InvokeAsync(() =>
 				NotifyCollectionChangedAction.Move => MoveTreeItem(_tree, innerEvent.NewItem.View, innerEvent.NewItem.Value, innerEvent.OldStartingIndex, innerEvent.NewStartingIndex),
 				NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
 				_ => Task.CompletedTask
-			})).AddToDeferred(this);
+			}), configureAwait: false).AddToDeferred(this);
 
 		// Observe project files
 		var filesView = projectModel.Files.CreateView(y => new TreeItemContainer());
@@ -288,7 +288,7 @@ await this.InvokeAsync(() =>
 				NotifyCollectionChangedAction.Move => MoveTreeItem(_tree, innerEvent.NewItem.View, innerEvent.NewItem.Value, innerEvent.OldStartingIndex, innerEvent.NewStartingIndex),
 				NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
 				_ => Task.CompletedTask
-			})).AddToDeferred(this);
+			}), configureAwait: false).AddToDeferred(this);
 		return projectItem;
 	}
 
@@ -304,7 +304,7 @@ private TreeItem CreateFolderTreeItem(Tree tree, TreeItem parent, SharpIdeFolder
 			.Skip(1).SubscribeOnThreadPool().ObserveOnThreadPool().SubscribeAwait(async (s, ct) =>
 			{
 				await this.InvokeAsync(() => folderItem.SetText(0, s));
-			}).AddToDeferred(this);
+			}, configureAwait: false).AddToDeferred(this);
 
 		// Observe subfolders
 		var subFoldersView = sharpIdeFolder.Folders.CreateView(y => new TreeItemContainer());
@@ -317,7 +317,7 @@ private TreeItem CreateFolderTreeItem(Tree tree, TreeItem parent, SharpIdeFolder
 				NotifyCollectionChangedAction.Move => MoveTreeItem(_tree, innerEvent.NewItem.View, innerEvent.NewItem.Value, innerEvent.OldStartingIndex, innerEvent.NewStartingIndex),
 				NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
 				_ => Task.CompletedTask
-			})).AddToDeferred(this);
+			}), configureAwait: false).AddToDeferred(this);
 
 		// Observe files
 		var filesView = sharpIdeFolder.Files.CreateView(y => new TreeItemContainer());
@@ -329,7 +329,7 @@ private TreeItem CreateFolderTreeItem(Tree tree, TreeItem parent, SharpIdeFolder
 				NotifyCollectionChangedAction.Move => MoveTreeItem(_tree, innerEvent.NewItem.View, innerEvent.NewItem.Value, innerEvent.OldStartingIndex, innerEvent.NewStartingIndex),
 				NotifyCollectionChangedAction.Remove => FreeTreeItem(innerEvent.OldItem.View.Value),
 				_ => Task.CompletedTask
-			})).AddToDeferred(this);
+			}), configureAwait: false).AddToDeferred(this);
 		return folderItem;
 	}
 
@@ -360,7 +360,7 @@ await this.InvokeAsync(() =>
 					fileItem.SetText(0, s);
 					fileItem.SetIconsForFileExtension(sharpIdeFile);
 				});
-			}).AddToDeferred(this);
+			}, configureAwait: false).AddToDeferred(this);
 
 		return fileItem;
 	}