#1434 Заполнение isPreferred для квик-фиксов

1c-syntax · Nov 16, 2020 · 73914a9 · 73914a9
1 parent f79150a
commit 73914a9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeActionProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeActionProvider.java
@@ -73,6 +73,9 @@ public static List<CodeAction> createCodeActions(
     codeAction.setDiagnostics(diagnostics);
     codeAction.setEdit(edit);
     codeAction.setKind(CodeActionKind.QuickFix);
+    if (diagnostics.size() == 1) {
+      codeAction.setIsPreferred(Boolean.TRUE);
+    }
 
     return Collections.singletonList(codeAction);
 

diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeActionProviderTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/providers/CodeActionProviderTest.java
@@ -42,6 +42,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
 
+import javax.annotation.CheckForNull;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -102,6 +103,7 @@ void testGetCodeActions() {
       .anyMatch(codeAction -> codeAction.getDiagnostics().contains(diagnostics.get(0)))
       .anyMatch(codeAction -> codeAction.getDiagnostics().contains(diagnostics.get(1)))
       .anyMatch(codeAction -> codeAction.getKind().equals(CodeActionKind.QuickFix))
+      .allMatch(codeAction -> (codeAction.getDiagnostics().size() == 1) == toBoolean(codeAction.getIsPreferred()))
     ;
   }
 
@@ -163,4 +165,11 @@ void testOnly() {
       .containsOnly(CodeActionKind.Refactor)
     ;
   }
+
+  private static boolean toBoolean(@CheckForNull Boolean value) {
+    if (value == null) {
+      return false;
+    }
+    return value;
+  }
 }