SLVS-1769 Enable HTML analysis

SonarSource · Jan 22, 2025 · 9a1b6f4 · 9a1b6f4
1 parent 8b9902d
commit 9a1b6f4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 0 deletions.
diff --git a/build/CopyDependencies/CopyDependencies.targets b/build/CopyDependencies/CopyDependencies.targets
@@ -31,6 +31,7 @@
       <SourceJars Include="$(JarDownloadDir)\sonar-csharp-enterprise-plugin-$(EmbeddedSonarAnalyzerVersion).jar" />
       <SourceJars Include="$(JarDownloadDir)\sonar-vbnet-enterprise-plugin-$(EmbeddedSonarAnalyzerVersion).jar" />
       <SourceJars Include="$(JarDownloadDir)\sonar-javascript-plugin-$(EmbeddedSonarJSAnalyzerVersion).jar" />
+      <SourceJars Include="$(JarDownloadDir)\sonar-html-plugin-$(EmbeddedSonarHtmlAnalyzerVersion).jar" />
       <SourceJars Include="$(JarDownloadDir)\sonar-text-plugin-$(EmbeddedSonarSecretsJarVersion).jar" />
     </ItemGroup>
     <Copy SourceFiles ="@(SourceJars)" DestinationFolder="$(EmbeddedJarDir)" />

diff --git a/build/DownloadDependencies/CommonProperties.props b/build/DownloadDependencies/CommonProperties.props
@@ -47,6 +47,12 @@
     <JavascriptPluginRemoteUrl>https://repox.jfrog.io/artifactory/sonarsource/org/sonarsource/javascript/sonar-javascript-plugin/$(EmbeddedSonarJSAnalyzerVersion)/$(JavascriptPluginFileName)</JavascriptPluginRemoteUrl>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <HtmlPluginFileName>sonar-html-plugin-$(EmbeddedSonarHtmlAnalyzerVersion).jar</HtmlPluginFileName>
+    <HtmlPluginDownloadPath>$(JarDownloadDir)\$(HtmlPluginFileName)</HtmlPluginDownloadPath>
+    <HtmlPluginRemoteUrl>https://repox.jfrog.io/artifactory/sonarsource/org/sonarsource/html/sonar-html-plugin/$(EmbeddedSonarHtmlAnalyzerVersion)/$(HtmlPluginFileName)</HtmlPluginRemoteUrl>
+  </PropertyGroup>
+
   <PropertyGroup>
     <SonarTextPluginFileName>sonar-text-plugin-$(EmbeddedSonarSecretsJarVersion).jar</SonarTextPluginFileName>
     <SonarTextPluginDownloadPath>$(JarDownloadDir)\$(SonarTextPluginFileName)</SonarTextPluginDownloadPath>

diff --git a/build/DownloadDependencies/JarProcessing.targets b/build/DownloadDependencies/JarProcessing.targets
@@ -49,6 +49,7 @@
 
   <Target Name="DownloadRepoxJars">
     <Exec Command="curl -u$(ARTIFACTORY_USER):$(ARTIFACTORY_PASSWORD) --ssl-no-revoke -C - --create-dirs --output $(JavaScriptPluginDownloadPath) --url $(JavascriptPluginRemoteUrl)" />
+    <Exec Command="curl -u$(ARTIFACTORY_USER):$(ARTIFACTORY_PASSWORD) --ssl-no-revoke -C - --create-dirs --output $(HtmlPluginDownloadPath) --url $(HtmlPluginRemoteUrl)" />
     <Exec Command="curl -u$(ARTIFACTORY_USER):$(ARTIFACTORY_PASSWORD) --ssl-no-revoke -C - --create-dirs --output $(SonarTextPluginDownloadPath) --url $(SonarTextPluginRemoteUrl)" />
     <Exec Command="curl -u$(ARTIFACTORY_USER):$(ARTIFACTORY_PASSWORD) --ssl-no-revoke -C - --create-dirs --output $(EnterpriseSonarCSharpPluginDownloadPath) --url $(EnterpriseSonarCSharpPluginRemoteUrl)" />
     <Exec Command="curl -u$(ARTIFACTORY_USER):$(ARTIFACTORY_PASSWORD) --ssl-no-revoke -C - --create-dirs --output $(EnterpriseSonarVBNetPluginDownloadPath) --url $(EnterpriseSonarVBNetPluginRemoteUrl)" />

diff --git a/src/EmbeddedSonarAnalyzer.props b/src/EmbeddedSonarAnalyzer.props
@@ -7,6 +7,7 @@
     <EmbeddedSonarAnalyzerVersion>10.4.0.108396</EmbeddedSonarAnalyzerVersion>
     <EmbeddedSonarCFamilyAnalyzerVersion>6.62.0.78645</EmbeddedSonarCFamilyAnalyzerVersion>
     <EmbeddedSonarJSAnalyzerVersion>10.20.0.29356</EmbeddedSonarJSAnalyzerVersion>
+    <EmbeddedSonarHtmlAnalyzerVersion>3.18.0.5605</EmbeddedSonarHtmlAnalyzerVersion>
     <EmbeddedSonarSecretsJarVersion>2.20.0.5038</EmbeddedSonarSecretsJarVersion>
     <!-- SLOOP: Binaries for SonarLint Out Of Process -->
     <EmbeddedSloopVersion>10.13.0.79996</EmbeddedSloopVersion>

diff --git a/src/Integration/SLCore/SLCoreConstantsProvider.cs b/src/Integration/SLCore/SLCoreConstantsProvider.cs
@@ -53,6 +53,7 @@ public SLCoreConstantsProvider(IVsInfoProvider vsInfoProvider)
         [
             Language.JS,
             Language.TS,
+            Language.HTML,
             Language.CSS,
             Language.C,
             Language.CPP,
@@ -65,6 +66,7 @@ public SLCoreConstantsProvider(IVsInfoProvider vsInfoProvider)
         [
             Language.JS,
             Language.TS,
+            Language.HTML,
             Language.CSS,
             Language.C,
             Language.CPP,

diff --git a/src/SLCore.IntegrationTests/DependencyLocator.cs b/src/SLCore.IntegrationTests/DependencyLocator.cs
@@ -47,13 +47,15 @@ private static void EnsurePluginsAreAvailable(string localAppData, XmlDocument d
         var roslynAnalyzerVersion = GetDependencyVersion("EmbeddedSonarAnalyzerVersion", dependencyProps);
         var cfamilyAnalyzerVersion = GetDependencyVersion("EmbeddedSonarCFamilyAnalyzerVersion", dependencyProps);
         var jstsAnalyzerVersion = GetDependencyVersion("EmbeddedSonarJSAnalyzerVersion", dependencyProps);
+        var htmlAnalyzerVersion = GetDependencyVersion("EmbeddedSonarHtmlAnalyzerVersion", dependencyProps);
         var secrestsAnalyzerVersion = GetDependencyVersion("EmbeddedSonarSecretsJarVersion", dependencyProps);
         AnalyzerPlugins = new List<string>
         {
             GetAnalyzerPath("sonar-csharp-enterprise-plugin", roslynAnalyzerVersion, availablePluginJars),
             GetAnalyzerPath("sonar-vbnet-enterprise-plugin", roslynAnalyzerVersion, availablePluginJars),
             GetAnalyzerPath("sonar-cfamily-plugin", cfamilyAnalyzerVersion, availablePluginJars),
             GetAnalyzerPath("sonar-javascript-plugin", jstsAnalyzerVersion, availablePluginJars),
+            GetAnalyzerPath("sonar-html-plugin", htmlAnalyzerVersion, availablePluginJars),
             GetAnalyzerPath("sonar-text-plugin", secrestsAnalyzerVersion, availablePluginJars),
         };
     }