SLLS-284 accept path to eslint bridge server bundle

SonarSource · Dec 6, 2024 · c155a86 · c155a86
1 parent c78da87
commit c155a86
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/src/main/java/org/sonarsource/sonarlint/ls/SonarLintLanguageServer.java b/src/main/java/org/sonarsource/sonarlint/ls/SonarLintLanguageServer.java
@@ -336,8 +336,9 @@ public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
         setNotebookSyncOptions(c);
       }
 
+      var eslintBridgeServerPath = (String) additionalAttributes.get("eslintBridgeServerPath");
       var info = new ServerInfo("SonarLint Language Server", getServerVersion("slls-version.txt"));
-      provideBackendInitData(productKey, userAgent, clientNodePath);
+      provideBackendInitData(productKey, userAgent, clientNodePath, eslintBridgeServerPath);
       return new InitializeResult(c, info);
     });
   }
@@ -763,7 +764,7 @@ private void addPluginPathOrWarn(String pluginName, Language language, Map<Strin
         () -> lsLogOutput.warn(format("Embedded plugin not found: %s", SonarLanguage.valueOf(language.name()).getSonarLanguageKey())));
   }
 
-  void provideBackendInitData(String productKey, String userAgent, String clientNodePath) {
+  void provideBackendInitData(String productKey, String userAgent, String clientNodePath, String eslintBridgeServerPath) {
     BackendInitParams params = backendServiceFacade.getInitParams();
     params.setTelemetryProductKey(productKey);
     var actualSonarLintUserHome = Optional.ofNullable(SettingsManager.getSonarLintUserHomeOverride()).orElse(SonarLintUserHome.get());
@@ -780,6 +781,7 @@ void provideBackendInitData(String productKey, String userAgent, String clientNo
       .map(l -> Language.valueOf(l.name())).collect(Collectors.toSet()));
     params.setUserAgent(userAgent);
     params.setClientNodePath(clientNodePath);
+    params.setEslintBridgeServerPath(eslintBridgeServerPath);
   }
 
   public CompletableFuture<Void> showHotspotLocations(ShowHotspotLocationsParams showHotspotLocationsParams) {

diff --git a/src/main/java/org/sonarsource/sonarlint/ls/backend/BackendInitParams.java b/src/main/java/org/sonarsource/sonarlint/ls/backend/BackendInitParams.java
@@ -23,10 +23,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.sonarsource.sonarlint.core.rpc.protocol.common.Language;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.connection.config.SonarCloudConnectionConfigurationDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.connection.config.SonarQubeConnectionConfigurationDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.rules.StandaloneRuleConfigDto;
+import org.sonarsource.sonarlint.core.rpc.protocol.common.Language;
 
 public class BackendInitParams {
 
@@ -44,6 +44,7 @@ public class BackendInitParams {
   private String userAgent;
   private boolean isFocusOnNewCode;
   private String clientNodePath;
+  private String eslintBridgeServerPath;
 
   public String getTelemetryProductKey() {
     return telemetryProductKey;
@@ -156,4 +157,12 @@ public void setClientNodePath(String clientNodePath) {
   public String getClientNodePath() {
     return clientNodePath;
   }
+
+  public void setEslintBridgeServerPath(String eslintBridgeServerPath) {
+    this.eslintBridgeServerPath = eslintBridgeServerPath;
+  }
+
+  public String getEslintBridgeServerPath() {
+    return eslintBridgeServerPath;
+  }
 }
diff --git a/src/main/java/org/sonarsource/sonarlint/ls/backend/BackendServiceFacade.java b/src/main/java/org/sonarsource/sonarlint/ls/backend/BackendServiceFacade.java
@@ -47,6 +47,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.JsTsRequirementsDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.LanguageSpecificRequirements;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.OmnisharpRequirementsDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.initialize.SonarCloudAlternativeEnvironmentDto;
@@ -155,7 +156,8 @@ 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 = getLanguageSpecificRequirements(clientNodeJsPath);
+    var eslintBridgeServerBundlePath = StringUtils.isEmpty(initParams.getEslintBridgeServerPath()) ? null : Path.of(initParams.getEslintBridgeServerPath());
+    var languageSpecificRequirements = getLanguageSpecificRequirements(clientNodeJsPath, eslintBridgeServerBundlePath);
     return new InitializeParams(
       new ClientConstantInfoDto("Visual Studio Code", initParams.getUserAgent()),
       new TelemetryClientConstantAttributesDto(initParams.getTelemetryProductKey(),
@@ -186,9 +188,9 @@ private InitializeParams toInitParams(BackendInitParams initParams) {
   }
 
   @NotNull
-  private LanguageSpecificRequirements getLanguageSpecificRequirements(@Nullable Path clientNodeJsPath) {
+  private LanguageSpecificRequirements getLanguageSpecificRequirements(@Nullable Path clientNodeJsPath, @Nullable Path eslintBridgeSeverPath) {
     return new LanguageSpecificRequirements(
-      clientNodeJsPath,
+      new JsTsRequirementsDto(clientNodeJsPath, eslintBridgeSeverPath),
       getOmnisharpRequirements()
     );
   }