more tests

Author: nixel2007

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/AbstractRunTestsCodeLensSupplier.java

@@ -0,0 +1,62 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright (c) 2018-2023
+ * Alexey Sosnoviy <labotamy@gmail.com>, Nikita Fedkin <nixel2007@gmail.com> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * BSL Language Server is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * BSL Language Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with BSL Language Server.
+ */
+package com.github._1c_syntax.bsl.languageserver.codelenses;
+
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.FileType;
+import com.github._1c_syntax.bsl.languageserver.events.LanguageServerInitializeRequestReceivedEvent;
+import org.eclipse.lsp4j.ClientInfo;
+import org.eclipse.lsp4j.InitializeParams;
+import org.springframework.context.event.EventListener;
+
+import java.util.Optional;
+
+public abstract class AbstractRunTestsCodeLensSupplier<T extends CodeLensData>
+  implements CodeLensSupplier<T> {
+
+  private boolean clientIsSupported;
+
+  /**
+   * Обработчик события {@link LanguageServerInitializeRequestReceivedEvent}.
+   * <p>
+   * Анализирует тип подключенного клиента и управляет применимостью линзы.
+   *
+   * @param event Событие
+   */
+  @EventListener
+  public void handleEvent(LanguageServerInitializeRequestReceivedEvent event) {
+    var clientName = Optional.of(event)
+      .map(LanguageServerInitializeRequestReceivedEvent::getParams)
+      .map(InitializeParams::getClientInfo)
+      .map(ClientInfo::getName)
+      .orElse("");
+    clientIsSupported = "Visual Studio Code".equals(clientName);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public boolean isApplicable(DocumentContext documentContext) {
+    return documentContext.getFileType() == FileType.OS && clientIsSupported;
+  }
+}

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunAllTestsCodeLensSupplier.java

@@ -50,41 +50,14 @@
 @RequiredArgsConstructor
 @Slf4j
 public class RunAllTestsCodeLensSupplier
-  implements CodeLensSupplier<DefaultCodeLensData> {
+  extends AbstractRunTestsCodeLensSupplier<DefaultCodeLensData> {
 
   private static final String COMMAND_ID = "language-1c-bsl.languageServer.runAllTests";
 
   private final TestRunnerAdapter testRunnerAdapter;
   private final LanguageServerConfiguration configuration;
   private final Resources resources;
 
-  private boolean clientIsSupported;
-
-  /**
-   * Обработчик события {@link LanguageServerInitializeRequestReceivedEvent}.
-   * <p>
-   * Анализирует тип подключенного клиента и управляет применимостью линзы.
-   *
-   * @param event Событие
-   */
-  @EventListener
-  public void handleEvent(LanguageServerInitializeRequestReceivedEvent event) {
-    var clientName = Optional.of(event)
-      .map(LanguageServerInitializeRequestReceivedEvent::getParams)
-      .map(InitializeParams::getClientInfo)
-      .map(ClientInfo::getName)
-      .orElse("");
-    clientIsSupported = "Visual Studio Code".equals(clientName);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public boolean isApplicable(DocumentContext documentContext) {
-    return documentContext.getFileType() == FileType.OS && clientIsSupported;
-  }
-
   /**
    * {@inheritDoc}
    */

src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunTestCodeLensSupplier.java

@@ -56,41 +56,14 @@
 @RequiredArgsConstructor
 @Slf4j
 public class RunTestCodeLensSupplier
-  implements CodeLensSupplier<RunTestCodeLensSupplier.RunTestCodeLensData> {
+  extends AbstractRunTestsCodeLensSupplier<RunTestCodeLensSupplier.RunTestCodeLensData> {
 
   private static final String COMMAND_ID = "language-1c-bsl.languageServer.runTest";
 
   private final TestRunnerAdapter testRunnerAdapter;
   private final LanguageServerConfiguration configuration;
   private final Resources resources;
 
-  private boolean clientIsSupported;
-
-  /**
-   * Обработчик события {@link LanguageServerInitializeRequestReceivedEvent}.
-   * <p>
-   * Анализирует тип подключенного клиента и управляет применимостью линзы.
-   *
-   * @param event Событие
-   */
-  @EventListener
-  public void handleEvent(LanguageServerInitializeRequestReceivedEvent event) {
-    var clientName = Optional.of(event)
-      .map(LanguageServerInitializeRequestReceivedEvent::getParams)
-      .map(InitializeParams::getClientInfo)
-      .map(ClientInfo::getName)
-      .orElse("");
-    clientIsSupported = "Visual Studio Code".equals(clientName);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public boolean isApplicable(DocumentContext documentContext) {
-    return documentContext.getFileType() == FileType.OS && clientIsSupported;
-  }
-
   /**
    * {@inheritDoc}
    */