Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/Core/Language.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ public class Language : IEquatable<Language>
{
private const string VersionNumberPattern = "(\\d+\\.\\d+\\.\\d+\\.\\d+)\\";
private static readonly PluginInfo SqvsRoslynPlugin = new("sqvsroslyn", $"sonarqube-ide-visualstudio-roslyn-plugin-{VersionNumberPattern}.jar");
private static readonly PluginInfo CSharpPlugin = new("csharpenterprise", $"sonar-csharp-enterprise-plugin-{VersionNumberPattern}.jar", isEnabledForAnalysis: false);
private static readonly PluginInfo VbNetPlugin = new("vbnetenterprise", $"sonar-vbnet-enterprise-plugin-{VersionNumberPattern}.jar", isEnabledForAnalysis: false);
private static readonly PluginInfo CSharpEnterprisePlugin = new("csharpenterprise", $"sonar-csharp-enterprise-plugin-{VersionNumberPattern}.jar", isEnabledForAnalysis: false);
private static readonly PluginInfo CSharpOssPlugin = new("csharp", $"sonar-csharp-plugin-{VersionNumberPattern}.jar", isEnabledForAnalysis: false);
private static readonly PluginInfo VbNetEnterprisePlugin = new("vbnetenterprise", $"sonar-vbnet-enterprise-plugin-{VersionNumberPattern}.jar", isEnabledForAnalysis: false);
private static readonly PluginInfo VbNetOssPlugin = new("vbnet", $"sonar-vbnet-plugin-{VersionNumberPattern}.jar", isEnabledForAnalysis: false);
private static readonly PluginInfo SecretsPlugin = new("text", $"sonar-text-plugin-{VersionNumberPattern}.jar");
private static readonly PluginInfo CFamilyPlugin = new("cpp", $"sonar-cfamily-plugin-{VersionNumberPattern}.jar");
private static readonly PluginInfo JavascriptPlugin = new("javascript", $"sonar-javascript-plugin-{VersionNumberPattern}.jar");
Expand All @@ -64,9 +66,9 @@ public class Language : IEquatable<Language>

public static readonly Language Unknown = new();
public static readonly RoslynLanguage CSharp = new("CSharp", CoreStrings.CSharpLanguageName, "cs", SqvsRoslynPlugin, CSharpRepo,
settingsFileName: "sonarlint_csharp.globalconfig", roslynDllIdentifier: ".CSharp.", CSharpSecurityRepo, additionalPlugins: [CSharpPlugin]);
settingsFileName: "sonarlint_csharp.globalconfig", roslynDllIdentifier: ".CSharp.", CSharpSecurityRepo, additionalPlugins: [CSharpEnterprisePlugin, CSharpOssPlugin]);
public static readonly RoslynLanguage VBNET = new("VB", CoreStrings.VBNetLanguageName, "vbnet", SqvsRoslynPlugin, VbNetRepo, settingsFileName: "sonarlint_vb.globalconfig", roslynDllIdentifier: ".VisualBasic.",
additionalPlugins: [VbNetPlugin]);
additionalPlugins: [VbNetEnterprisePlugin, VbNetOssPlugin]);
public static readonly Language Cpp = new("C++", CoreStrings.CppLanguageName, "cpp", CFamilyPlugin, CppRepo);
public static readonly Language C = new("C", "C", "c", CFamilyPlugin, CRepo);
public static readonly Language Js = new("Js", "JavaScript", "js", JavascriptPlugin, JsRepo, JsSecurityRepo);
Expand Down
2 changes: 1 addition & 1 deletion src/EmbeddedSonarAnalyzer.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<EmbeddedSonarSecretsJarVersion>2.34.0.9939</EmbeddedSonarSecretsJarVersion>
<EmbeddedSonarSqvsRoslynJarVersion>1.1.0.235</EmbeddedSonarSqvsRoslynJarVersion>
<!-- SLOOP: Binaries for SonarLint Out Of Process -->
<EmbeddedSloopVersion>10.38.0.83993</EmbeddedSloopVersion>
<EmbeddedSloopVersion>10.38.0.84032</EmbeddedSloopVersion>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public void StandalonePlugins_ReturnsStandalonePluginsIncludingRoslyn()
[TestMethod]
public void ListDisabledPluginKeysForAnalysis_ReturnsCsharpAndVbNetPluginKeys()
{
List<string> expectedPluginKeys = ["csharpenterprise", "vbnetenterprise"];
List<string> expectedPluginKeys = ["csharpenterprise", "csharp", "vbnetenterprise", "vbnet"];

var result = testSubject.ListDisabledPluginKeysForAnalysis();

Expand Down
2 changes: 1 addition & 1 deletion src/SLCore.IntegrationTests/SLCoreTestRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public async Task Start(TestLogger testLogger)

var jarProvider = Substitute.For<ISLCoreEmbeddedPluginProvider>();
jarProvider.ListJarFiles().Returns(DependencyLocator.AnalyzerPlugins);
jarProvider.ListDisabledPluginKeysForAnalysis().Returns([Language.CSharp.AdditionalPlugins.Single().Key, Language.VBNET.AdditionalPlugins.Single().Key]);
jarProvider.ListDisabledPluginKeysForAnalysis().Returns(Language.CSharp.AdditionalPlugins.Concat(Language.VBNET.AdditionalPlugins).Select(x => x.Key).ToList());

var compatibleNodeLocator = Substitute.For<INodeLocationProvider>();
compatibleNodeLocator.Get().Returns((string)null);
Expand Down