#113 / Отказ изменения source в диагностике, представление source для…

… вывода на форму
otymko · Dec 1, 2020 · a8f9aef · a8f9aef
1 parent c1efe26
commit a8f9aef
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/com/github/otymko/phoenixbsl/gui/stage/IssuesStage.java b/src/main/java/com/github/otymko/phoenixbsl/gui/stage/IssuesStage.java
@@ -214,7 +214,8 @@ public void updateIssues(List<Diagnostic> diagnostics) {
       var startLine = position.getLine() + 1 + lineOffset;
 
       Issue issue = new Issue();
-      issue.setSource(diagnostic.getSource());
+
+      issue.setSource(PhoenixAPI.getValueSourceByString(diagnostic.getSource()));
       issue.setDescription(diagnostic.getMessage());
       issue.setStartLine(startLine);
       issue.setLocation(String.valueOf(startLine));

diff --git a/src/main/java/com/github/otymko/phoenixbsl/logic/PhoenixAPI.java b/src/main/java/com/github/otymko/phoenixbsl/logic/PhoenixAPI.java
@@ -1,6 +1,7 @@
 package com.github.otymko.phoenixbsl.logic;
 
 import com.github.otymko.phoenixbsl.logic.designer.DesignerTextEditor;
+import com.github.otymko.phoenixbsl.logic.service.SonarLintService;
 import com.sun.jna.platform.win32.WinDef;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
@@ -138,6 +139,16 @@ public void clearListBySource(List<Diagnostic> diagnostics, String source) {
     diagnostics.removeAll(exclude);
   }
 
+  public String getValueSourceByString(String value) {
+    String result;
+    if (value.equals(SonarLintService.SOURCE)) {
+      result = SonarLintService.SOURCE;
+    } else {
+      result = "bsl-ls";
+    }
+    return result;
+  }
+
   private static void applyAllQuickFixes(List<Either<Command, CodeAction>> codeActions, String[] strings) {
     codeActions.forEach(diagnostic -> {
       CodeAction codeAction = diagnostic.getRight();

diff --git a/src/main/java/com/github/otymko/phoenixbsl/logic/lsp/BSLLanguageClient.java b/src/main/java/com/github/otymko/phoenixbsl/logic/lsp/BSLLanguageClient.java
@@ -19,7 +19,7 @@
 import java.util.concurrent.CompletableFuture;
 
 public class BSLLanguageClient implements LanguageClient {
-  private static final String SOURCE = "bsl-ls";
+  private static final String SOURCE = "bsl-language-server";
 
   public BSLLanguageClient() {
     // none
@@ -51,8 +51,6 @@ public void publishDiagnostics(PublishDiagnosticsParams publishDiagnosticsParams
 
     var diagnosticList = core.getTextEditor().getDiagnostics();
     PhoenixAPI.clearListBySource(diagnosticList, SOURCE);
-    publishDiagnosticsParams.getDiagnostics().parallelStream()
-      .forEach(diagnostic -> diagnostic.setSource(SOURCE));
     diagnosticList.addAll(publishDiagnosticsParams.getDiagnostics());
 
     PhoenixCore.getInstance().getEventManager().notify(