feat: Intellisense displays only the elements related to the current context

AvaloniaVS.Shared/SuggestedActions/Actions/MissingAliasSuggestedAction.cs

@@ -22,13 +22,18 @@ internal class MissingAliasSuggestedAction : BaseSuggestedAction, ISuggestedActi
         private readonly ITextBufferFactoryService _bufferFactory;
         private readonly ITextViewRoleSet _previewRoleSet;
 
-        public MissingAliasSuggestedAction(ITrackingSpan span, IWpfDifferenceViewerFactoryService diffFactory, IDifferenceBufferFactoryService diffBufferFactory, ITextBufferFactoryService bufferFactory, ITextEditorFactoryService textEditorFactoryService, IReadOnlyDictionary<string, string> inverseNamespaces)
+        public MissingAliasSuggestedAction(ITrackingSpan span,
+            IWpfDifferenceViewerFactoryService diffFactory,
+            IDifferenceBufferFactoryService diffBufferFactory,
+            ITextBufferFactoryService bufferFactory, 
+            ITextEditorFactoryService textEditorFactoryService,
+            IReadOnlyDictionary<string, ISet<string>> inverseNamespaces)
         {
             _span = span;
             _snapshot = _span.TextBuffer.CurrentSnapshot;
             _targetClassName = _span.GetText(_snapshot);
             var targetClassMetadata = inverseNamespaces.FirstOrDefault(x => x.Key.Split('.').Last() == _targetClassName);
-            _namespaceAlias = targetClassMetadata.Value.Split(':').Last().Split('.').Last();
+            _namespaceAlias = targetClassMetadata.Value.First().Split(':').Last().Split('.').Last();
             _diffFactory = diffFactory;
             _diffBufferFactory = diffBufferFactory;
             _bufferFactory = bufferFactory;

AvaloniaVS.Shared/SuggestedActions/Actions/MissingNamespaceAndAliasSuggestedAction.cs

@@ -24,14 +24,21 @@ internal class MissingNamespaceAndAliasSuggestedAction : BaseSuggestedAction, IS
         private readonly Dictionary<string, string> _aliases;
         private readonly ITextViewRoleSet _previewRoleSet;
 
-        public MissingNamespaceAndAliasSuggestedAction(ITrackingSpan span, IWpfDifferenceViewerFactoryService diffFactory,
-            IDifferenceBufferFactoryService diffBufferFactory, ITextBufferFactoryService bufferFactory, ITextEditorFactoryService textEditorFactoryService, 
-            IReadOnlyDictionary<string, string> inverseNamespaces, Dictionary<string, string> aliases)
+        public MissingNamespaceAndAliasSuggestedAction(ITrackingSpan span,
+            IWpfDifferenceViewerFactoryService diffFactory,
+            IDifferenceBufferFactoryService diffBufferFactory,
+            ITextBufferFactoryService bufferFactory,
+            ITextEditorFactoryService textEditorFactoryService,
+            IReadOnlyDictionary<string, ISet<string>> inverseNamespaces,
+            Dictionary<string, string> aliases)
         {
             _span = span;
             _snapshot = _span.TextBuffer.CurrentSnapshot;
             _targetClassName = _span.GetText(_snapshot);
-            _targetClassMetadata = inverseNamespaces.FirstOrDefault(x => x.Key.Split('.').Last() == _targetClassName);
+            _targetClassMetadata = inverseNamespaces
+                .Where(x => x.Key.Split('.').Last() == _targetClassName)
+                .Select(x => new KeyValuePair<string, string>(x.Key, x.Value.First()))
+                .FirstOrDefault();
 
             // _targetClassMetadata.Value is the namespace of the control we are trying to add the namespace to. 
             // It is usually in the format using:MyNamespace.Something.

AvaloniaVS.Shared/SuggestedActions/Actions/MissingNamespaceSuggestedAction.cs

@@ -5,6 +5,7 @@
 using AvaloniaVS.Shared.SuggestedActions.Actions.Base;
 using AvaloniaVS.Shared.SuggestedActions.Helpers;
 using Microsoft.VisualStudio.Language.Intellisense;
+using Microsoft.VisualStudio.PlatformUI;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Differencing;
 using Microsoft.VisualStudio.Text.Editor;
@@ -22,12 +23,20 @@ internal class MissingNamespaceSuggestedAction : BaseSuggestedAction, ISuggested
         private readonly string _alias;
         private readonly ITextViewRoleSet _previewRoleSet;
 
-        public MissingNamespaceSuggestedAction(ITrackingSpan span, IWpfDifferenceViewerFactoryService diffFactory, IDifferenceBufferFactoryService diffBufferFactory,
-            ITextBufferFactoryService bufferFactory, ITextEditorFactoryService textEditorFactoryService, IReadOnlyDictionary<string, string> inverseNamespaces,
+        public MissingNamespaceSuggestedAction(ITrackingSpan span,
+            IWpfDifferenceViewerFactoryService diffFactory,
+            IDifferenceBufferFactoryService diffBufferFactory,
+            ITextBufferFactoryService bufferFactory,
+            ITextEditorFactoryService textEditorFactoryService,
+            IReadOnlyDictionary<string, ISet<string>> inverseNamespaces,
             Dictionary<string, string> aliases, string alias)
         {
             _span = span;
-            _targetClassMetadata = inverseNamespaces.FirstOrDefault(x => x.Key.Split('.').Last() == _span.GetText(_span.TextBuffer.CurrentSnapshot));
+            _targetClassMetadata = inverseNamespaces
+                .Where(x => x.Key.Split('.').Last() == _span.GetText(_span.TextBuffer.CurrentSnapshot))
+                .Select(x => new KeyValuePair<string, string>(x.Key, x.Value.First()))
+                .FirstOrDefault();
+
             DisplayText = $"Add xmlns {alias}";
             _diffFactory = diffFactory;
             _diffBufferFactory = diffBufferFactory;

AvaloniaVS.Shared/SuggestedActions/SuggestedActionsSource.cs

@@ -26,8 +26,12 @@ class SuggestedActionsSource : ISuggestedActionsSource
         private readonly ITextEditorFactoryService _textEditorFactoryService;
         private readonly ITextView _textView;
 
-        public SuggestedActionsSource(SuggestedActionsSourceProvider testSuggestedActionsSourceProvider, ITextView textView, ITextBuffer textBuffer,
-            IWpfDifferenceViewerFactoryService diffFactory, IDifferenceBufferFactoryService diffBufferFactory, ITextBufferFactoryService bufferFactory,
+        public SuggestedActionsSource(SuggestedActionsSourceProvider testSuggestedActionsSourceProvider,
+            ITextView textView,
+            ITextBuffer textBuffer,
+            IWpfDifferenceViewerFactoryService diffFactory,
+            IDifferenceBufferFactoryService diffBufferFactory,
+            ITextBufferFactoryService bufferFactory,
             ITextEditorFactoryService textEditorFactoryService)
         {
             _factory = testSuggestedActionsSourceProvider;
@@ -56,19 +60,34 @@ public IEnumerable<SuggestedActionSet> GetSuggestedActions(ISuggestedActionCateg
                 ISuggestedAction suggestedAction = null;
                 if (availableSuggestedActions.Item1)
                 {
-                    suggestedAction = new MissingNamespaceAndAliasSuggestedAction(trackingSpan, _diffFactory, _diffBufferFactory, _bufferFactory, _textEditorFactoryService,
-    metadata.CompletionMetadata.InverseNamespace, CompletionEngine.GetNamespaceAliases(extent.Span.Snapshot.TextBuffer.CurrentSnapshot.GetText()));
+                    suggestedAction = new MissingNamespaceAndAliasSuggestedAction(trackingSpan,
+                        _diffFactory,
+                        _diffBufferFactory,
+                        _bufferFactory,
+                        _textEditorFactoryService,
+                        metadata.CompletionMetadata.InverseNamespace,
+                        CompletionEngine.GetNamespaceAliases(extent.Span.Snapshot.TextBuffer.CurrentSnapshot.GetText()));
                 }
                 else if (availableSuggestedActions.Item2)
                 {
-                    suggestedAction = new MissingAliasSuggestedAction(trackingSpan, _diffFactory, _diffBufferFactory, _bufferFactory, _textEditorFactoryService,
-    metadata.CompletionMetadata.InverseNamespace);
+                    suggestedAction = new MissingAliasSuggestedAction(trackingSpan,
+                        _diffFactory,
+                        _diffBufferFactory,
+                        _bufferFactory,
+                        _textEditorFactoryService,
+                        metadata.CompletionMetadata.InverseNamespace);
                 }
                 else if (availableSuggestedActions.Item3)
                 {
                     HasAlias(out var alias);
-                    suggestedAction = new MissingNamespaceSuggestedAction(trackingSpan, _diffFactory, _diffBufferFactory, _bufferFactory, _textEditorFactoryService,
-    metadata.CompletionMetadata.InverseNamespace, CompletionEngine.GetNamespaceAliases(extent.Span.Snapshot.TextBuffer.CurrentSnapshot.GetText()), alias);
+                    suggestedAction = new MissingNamespaceSuggestedAction(trackingSpan,
+                        _diffFactory,
+                        _diffBufferFactory,
+                        _bufferFactory,
+                        _textEditorFactoryService,
+                        metadata.CompletionMetadata.InverseNamespace,
+                        CompletionEngine.GetNamespaceAliases(extent.Span.Snapshot.TextBuffer.CurrentSnapshot.GetText())
+                        , alias);
                 }
                 return new SuggestedActionSet[] { new SuggestedActionSet(new ISuggestedAction[] { suggestedAction }) };
             }
@@ -131,10 +150,15 @@ private bool TryGetWordUnderCaret(out TextExtent wordExtent)
                 {
                     return (false, false, false);
                 }
-                var targetClassMetadata = metadata.CompletionMetadata.InverseNamespace.FirstOrDefault(x => x.Key.Split('.').Last() == targetClassName);
+                var targetClassMetadata = metadata.CompletionMetadata
+                    .InverseNamespace
+                    .Where(x => x.Key.Split('.').Last() == targetClassName)
+                    .Select(x => new { x.Key, Value = x.Value.FirstOrDefault() })
+                    .FirstOrDefault();
 
                 // Exclude all classes from avaloniaui namespace because controls from this namespace are included by default.
-                if (targetClassMetadata.Value != null && targetClassMetadata.Key != null && !metadata.CompletionMetadata.Namespaces.First(x => x.Key == "https://github.com/avaloniaui").Value.ContainsKey(targetClassName))
+                if (targetClassMetadata is not null && targetClassMetadata.Value != null && targetClassMetadata.Key != null 
+                    && !metadata.CompletionMetadata.Namespaces.First(x => x.Key == "https://github.com/avaloniaui").Value.ContainsKey(targetClassName))
                 {
                     if (!CompletionEngine.GetNamespaceAliases(span.TextBuffer.CurrentSnapshot.GetText()).ContainsValue(targetClassMetadata.Value))
                     {

AvaloniaVS.Shared/Views/AvaloniaDesigner.xaml.cs

@@ -23,6 +23,7 @@
 using Serilog;
 using Task = System.Threading.Tasks.Task;
 
+
 namespace AvaloniaVS.Views
 {
     public enum AvaloniaDesignerView
@@ -443,7 +444,7 @@ public bool TryProcessZoomLevelValue(out double scaling)
                     Dispatcher.BeginInvoke(() =>
                         ZoomLevel = string.Format(CultureInfo.InvariantCulture, "{0}%", Math.Round(Math.Min(x, y), 2, MidpointRounding.ToEven) * 100),
                         System.Windows.Threading.DispatcherPriority.Background);
-                    
+
                 }
                 else
                 {
@@ -559,7 +560,8 @@ private void RebuildMetadata(string assemblyPath)
                 string intermediateOutputPath = GetIntermediateOutputPath(storage);
                 if (metadata.CompletionMetadata == null || metadata.NeedInvalidation)
                 {
-                    CreateCompletionMetadataAsync(intermediateOutputPath, assemblyPath, metadata).FireAndForget();
+                    CreateCompletionMetadataAsync(intermediateOutputPath, assemblyPath, metadata)
+                       .FireAndForget();
                 }
             }
         }
@@ -572,48 +574,44 @@ private static async Task CreateCompletionMetadataAsync(
             string xamlAssemblyPath,
             XamlBufferMetadata target)
         {
-            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+            var sw = new Stopwatch();
+            sw.Start();
+            Log.Logger.Information("Started AvaloniaDesigner.CreateCompletionMetadataAsync() for {ExecutablePath}", intermediateOutputPath);
 
             if (_metadataCache == null)
             {
                 _metadataCache = new Dictionary<string, Task<Metadata>>();
+                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
                 var dte = (DTE)Package.GetGlobalService(typeof(DTE));
 
                 dte.Events.BuildEvents.OnBuildBegin += (s, e) => _metadataCache.Clear();
             }
-
-            Log.Logger.Information("Started AvaloniaDesigner.CreateCompletionMetadataAsync() for {ExecutablePath}", intermediateOutputPath);
-
             try
             {
-                var sw = Stopwatch.StartNew();
+                await TaskScheduler.Default;
 
                 Task<Metadata> metadataLoad;
 
                 if (!_metadataCache.TryGetValue(intermediateOutputPath, out metadataLoad))
                 {
-                    metadataLoad = Task.Run(() =>
-                                    {
-                                        return _metadataReader.GetForTargetAssembly(new AvaloniaCompilationAssemblyProvider(intermediateOutputPath, xamlAssemblyPath));
-                                    });
+                    metadataLoad?.Dispose();
+                    metadataLoad = Task.Run(() => _metadataReader.GetForTargetAssembly(new AvaloniaCompilationAssemblyProvider(intermediateOutputPath, xamlAssemblyPath)));
                     _metadataCache[intermediateOutputPath] = metadataLoad;
                 }
+                target.CompletionMetadata?.Dispose();
 
                 target.CompletionMetadata = await metadataLoad;
 
                 target.NeedInvalidation = false;
-
-                sw.Stop();
-
-                Log.Logger.Verbose("Finished AvaloniaDesigner.CreateCompletionMetadataAsync() took {Time} for {ExecutablePath}", sw.Elapsed, intermediateOutputPath);
             }
             catch (Exception ex)
             {
                 Log.Logger.Error(ex, "Error creating XAML completion metadata");
             }
             finally
             {
-                Log.Logger.Verbose("Finished AvaloniaDesigner.CreateCompletionMetadataAsync()");
+                sw?.Stop();
+                Log.Logger.Verbose("Finished AvaloniaDesigner.CreateCompletionMetadataAsync() {0}", sw?.Elapsed);
             }
         }
 

CompletionEngine/Avalonia.Ide.CompletionEngine.DnlibMetadataProvider/Avalonia.Ide.CompletionEngine.DnlibMetadataProvider.csproj

@@ -8,7 +8,7 @@
     <AssemblyOriginatorKeyFile>$(SolutionDir)Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="dnlib" Version="3.6.0" />
+    <PackageReference Include="dnlib" Version="4.4.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Ide.CompletionEngine\Avalonia.Ide.CompletionEngine.csproj" />