Prepare release 3.5 (update sonarlint-core and parent-oss)

SonarSource · Apr 23, 2024 · 616e61f · 616e61f
1 parent 10fd1ba
commit 616e61f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.parent</groupId>
     <artifactId>parent</artifactId>
-    <version>71.0.0.1292</version>
+    <version>72.0.0.1405</version>
     <relativePath/>
   </parent>
   <groupId>org.sonarsource.sonarlint.ls</groupId>
@@ -24,7 +24,7 @@
 
   <properties>
     <jdk.min.version>17</jdk.min.version>
-    <sonarlint.core.version>10.1.0.77680</sonarlint.core.version>
+    <sonarlint.core.version>10.1.0.77731</sonarlint.core.version>
     <!-- Version used by Xodus -->
     <kotlin.version>1.6.10</kotlin.version>
     <!-- analyzers used for tests -->

diff --git a/src/main/java/org/sonarsource/sonarlint/ls/backend/BackendServiceFacade.java b/src/main/java/org/sonarsource/sonarlint/ls/backend/BackendServiceFacade.java
@@ -44,6 +44,7 @@
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.FeatureFlagsDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.HttpConfigurationDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.InitializeParams;
+import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.LanguageSpecificRequirements;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.SonarCloudAlternativeEnvironmentDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.SslConfigurationDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.TelemetryClientConstantAttributesDto;
@@ -136,8 +137,14 @@ private void initOnce(Map<String, ServerConnectionSettings> connections) {
 
   private InitializeParams toInitParams(BackendInitParams initParams) {
     var telemetryEnabled = telemetry != null && telemetry.enabled();
+    var clientNodeJsPath = StringUtils.isEmpty(initParams.getClientNodePath()) ? null : Path.of(initParams.getClientNodePath());
+    var languageSpecificRequirements = new LanguageSpecificRequirements(
+      clientNodeJsPath,
+      // Omnisharp requirements are set to null since analysis is still in process
+      null
+    );
     return new InitializeParams(
-      new ClientConstantInfoDto("Visual Studio Code", initParams.getUserAgent()),
+      new ClientConstantInfoDto("Visual Studio Code", initParams.getUserAgent(), Integer.MIN_VALUE),
       new TelemetryClientConstantAttributesDto(initParams.getTelemetryProductKey(),
         telemetryInitParams.getProductName(),
         telemetryInitParams.getProductVersion(),
@@ -158,7 +165,7 @@ private InitializeParams toInitParams(BackendInitParams initParams) {
       initParams.getSonarlintUserHome(),
       initParams.getStandaloneRuleConfigByKey(),
       initParams.isFocusOnNewCode(),
-      StringUtils.isEmpty(initParams.getClientNodePath()) ? null : Path.of(initParams.getClientNodePath())
+      languageSpecificRequirements
     );
   }
 

diff --git a/src/main/java/org/sonarsource/sonarlint/ls/clientapi/SonarLintVSCodeClient.java b/src/main/java/org/sonarsource/sonarlint/ls/clientapi/SonarLintVSCodeClient.java
@@ -484,7 +484,7 @@ public List<ClientFileDto> listFiles(String configScopeId) {
           .map(file -> {
             var filePath = Path.of(file.getFilePath());
             return new ClientFileDto(filePath.toUri(), folderPath.relativize(filePath), configScopeId, null, StandardCharsets.UTF_8.name(), filePath,
-              file.getContent());
+              file.getContent(), null);
           })
           .toList();
       }).join())

diff --git a/src/main/java/org/sonarsource/sonarlint/ls/folders/ModuleEventsProcessor.java b/src/main/java/org/sonarsource/sonarlint/ls/folders/ModuleEventsProcessor.java
@@ -91,7 +91,7 @@ private void notifyBackend(List<FileEvent> changes) {
             var relativePath = baseDir.relativize(fsPath);
             var folderUri = folder.getUri().toString();
             var isTest = isTestFile(fileUri, settings);
-            addedOrChangedFiles.add(new ClientFileDto(fileUri, relativePath, folderUri, isTest, StandardCharsets.UTF_8.name(), fsPath, null));
+            addedOrChangedFiles.add(new ClientFileDto(fileUri, relativePath, folderUri, isTest, StandardCharsets.UTF_8.name(), fsPath, null, null));
           });
       }
     });