Merge branch 'master' into do-not-show-error-on-the-previewer-side-wh…

…en-project-is-built
AvaloniaUI · Aug 7, 2023 · 110e8a7 · 110e8a7
2 parents c370522 + 4fde0f2
commit 110e8a7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/AvaloniaVS.Shared/AvaloniaPackage.cs b/AvaloniaVS.Shared/AvaloniaPackage.cs
@@ -45,14 +45,25 @@ namespace AvaloniaVS
     [ProvideXmlEditorChooserDesignerView(Constants.PackageName,
         Constants.xaml,
         LogicalViewID.Designer,
+        10001,
+        Namespace = "https://github.com/avaloniaui",
+        MatchExtensionAndNamespace = false,
+        CodeLogicalViewEditor = typeof(EditorFactory),
+        DesignerLogicalViewEditor = typeof(EditorFactory),
+        DebuggingLogicalViewEditor = typeof(EditorFactory),
+        TextLogicalViewEditor = typeof(EditorFactory))]
+    [ProvideXmlEditorChooserDesignerView(Constants.PackageName,
+        Constants.axaml,
+        LogicalViewID.Designer,
         10000,
         Namespace = "https://github.com/avaloniaui",
-        MatchExtensionAndNamespace = true,
+        MatchExtensionAndNamespace = false,
         CodeLogicalViewEditor = typeof(EditorFactory),
         DesignerLogicalViewEditor = typeof(EditorFactory),
         DebuggingLogicalViewEditor = typeof(EditorFactory),
         TextLogicalViewEditor = typeof(EditorFactory))]
     [ProvideOptionPage(typeof(OptionsDialogPage), Constants.PackageName, "General", 113, 0, supportsAutomation: true)]
+    [ProvideBindingPath]
     internal sealed class AvaloniaPackage : AsyncPackage
     {
         public static SolutionService SolutionService { get; private set; }

diff --git a/AvaloniaVS.Shared/IntelliSense/XamlTextViewCreationListener.cs b/AvaloniaVS.Shared/IntelliSense/XamlTextViewCreationListener.cs
@@ -1,11 +1,8 @@
 using System;
 using System.ComponentModel.Composition;
 using AvaloniaVS.Models;
-using Microsoft.VisualStudio.Editor;
-using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.TextManager.Interop;
 using Microsoft.VisualStudio.Utilities;
 
 namespace AvaloniaVS.IntelliSense
@@ -17,6 +14,7 @@ namespace AvaloniaVS.IntelliSense
     [ContentType("xml")]
     [Export(typeof(IWpfTextViewCreationListener))]
     [TextViewRole(PredefinedTextViewRoles.Editable)]
+    [TextViewRole(PredefinedTextViewRoles.PrimaryDocument)]
     internal sealed class XamlTextViewCreationListener : IWpfTextViewCreationListener
     {
         private readonly IServiceProvider _serviceProvider;

diff --git a/AvaloniaVS.Shared/Services/EditorFactory.cs b/AvaloniaVS.Shared/Services/EditorFactory.cs
@@ -18,6 +18,7 @@ namespace AvaloniaVS.Services
     /// Implements <see cref="IVsEditorFactory"/> to create <see cref="DesignerPane"/>s containing
     /// an Avalonia XAML designer.
     /// </summary>
+    [Guid(AvaloniaVS.Constants.AvaloviaFactoryEditorGuidString)]
     internal sealed class EditorFactory : IVsEditorFactory, IDisposable
     {
         private readonly AvaloniaPackage _package;