! Workaround for VS 2022

wmjordan · Aug 7, 2021 · 50a20e0 · 50a20e0
1 parent 4a3ecb1
commit 50a20e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Codist/CodistPackage.cs b/Codist/CodistPackage.cs
@@ -131,7 +131,12 @@ protected override async System.Threading.Tasks.Task InitializeAsync(Cancellatio
 			Commands.NaviBarSearchDeclarationCommand.Initialize();
 			if (Config.Instance.InitStatus != InitStatus.Normal) {
 				Config.Instance.SaveConfig(Config.ConfigPath); // save the file to prevent this notification from reoccurrence
-				new Commands.VersionInfoBar(this).Show(Config.Instance.InitStatus);
+				try {
+					new Commands.VersionInfoBar(this).Show(Config.Instance.InitStatus);
+				}
+				catch (MissingMemberException) {
+					// HACK: ignore this for VS 2022 temporarily
+				}
 				if (Config.Instance.InitStatus == InitStatus.FirstLoad) {
 					// automatically load theme when first load
 					if (ThemeHelper.DocumentPageColor.ToWpfColor().IsDark()) {

diff --git a/Codist/Helpers/TextEditorHelper.cs b/Codist/Helpers/TextEditorHelper.cs
@@ -373,7 +373,7 @@ public static void CopyOrMoveSyntaxNode(this IWpfTextView view, SyntaxNode sourc
 					}
 				}
 			}
-			else if (String.Equals(sPath, CodistPackage.DTE.ActiveDocument.FullName, StringComparison.OrdinalIgnoreCase)) {
+			else if (String.Equals(sPath, view.TextBuffer.GetTextDocument()?.FilePath, StringComparison.OrdinalIgnoreCase)) {
 				// drag & drop from current file to external file
 				if (copy == false) {
 					using (var edit = view.TextBuffer.CreateEdit()) {