Use released sonarlint-core 6.5

SonarSource · Sep 24, 2021 · 852068c · 852068c
1 parent ab5fbeb
commit 852068c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
   </issueManagement>
 
   <properties>
-    <sonarlint.core.version>6.4.0.36592</sonarlint.core.version>
+    <sonarlint.core.version>6.5.0.37122</sonarlint.core.version>
     <!-- analyzers used for tests -->
     <sonar.java.version>6.15.0.25849</sonar.java.version>
     <sonar.javascript.version>6.2.1.12157</sonar.javascript.version>

diff --git a/src/main/java/org/sonarsource/sonarlint/ls/CommandManager.java b/src/main/java/org/sonarsource/sonarlint/ls/CommandManager.java
@@ -49,10 +49,10 @@
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseError;
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode;
-import org.sonar.api.batch.fs.TextRange;
 import org.sonarsource.sonarlint.core.client.api.common.ClientInputFileEdit;
 import org.sonarsource.sonarlint.core.client.api.common.QuickFix;
 import org.sonarsource.sonarlint.core.client.api.common.RuleDetails;
+import org.sonarsource.sonarlint.core.client.api.common.TextRange;
 import org.sonarsource.sonarlint.core.client.api.common.analysis.Issue;
 import org.sonarsource.sonarlint.core.client.api.connected.ConnectedRuleDetails;
 import org.sonarsource.sonarlint.core.client.api.connected.ConnectedSonarLintEngine;
@@ -67,6 +67,7 @@
 import org.sonarsource.sonarlint.ls.standalone.StandaloneEngineManager;
 
 import static java.net.URI.create;
+import static org.sonar.api.utils.Preconditions.checkNotNull;
 import static org.sonarsource.sonarlint.ls.AnalysisManager.SONARLINT_SOURCE;
 import static org.sonarsource.sonarlint.ls.AnalysisManager.SONARQUBE_TAINT_SOURCE;
 
@@ -184,9 +185,13 @@ private static TextEdit newLspTextEdit(org.sonarsource.sonarlint.core.client.api
   }
 
   private static Range newLspRange(TextRange range) {
+    checkNotNull(range.getStartLine());
+    checkNotNull(range.getStartLineOffset());
+    checkNotNull(range.getEndLine());
+    checkNotNull(range.getEndLineOffset());
     Range lspRange = new Range();
-    lspRange.setStart(new Position(range.start().line() - 1, range.start().lineOffset()));
-    lspRange.setEnd(new Position(range.end().line() - 1, range.end().lineOffset()));
+    lspRange.setStart(new Position(range.getStartLine() - 1, range.getStartLineOffset()));
+    lspRange.setEnd(new Position(range.getEndLine() - 1, range.getEndLineOffset()));
     return lspRange;
   }
 

diff --git a/src/test/java/org/sonarsource/sonarlint/ls/CommandManagerTests.java b/src/test/java/org/sonarsource/sonarlint/ls/CommandManagerTests.java
@@ -46,6 +46,7 @@
 import org.sonarsource.sonarlint.core.client.api.common.ClientInputFileEdit;
 import org.sonarsource.sonarlint.core.client.api.common.QuickFix;
 import org.sonarsource.sonarlint.core.client.api.common.TextEdit;
+import org.sonarsource.sonarlint.core.client.api.common.TextRange;
 import org.sonarsource.sonarlint.core.client.api.common.analysis.ClientInputFile;
 import org.sonarsource.sonarlint.core.client.api.common.analysis.Issue;
 import org.sonarsource.sonarlint.core.client.api.connected.ConnectedRuleDetails;
@@ -56,8 +57,6 @@
 import org.sonarsource.sonarlint.core.client.api.standalone.StandaloneRuleDetails;
 import org.sonarsource.sonarlint.core.client.api.standalone.StandaloneRuleParam;
 import org.sonarsource.sonarlint.core.client.api.standalone.StandaloneSonarLintEngine;
-import org.sonarsource.sonarlint.core.container.analysis.filesystem.DefaultTextPointer;
-import org.sonarsource.sonarlint.core.container.analysis.filesystem.DefaultTextRange;
 import org.sonarsource.sonarlint.core.container.standalone.rule.DefaultStandaloneRuleParam;
 import org.sonarsource.sonarlint.ls.SonarLintExtendedLanguageClient.ShowRuleDescriptionParams;
 import org.sonarsource.sonarlint.ls.connected.ProjectBindingManager;
@@ -193,7 +192,7 @@ void showQuickFixFromAnalyzer() {
 
     TextEdit textEdit = mock(TextEdit.class);
     when(textEdit.newText()).thenReturn("");
-    when(textEdit.range()).thenReturn(new DefaultTextRange(new DefaultTextPointer(1, 0), new DefaultTextPointer(1, 1)));
+    when(textEdit.range()).thenReturn(new TextRange(1, 0,1, 1));
     ClientInputFileEdit edit = mock(ClientInputFileEdit.class);
     when(edit.textEdits()).thenReturn(Collections.singletonList(textEdit));
     ClientInputFile target = mock(ClientInputFile.class);