From 53004a1b1f6bfec061f73b06892701360718257f Mon Sep 17 00:00:00 2001 From: Daniil Pavliuchyk Date: Tue, 20 Jun 2023 16:45:11 +0300 Subject: [PATCH] Revert #321 --- AvaloniaVS.Shared/AvaloniaPackage.cs | 11 ----------- .../IntelliSense/XamlTextViewCreationListener.cs | 3 --- AvaloniaVS.Shared/Services/EditorFactory.cs | 1 - 3 files changed, 15 deletions(-) diff --git a/AvaloniaVS.Shared/AvaloniaPackage.cs b/AvaloniaVS.Shared/AvaloniaPackage.cs index c1f4cf30..e7aacd27 100644 --- a/AvaloniaVS.Shared/AvaloniaPackage.cs +++ b/AvaloniaVS.Shared/AvaloniaPackage.cs @@ -52,18 +52,7 @@ namespace AvaloniaVS DesignerLogicalViewEditor = typeof(EditorFactory), DebuggingLogicalViewEditor = typeof(EditorFactory), TextLogicalViewEditor = typeof(EditorFactory))] - [ProvideXmlEditorChooserDesignerView(Constants.PackageName, - Constants.axaml, - LogicalViewID.Designer, - 10000, - Namespace = "https://github.com/avaloniaui", - MatchExtensionAndNamespace = true, - 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 index 7c88e2d7..3eb538f6 100644 --- a/AvaloniaVS.Shared/IntelliSense/XamlTextViewCreationListener.cs +++ b/AvaloniaVS.Shared/IntelliSense/XamlTextViewCreationListener.cs @@ -15,11 +15,8 @@ namespace AvaloniaVS.IntelliSense /// [Name("Avalonia XAML manupulator")] [ContentType("xml")] - [ContentType("axaml")] - [ContentType("xaml")] [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 index 50eb0ac8..44788d8f 100644 --- a/AvaloniaVS.Shared/Services/EditorFactory.cs +++ b/AvaloniaVS.Shared/Services/EditorFactory.cs @@ -18,7 +18,6 @@ namespace AvaloniaVS.Services /// Implements to create s containing /// an Avalonia XAML designer. /// - [Guid(AvaloniaVS.Constants.AvaloviaFactoryEditorGuidString)] internal sealed class EditorFactory : IVsEditorFactory, IDisposable { private readonly AvaloniaPackage _package;