Отправка вопроса только в том случае, если произошла инициализация сервера

Author: nixel2007

src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/sentry/PermissionFilterBeforeSendCallback.java

@@ -21,6 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.aop.sentry;
 
+import com.github._1c_syntax.bsl.languageserver.ClientCapabilitiesHolder;
 import com.github._1c_syntax.bsl.languageserver.LanguageClientHolder;
 import com.github._1c_syntax.bsl.languageserver.configuration.Language;
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
@@ -63,6 +64,8 @@ public class PermissionFilterBeforeSendCallback implements BeforeSendCallback {
 
   private final LanguageClientHolder languageClientHolder;
 
+  private final ClientCapabilitiesHolder clientCapabilitiesHolder;
+
   private final ServerInfo serverInfo;
 
   private final AtomicBoolean questionWasSend = new AtomicBoolean(false);
@@ -78,7 +81,7 @@ public SentryEvent execute(@NotNull SentryEvent event, @NotNull Hint hint) {
 
   private boolean sendToSentry() {
     if (configuration.getSendErrors() == SendErrorsMode.ASK) {
-      if (!languageClientHolder.isConnected()) {
+      if (!languageClientHolder.isConnected() || clientCapabilitiesHolder.getCapabilities().isEmpty()) {
         return false;
       }
 

src/test/java/com/github/_1c_syntax/bsl/languageserver/aop/sentry/PermissionFilterBeforeSendCallbackTest.java

@@ -21,13 +21,15 @@
  */
 package com.github._1c_syntax.bsl.languageserver.aop.sentry;
 
+import com.github._1c_syntax.bsl.languageserver.ClientCapabilitiesHolder;
 import com.github._1c_syntax.bsl.languageserver.LanguageClientHolder;
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 import com.github._1c_syntax.bsl.languageserver.configuration.SendErrorsMode;
 import com.github._1c_syntax.bsl.languageserver.util.CleanupContextBeforeClassAndAfterEachTestMethod;
 import com.github._1c_syntax.bsl.languageserver.utils.Resources;
 import io.sentry.Hint;
 import io.sentry.SentryEvent;
+import org.eclipse.lsp4j.ClientCapabilities;
 import org.eclipse.lsp4j.MessageActionItem;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.junit.jupiter.api.Test;
@@ -54,6 +56,9 @@ class PermissionFilterBeforeSendCallbackTest {
   @Autowired
   private LanguageClientHolder languageClientHolder;
 
+  @Autowired
+  private ClientCapabilitiesHolder clientCapabilitiesHolder;
+
   @Test
   void sendOnlyOnSendMode() {
 
@@ -168,6 +173,7 @@ void sendIfUserGavePermission() {
     when(languageClient.showMessageRequest(any())).thenReturn(CompletableFuture.completedFuture(answer));
 
     languageClientHolder.connect(languageClient);
+    clientCapabilitiesHolder.setCapabilities(mock(ClientCapabilities.class));
 
     var event = new SentryEvent();
 
@@ -180,6 +186,35 @@ void sendIfUserGavePermission() {
 
   }
 
+  @Test
+  void dontAskIfServerWasNotInitialized() {
+
+    // given
+    configuration.setSendErrors(SendErrorsMode.ASK);
+
+    var languageClient = mock(LanguageClient.class);
+    var answerTitle = Resources.getResourceString(
+      configuration.getLanguage(),
+      PermissionFilterBeforeSendCallback.class,
+      "answer_send"
+    );
+    var answer = new MessageActionItem(answerTitle);
+    when(languageClient.showMessageRequest(any())).thenReturn(CompletableFuture.completedFuture(answer));
+
+    languageClientHolder.connect(languageClient);
+    clientCapabilitiesHolder.setCapabilities(null);
+
+    var event = new SentryEvent();
+
+    // when
+    var filteredEvent = permissionFilter.execute(event, mock(Hint.class));
+
+    // then
+    assertThat(filteredEvent).isNull();
+    assertThat(configuration.getSendErrors()).isEqualTo(SendErrorsMode.ASK);
+
+  }
+
   @Test
   void notSendNextTimeIfUserGavePermissionOnce() {
 
@@ -196,6 +231,7 @@ void notSendNextTimeIfUserGavePermissionOnce() {
     when(languageClient.showMessageRequest(any())).thenReturn(CompletableFuture.completedFuture(answer));
 
     languageClientHolder.connect(languageClient);
+    clientCapabilitiesHolder.setCapabilities(mock(ClientCapabilities.class));
 
     var event = new SentryEvent();