From 0fa8ad1a92cd1cf33e89b5d8b770283ed5f53601 Mon Sep 17 00:00:00 2001
From: Allister Beharry <allister.beharry@gmail.com>
Date: Fri, 8 Dec 2023 17:02:10 -0400
Subject: [PATCH] Can autoload package, log adding file context.

---
 src/Stratis.DevEx.sln                         |  21 ---
 .../SolidityFileContextProviderFactory.cs     |   2 +
 .../SolidityLanguageClient.cs                 |   2 +-
 .../Stratis.VS.StratisEVM.csproj              |   6 +
 .../StratisEVMPackage.cs                      |  15 ++-
 .../StratisEVMPackage.resx                    | 126 ++++++++++++++++++
 .../StratisEVMPackage.vsct                    |   6 +-
 7 files changed, 150 insertions(+), 28 deletions(-)
 create mode 100644 src/Stratis.VS.StratisEVM/StratisEVMPackage.resx

diff --git a/src/Stratis.DevEx.sln b/src/Stratis.DevEx.sln
index 1b66919..cb23573 100644
--- a/src/Stratis.DevEx.sln
+++ b/src/Stratis.DevEx.sln
@@ -100,8 +100,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.DevEx.TestChain", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stratis.VS.StratisEVM", "Stratis.VS.StratisEVM\Stratis.VS.StratisEVM.csproj", "{99ED2062-8DD2-4969-972C-C9DC81EBF869}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VSIXProject1", "VSIXProject1\VSIXProject1.csproj", "{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -655,24 +653,6 @@ Global
 		{99ED2062-8DD2-4969-972C-C9DC81EBF869}.Sources|arm64.Build.0 = Debug|arm64
 		{99ED2062-8DD2-4969-972C-C9DC81EBF869}.Sources|x86.ActiveCfg = Debug|x86
 		{99ED2062-8DD2-4969-972C-C9DC81EBF869}.Sources|x86.Build.0 = Debug|x86
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Debug|arm64.ActiveCfg = Debug|arm64
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Debug|arm64.Build.0 = Debug|arm64
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Debug|x86.ActiveCfg = Debug|x86
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Debug|x86.Build.0 = Debug|x86
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Release|arm64.ActiveCfg = Release|arm64
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Release|arm64.Build.0 = Release|arm64
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Release|x86.ActiveCfg = Release|x86
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Release|x86.Build.0 = Release|x86
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Sources|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Sources|Any CPU.Build.0 = Debug|Any CPU
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Sources|arm64.ActiveCfg = Debug|arm64
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Sources|arm64.Build.0 = Debug|arm64
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Sources|x86.ActiveCfg = Debug|x86
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99}.Sources|x86.Build.0 = Debug|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -711,7 +691,6 @@ Global
 		{75785EBD-14DC-463A-AD50-ED046F39A5AC} = {A0717F4C-8EED-4659-B72F-50DB73E1F64E}
 		{F18BA290-AFB9-4EEF-8281-30F3F32A0265} = {8DC77034-0F3C-40E6-A352-B157BCB85462}
 		{99ED2062-8DD2-4969-972C-C9DC81EBF869} = {3244104A-4F62-488E-8DA9-B1FEB2E367E7}
-		{FC3D9983-8CCC-4BAA-A834-BF06A7310C99} = {3244104A-4F62-488E-8DA9-B1FEB2E367E7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {602325FF-1BC0-4A57-8252-3F0471EA4151}
diff --git a/src/Stratis.VS.StratisEVM/SolidityFileContextProviderFactory.cs b/src/Stratis.VS.StratisEVM/SolidityFileContextProviderFactory.cs
index 38895fc..436b4da 100644
--- a/src/Stratis.VS.StratisEVM/SolidityFileContextProviderFactory.cs
+++ b/src/Stratis.VS.StratisEVM/SolidityFileContextProviderFactory.cs
@@ -6,6 +6,7 @@
 
 using Microsoft.VisualStudio.Workspace;
 
+using Stratis.DevEx;
 namespace Stratis.VS.StratisEVM
 {
     /// <summary>
@@ -39,6 +40,7 @@ public async Task<IReadOnlyCollection<FileContext>> GetContextsForFileAsync(stri
 
                 if (filePath.EndsWith(".sol"))
                 {
+                    Runtime.Info("adding file contxt");
                     fileContexts.Add(new FileContext(
                         new Guid(ProviderType),
                         new Guid(StratisEVMPackageIds.SolidityFileContextType),
diff --git a/src/Stratis.VS.StratisEVM/SolidityLanguageClient.cs b/src/Stratis.VS.StratisEVM/SolidityLanguageClient.cs
index 3112314..b979f22 100644
--- a/src/Stratis.VS.StratisEVM/SolidityLanguageClient.cs
+++ b/src/Stratis.VS.StratisEVM/SolidityLanguageClient.cs
@@ -33,7 +33,7 @@ public class SolidityLanguageClient : Runtime, ILanguageClient, ILanguageClientC
         #region Constructors
         static SolidityLanguageClient()
         {
-            Initialize("Stratis.VS.Solidity", "LanguageClient");
+            Initialize("Stratis.VS.StratisEVM", "VS");
         }
         public SolidityLanguageClient()
         {
diff --git a/src/Stratis.VS.StratisEVM/Stratis.VS.StratisEVM.csproj b/src/Stratis.VS.StratisEVM/Stratis.VS.StratisEVM.csproj
index 28dc8b5..67a51e6 100644
--- a/src/Stratis.VS.StratisEVM/Stratis.VS.StratisEVM.csproj
+++ b/src/Stratis.VS.StratisEVM/Stratis.VS.StratisEVM.csproj
@@ -113,6 +113,12 @@
       <Name>Stratis.DevEx.Base</Name>
     </ProjectReference>
   </ItemGroup>
+<ItemGroup>
+    <EmbeddedResource Include="StratisEVMPackage.resx">
+      <MergeWithCTO>true</MergeWithCTO>
+      <ManifestResourceName>StratisEVMPackage</ManifestResourceName>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Stratis.VS.StratisEVM/StratisEVMPackage.cs b/src/Stratis.VS.StratisEVM/StratisEVMPackage.cs
index b8732c4..31b5689 100644
--- a/src/Stratis.VS.StratisEVM/StratisEVMPackage.cs
+++ b/src/Stratis.VS.StratisEVM/StratisEVMPackage.cs
@@ -29,10 +29,10 @@ namespace Stratis.VS.StratisEVM
     /// </para>
     /// </remarks>
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-    [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)]
+    [InstalledProductRegistration("#110", "#112", "0.1", IconResourceID = 400)]
     [Guid(StratisEVMPackage.PackageGuidString)]
-    //[ProvideAutoLoad("4646B819-1AE0-4E79-97F4-8A8176FDD664", PackageAutoLoadFlags.BackgroundLoad)]
-    [ProvideAutoLoad(UIContextGuids80.NoSolution, PackageAutoLoadFlags.BackgroundLoad)]
+    [ProvideAutoLoad("4646B819-1AE0-4E79-97F4-8A8176FDD664", PackageAutoLoadFlags.BackgroundLoad)]
+    //[ProvideAutoLoad(UIContextGuids80.NoSolution, PackageAutoLoadFlags.BackgroundLoad)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     public sealed class StratisEVMPackage : AsyncPackage, IVsSolutionEvents7
     {
@@ -41,7 +41,12 @@ public sealed class StratisEVMPackage : AsyncPackage, IVsSolutionEvents7
         /// </summary>
         public const string PackageGuidString = "711b90a1-97e6-4b9a-91c4-3d62ccd32d4e";
 
-
+        #region Constructors
+        static StratisEVMPackage()
+        {
+            Runtime.Initialize("Stratis.VS.StratisEVM", "VS");
+        }
+        #endregion
         #region Methods
 
         #region IVsSolutionEvents7
@@ -82,7 +87,7 @@ public void OnAfterLoadAllDeferredProjects()
         protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
             await base.InitializeAsync(cancellationToken, progress);
-            Runtime.Initialize("Stratis.VS.StratisEVM", "VSPackage");
+            Runtime.Info("StratisEVM package initialized.");
             // When initialized asynchronously, the current thread may be a background thread at this point.
             // Do any initialization that requires the UI thread after switching to the UI thread.
             await this.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
diff --git a/src/Stratis.VS.StratisEVM/StratisEVMPackage.resx b/src/Stratis.VS.StratisEVM/StratisEVMPackage.resx
new file mode 100644
index 0000000..0739d36
--- /dev/null
+++ b/src/Stratis.VS.StratisEVM/StratisEVMPackage.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="110" xml:space="preserve">
+    <value>StratisEVM</value>
+  </data>
+  <data name="112" xml:space="preserve">
+    <value>Stratis smart contracts extension</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Stratis.VS.StratisEVM/StratisEVMPackage.vsct b/src/Stratis.VS.StratisEVM/StratisEVMPackage.vsct
index 83b2ad7..0f1bba3 100644
--- a/src/Stratis.VS.StratisEVM/StratisEVMPackage.vsct
+++ b/src/Stratis.VS.StratisEVM/StratisEVMPackage.vsct
@@ -55,6 +55,8 @@
       <Button guid="guidStratisEVMPackageCmdSet" id="CmdId1" priority="0x0100" type="Button">
         <Parent guid="guidStratisEVMPackageCmdSet" id="MyMenuGroup" />
         <Icon guid="guidImages" id="bmpPic1" />
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <CommandFlag>DefaultInvisible</CommandFlag>
         <Strings>
           <ButtonText>Solidity Command 1</ButtonText>
         </Strings>
@@ -62,7 +64,9 @@
 
       <Button guid="guidStratisEVMPackageCmdSet" id="CmdId2" priority="0x0101" type="Button">
         <Parent guid="guidStratisEVMPackageCmdSet" id="MyMenuGroup" />
-              <Icon guid="guidImages" id="bmpPic1" />
+        <Icon guid="guidImages" id="bmpPic1" />
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <CommandFlag>DefaultInvisible</CommandFlag>
         <Strings>
           <ButtonText>Solidity Command 2</ButtonText>
         </Strings>