AsmDude2 v2.0.0.4 (#147)

Initial version of AsmDude2 (v2.0.0.4) for Visual Studio 2022
HJLebbink · Oct 1, 2023 · e81ab4e · e81ab4e
1 parent 1e1e3dc
commit e81ab4e
Show file tree

Hide file tree

Showing 455 changed files with 47,027 additions and 154,434 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,4 @@ VS/CSHARP/asm-dude-vsix/Resources/Performance/instruction_tables.ods
 
 #VS/CSHARP/asm-sim-lib/libs/*
 **/.idea/*
+/VS/CSHARP/asm-dude2-vsix/vsix/**
diff --git a/Images/AsmDude-code-completion.png b/Images/AsmDude-code-completion.png
diff --git a/Images/AsmDude-disassembly-popup.png b/Images/AsmDude-disassembly-popup.png
diff --git a/Images/AsmDude-label-clash.png b/Images/AsmDude-label-clash.png
diff --git a/Images/AsmDude-label-usage.png b/Images/AsmDude-label-usage.png
diff --git a/Images/AsmDude-redundant-instruction.png b/Images/AsmDude-redundant-instruction.png
diff --git a/Images/AsmDude-register-content-completions.png b/Images/AsmDude-register-content-completions.png
diff --git a/Images/AsmDude-register-content.png b/Images/AsmDude-register-content.png
diff --git a/Images/AsmDude-syntax-errors.png b/Images/AsmDude-syntax-errors.png
diff --git a/Images/AsmDude-undefined-labels.png b/Images/AsmDude-undefined-labels.png
diff --git a/Images/AsmDude-unreachable-instruction.png b/Images/AsmDude-unreachable-instruction.png
diff --git a/Images/AsmDude-using-undefined.png b/Images/AsmDude-using-undefined.png
diff --git a/Images/AsmDude2-code-completion.png b/Images/AsmDude2-code-completion.png
diff --git a/Images/AsmDude2-descriptions.png b/Images/AsmDude2-descriptions.png
diff --git a/Images/AsmDude2-signature-help.png b/Images/AsmDude2-signature-help.png
diff --git a/Images/AsmDude2-syntax-highlighting.png b/Images/AsmDude2-syntax-highlighting.png
diff --git a/Images/Disassembly-Window.png b/Images/Disassembly-Window.png
diff --git a/README.md b/README.md
diff --git a/VS/.editorconfig b/VS/.editorconfig
@@ -0,0 +1,4 @@
+[*.cs]
+
+# CS0162: Unreachable code detected
+dotnet_diagnostic.CS0162.severity = warning
diff --git a/VS/AsmDude.sln b/VS/AsmDude.sln
diff --git a/VS/CPP/ConsoleTest/ConsoleTest/ConsoleTest.vcxproj b/VS/CPP/ConsoleTest/ConsoleTest/ConsoleTest.vcxproj
@@ -43,13 +43,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -146,6 +146,9 @@
   <ItemGroup>
     <ClCompile Include="Main.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\example_semantic_analysis2.asm" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/VS/CPP/ConsoleTest/ConsoleTest/ConsoleTest.vcxproj.filters b/VS/CPP/ConsoleTest/ConsoleTest/ConsoleTest.vcxproj.filters
@@ -11,4 +11,9 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\example_semantic_analysis2.asm">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/VS/CPP/ConsoleTest/ConsoleTest/Main.cpp b/VS/CPP/ConsoleTest/ConsoleTest/Main.cpp
@@ -1,7 +1,8 @@
 // 'Hello World!' program 
 
 #include <iostream>
-#include <intrin.h>
+#include <cstdio>
+#include <immintrin.h>
 
 // 1] set a breakpoint at line 16.
 // 2] hit Local Windows Debugger to run this program, 

diff --git a/VS/CSHARP/asm-annotate/ParserXed.cs b/VS/CSHARP/asm-annotate/ParserXed.cs
@@ -250,7 +250,7 @@ static Tuple<Mnemonic, List<IformRegister>, int, bool, float, float> ParseLine(s
                 Console.WriteLine("ERROR: could not parse " + line);
             }
             var y = x[0].Split('_');
-            Mnemonic mnemonic = AsmSourceTools.ParseMnemonic(y[0], true);
+            Mnemonic mnemonic = AsmTools.AsmSourceTools.ParseMnemonic(y[0], true);
 
             List<IformRegister> args = new List<IformRegister>();
             for (int i = 1; i<y.Length; ++i)

diff --git a/VS/CSHARP/asm-annotate/asm-annotate.csproj b/VS/CSHARP/asm-annotate/asm-annotate.csproj
@@ -1,17 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net8.0-windows8.0</TargetFramework>
     <RootNamespace>asm_annotate</RootNamespace>
+    <Platforms>AnyCPU</Platforms>
+    <SupportedOSPlatformVersion>8.0</SupportedOSPlatformVersion>
+    <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+    <EnableNETAnalyzers>True</EnableNETAnalyzers>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2">
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocClassificationDefinition.cs b/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocClassificationDefinition.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocClassificationFormat.cs b/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocClassificationFormat.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocKeyProcessor.cs b/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocKeyProcessor.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocKeyProcessorProvider.cs b/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocKeyProcessorProvider.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocMouseHandler.cs b/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocMouseHandler.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -81,12 +81,12 @@ public AsmDocMouseHandler(
             // Some other points to clear the highlight span:
             this.view_.LostAggregateFocus += (sender, args) =>
             {
-                AsmDudeToolsStatic.Output_INFO(string.Format(AsmDudeToolsStatic.CultureUI, "{0}:event: LostAggregateFocus", this.ToString()));
+                //AsmDudeToolsStatic.Output_INFO(string.Format(AsmDudeToolsStatic.CultureUI, "{0}:event: LostAggregateFocus", this.ToString()));
                 this.Set_Highlight_Span(null);
             };
             this.view_.VisualElement.MouseLeave += (sender, args) =>
             {
-                AsmDudeToolsStatic.Output_INFO(string.Format(AsmDudeToolsStatic.CultureUI, "{0}:event: MouseLeave", this.ToString()));
+                //AsmDudeToolsStatic.Output_INFO(string.Format(AsmDudeToolsStatic.CultureUI, "{0}:event: MouseLeave", this.ToString()));
                 this.Set_Highlight_Span(null);
             };
         }

diff --git a/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocMouseHandlerProvider.cs b/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocMouseHandlerProvider.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocUnderlineTagger.cs b/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocUnderlineTagger.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocUnderlineTaggerProvider.cs b/VS/CSHARP/asm-dude-vsix/AsmDoc/AsmDocUnderlineTaggerProvider.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/AsmDoc/CtrlKeyState.cs b/VS/CSHARP/asm-dude-vsix/AsmDoc/CtrlKeyState.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/AsmDudePackage.cs b/VS/CSHARP/asm-dude-vsix/AsmDudePackage.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@ namespace AsmDude
     using System.Threading;
     using AsmDude.OptionsPage;
     using AsmDude.Tools;
+
     using Microsoft.VisualStudio.Shell;
 
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
@@ -61,8 +62,11 @@ public AsmDudePackage()
 
         protected override async System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
-            await base.InitializeAsync(cancellationToken, progress).ConfigureAwait(true);
+            //await base.InitializeAsync(cancellationToken, progress).ConfigureAwait(true);
+
+            await this.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
             ClearMefCache.ClearMefCache.Initialize(this);
+            //await MyToolWindowCommand.InitializeAsync(this);
         }
 
         #region Disassembly window experiments

diff --git a/VS/CSHARP/asm-dude-vsix/BraceMatching/BraceMatchingTagger.cs b/VS/CSHARP/asm-dude-vsix/BraceMatching/BraceMatchingTagger.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/BraceMatching/BraceMatchingTaggerProvider.cs b/VS/CSHARP/asm-dude-vsix/BraceMatching/BraceMatchingTaggerProvider.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/ClearMefCache/ClearMefCache.cs b/VS/CSHARP/asm-dude-vsix/ClearMefCache/ClearMefCache.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/ClearMefCache/ComponentModelExtensions.cs b/VS/CSHARP/asm-dude-vsix/ClearMefCache/ComponentModelExtensions.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/CodeCompletion/CodeCompletionCommandFilter.cs b/VS/CSHARP/asm-dude-vsix/CodeCompletion/CodeCompletionCommandFilter.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/CodeCompletion/CodeCompletionSource.cs b/VS/CSHARP/asm-dude-vsix/CodeCompletion/CodeCompletionSource.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/CodeCompletion/CodeCompletionSourceProvider.cs b/VS/CSHARP/asm-dude-vsix/CodeCompletion/CodeCompletionSourceProvider.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/CodeCompletion/VsTextViewCreationListener.cs b/VS/CSHARP/asm-dude-vsix/CodeCompletion/VsTextViewCreationListener.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/CodeFolding/CodeFoldingTagger.cs b/VS/CSHARP/asm-dude-vsix/CodeFolding/CodeFoldingTagger.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/CodeFolding/CodeFoldingTaggerProvider.cs b/VS/CSHARP/asm-dude-vsix/CodeFolding/CodeFoldingTaggerProvider.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/HighlightWord/HighlightWordTagger.cs b/VS/CSHARP/asm-dude-vsix/HighlightWord/HighlightWordTagger.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/HighlightWord/HighlightWordTaggerProvider.cs b/VS/CSHARP/asm-dude-vsix/HighlightWord/HighlightWordTaggerProvider.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/LICENSE.txt b/VS/CSHARP/asm-dude-vsix/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Henk-Jan Lebbink
+Copyright (c) 2023 Henk-Jan Lebbink
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/VS/CSHARP/asm-dude-vsix/OptionsPage/AsmDudeOptionPageUI.xaml.cs b/VS/CSHARP/asm-dude-vsix/OptionsPage/AsmDudeOptionPageUI.xaml.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/OptionsPage/AsmDudeOptionsPage.cs b/VS/CSHARP/asm-dude-vsix/OptionsPage/AsmDudeOptionsPage.cs
@@ -1,6 +1,7 @@
+using System.Runtime.InteropServices;
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -125,6 +126,7 @@ public enum PropertyEnum // NOTE: the enum elements should be precisely equal to
     }
 
     [Guid(Guids.GuidOptionsPageAsmDude)]
+    [ComVisible(true)]
     public class AsmDudeOptionsPage : UIElementDialogPage
     {
         private readonly AsmDudeOptionsPageUI asmDudeOptionsPageUI_;

diff --git a/VS/CSHARP/asm-dude-vsix/Properties/AssemblyInfo.cs b/VS/CSHARP/asm-dude-vsix/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

diff --git a/VS/CSHARP/asm-dude-vsix/QuickInfo/AsmQuickInfoController.cs b/VS/CSHARP/asm-dude-vsix/QuickInfo/AsmQuickInfoController.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -20,8 +20,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-// thib is a typppo
-
 namespace AsmDude.QuickInfo
 {
     using System;
@@ -39,8 +37,7 @@ namespace AsmDude.QuickInfo
     internal sealed class AsmQuickInfoController : IIntellisenseController
     {
         private readonly IList<ITextBuffer> subjectBuffers_;
-        private readonly IQuickInfoBroker quickInfoBroker_; //XYZZY OLD
-        //private readonly IAsyncQuickInfoBroker quickInfoBroker_; //XYZZY NEW
+        private readonly IAsyncQuickInfoBroker quickInfoBroker_;
         private readonly ITagAggregator<AsmTokenTag> aggregator_;
         private ITextView textView_;
 
@@ -50,7 +47,7 @@ internal sealed class AsmQuickInfoController : IIntellisenseController
         internal AsmQuickInfoController(
             ITextView textView,
             IList<ITextBuffer> subjectBuffers,
-            IQuickInfoBroker quickInfoBroker,
+            IAsyncQuickInfoBroker quickInfoBroker,
             IBufferTagAggregatorFactoryService aggregatorFactory)
         {
             AsmDudeToolsStatic.Output_INFO(string.Format(AsmDudeToolsStatic.CultureUI, "{0}:constructor; file={1}", this.ToString(), AsmDudeToolsStatic.GetFilename(textView.TextBuffer)));

diff --git a/VS/CSHARP/asm-dude-vsix/QuickInfo/AsmQuickInfoControllerProvider.cs b/VS/CSHARP/asm-dude-vsix/QuickInfo/AsmQuickInfoControllerProvider.cs
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Henk-Jan Lebbink
+// Copyright (c) 2023 Henk-Jan Lebbink
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -41,7 +41,7 @@ internal sealed class AsmQuickInfoControllerProvider : IIntellisenseControllerPr
         private readonly IBufferTagAggregatorFactoryService aggregatorFactory_ = null;
 
         [Import]
-        private readonly IQuickInfoBroker quickInfoBroker_ = null;
+        private readonly IAsyncQuickInfoBroker quickInfoBroker_ = null;
 
         public IIntellisenseController TryCreateIntellisenseController(ITextView textView, IList<ITextBuffer> subjectBuffers)
         {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,3 +34,4 @@ VS/CSHARP/asm-dude-vsix/Resources/Performance/instruction_tables.ods

		#VS/CSHARP/asm-sim-lib/libs/*
		*/.idea/
		/VS/CSHARP/asm-dude2-vsix/vsix/**