Dedupe code

icsharpcode · Sep 7, 2020 · 9854857 · 9854857
1 parent 1a8b7c9
commit 9854857
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/Vsix/CodeConversion.cs b/Vsix/CodeConversion.cs
@@ -8,6 +8,7 @@
 using System.Windows;
 using ICSharpCode.CodeConverter;
 using ICSharpCode.CodeConverter.Shared;
+using ICSharpCode.CodeConverter.VB;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServices;
 using Microsoft.VisualStudio.Shell;
@@ -307,5 +308,15 @@ public static bool IsVBFileName(string fileName)
             }
             return false;
         }
+
+        public async Task ConvertTextBestEffortAsync<TLanguageConversion>(CancellationToken cancellationToken) where TLanguageConversion : ILanguageConversion, new()
+        {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+            string text = Clipboard.GetText();
+            var convertTextOnly = await ProjectConversion.ConvertTextAsync<TLanguageConversion>(text,
+                new TextConversionOptions(DefaultReferences.NetStandard2),
+                cancellationToken: cancellationToken);
+            await VisualStudioInteraction.WriteToCurrentWindowAsync(_serviceProvider, convertTextOnly.ConvertedCode);
+        }
     }
 }
diff --git a/Vsix/PasteAsCS.cs b/Vsix/PasteAsCS.cs
@@ -85,12 +85,11 @@ await VisualStudioInteraction.GetFirstSelectedSpanInCurrentViewAsync(ServiceProv
 
         private async Task CodeEditorMenuItemCallbackAsync(CancellationToken cancellationToken)
         {
-            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
-            string text = Clipboard.GetText();
-            var convertTextOnly = await ProjectConversion.ConvertTextAsync<VBToCSConversion>(text,
-                new TextConversionOptions(DefaultReferences.NetStandard2),
-                cancellationToken: cancellationToken);
-            await VisualStudioInteraction.WriteToCurrentWindowAsync(ServiceProvider, convertTextOnly.ConvertedCode);
+            try {
+                await _codeConversion.ConvertTextBestEffortAsync<VBToCSConversion>(cancellationToken);
+            } catch (Exception ex) {
+                await VisualStudioInteraction.ShowExceptionAsync(ex);
+            }
         }
     }
 }
diff --git a/Vsix/PasteAsVB.cs b/Vsix/PasteAsVB.cs
@@ -83,12 +83,11 @@ await VisualStudioInteraction.GetFirstSelectedSpanInCurrentViewAsync(ServiceProv
 
         private async Task CodeEditorMenuItemCallbackAsync(CancellationToken cancellationToken)
         {
-            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
-            string text = Clipboard.GetText();
-            var convertTextOnly = await ProjectConversion.ConvertTextAsync<CSToVBConversion>(text,
-                new TextConversionOptions(DefaultReferences.NetStandard2),
-                cancellationToken: cancellationToken);
-            await VisualStudioInteraction.WriteToCurrentWindowAsync(ServiceProvider, convertTextOnly.ConvertedCode);
+            try {
+                await _codeConversion.ConvertTextBestEffortAsync<CSToVBConversion>(cancellationToken);
+            } catch (Exception ex) {
+                await VisualStudioInteraction.ShowExceptionAsync(ex);
+            }
         }
     }
 }