Make extra sure we're on the right thread for menu callbacks

GrahamTheCoder · GrahamTheCoder · commit a1ef8a747436 · 2019-01-27T22:32:40.000Z
This is more a case of fixing warnings than chaning product behaviour afaik
diff --git a/Vsix/ConvertCSToVBCommand.cs b/Vsix/ConvertCSToVBCommand.cs
@@ -119,6 +119,7 @@ private async Task ProjectItemMenuItem_BeforeQueryStatusAsync(object sender, Eve
                 menuItem.Visible = false;
                 menuItem.Enabled = false;
 
+                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
                 string itemPath = (await VisualStudioInteraction.GetSingleSelectedItemOrDefaultAsync())?.ItemPath;
                 if (itemPath == null || !CodeConversion.IsCSFileName(itemPath))
                     return;
@@ -147,6 +148,8 @@ private async Task CodeEditorMenuItemCallbackAsync(object sender, EventArgs e)
 
         private async Task ProjectItemMenuItemCallbackAsync(object sender, EventArgs e)
         {
+
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             string itemPath = (await VisualStudioInteraction.GetSingleSelectedItemOrDefaultAsync())?.ItemPath;
             await ConvertDocumentAsync(itemPath, new Span(0, 0));
         }
diff --git a/Vsix/ConvertVBToCSCommand.cs b/Vsix/ConvertVBToCSCommand.cs
@@ -117,6 +117,7 @@ private async Task ProjectItemMenuItem_BeforeQueryStatusAsync(object sender, Eve
                 menuItem.Visible = false;
                 menuItem.Enabled = false;
 
+                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
                 string itemPath = (await VisualStudioInteraction.GetSingleSelectedItemOrDefaultAsync())?.ItemPath;
                 if (itemPath == null || !CodeConversion.IsVBFileName(itemPath))
                     return;
@@ -145,6 +146,7 @@ private async Task CodeEditorMenuItemCallbackAsync(object sender, EventArgs e)
 
         private async Task ProjectItemMenuItemCallbackAsync(object sender, EventArgs e)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
             string itemPath = (await VisualStudioInteraction.GetSingleSelectedItemOrDefaultAsync())?.ItemPath;
             await ConvertDocumentAsync(itemPath, new Span(0, 0));
         }

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ private async Task ProjectItemMenuItem_BeforeQueryStatusAsync(object sender, Eve`
`119`	`119`	`menuItem.Visible = false;`
`120`	`120`	`menuItem.Enabled = false;`
`121`	`121`
	`122`	`+ await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();`
`122`	`123`	`string itemPath = (await VisualStudioInteraction.GetSingleSelectedItemOrDefaultAsync())?.ItemPath;`
`123`	`124`	`if (itemPath == null \|\| !CodeConversion.IsCSFileName(itemPath))`
`124`	`125`	`return;`
`@@ -147,6 +148,8 @@ private async Task CodeEditorMenuItemCallbackAsync(object sender, EventArgs e)`
`147`	`148`
`148`	`149`	`private async Task ProjectItemMenuItemCallbackAsync(object sender, EventArgs e)`
`149`	`150`	`{`
	`151`	`+`
	`152`	`+ await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();`
`150`	`153`	`string itemPath = (await VisualStudioInteraction.GetSingleSelectedItemOrDefaultAsync())?.ItemPath;`
`151`	`154`	`await ConvertDocumentAsync(itemPath, new Span(0, 0));`
`152`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ private async Task ProjectItemMenuItem_BeforeQueryStatusAsync(object sender, Eve`
`117`	`117`	`menuItem.Visible = false;`
`118`	`118`	`menuItem.Enabled = false;`
`119`	`119`
	`120`	`+ await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();`
`120`	`121`	`string itemPath = (await VisualStudioInteraction.GetSingleSelectedItemOrDefaultAsync())?.ItemPath;`
`121`	`122`	`if (itemPath == null \|\| !CodeConversion.IsVBFileName(itemPath))`
`122`	`123`	`return;`
`@@ -145,6 +146,7 @@ private async Task CodeEditorMenuItemCallbackAsync(object sender, EventArgs e)`
`145`	`146`
`146`	`147`	`private async Task ProjectItemMenuItemCallbackAsync(object sender, EventArgs e)`
`147`	`148`	`{`
	`149`	`+ await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();`
`148`	`150`	`string itemPath = (await VisualStudioInteraction.GetSingleSelectedItemOrDefaultAsync())?.ItemPath;`
`149`	`151`	`await ConvertDocumentAsync(itemPath, new Span(0, 0));`
`150`	`152`	`}`