Feature/os class module type

src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLLanguageServer.java

@@ -94,7 +94,7 @@ public class BSLLanguageServer implements LanguageServer, ProtocolExtension {
   public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
 
     clientCapabilitiesHolder.setCapabilities(params.getCapabilities());
-    
+
     setConfigurationRoot(params);
 
     var factory = new NamedForkJoinWorkerThreadFactory("populate-context-");

src/main/java/com/github/_1c_syntax/bsl/languageserver/BSLWorkspaceService.java

@@ -60,11 +60,9 @@ private void onDestroy() {
   }
 
   @Override
-  public CompletableFuture<Either<List<? extends SymbolInformation>,List<? extends WorkspaceSymbol>>> symbol(WorkspaceSymbolParams params) {
-    return CompletableFuture.supplyAsync(
-      () -> Either.forRight(symbolProvider.getSymbols(params)),
-      executorService
-    );
+  @SuppressWarnings("deprecation")
+  public CompletableFuture<Either<List<? extends SymbolInformation>, List<? extends WorkspaceSymbol>>> symbol(WorkspaceSymbolParams params) {
+    return CompletableFuture.supplyAsync(() -> Either.forRight(symbolProvider.getSymbols(params)));
   }
 
   @Override

src/main/java/com/github/_1c_syntax/bsl/languageserver/cfg/BasicBlockVertex.java

@@ -41,7 +41,7 @@ public void addStatement(BSLParserRuleContext statement) {
 
   @Override
   public Optional<BSLParserRuleContext> getAst() {
-    if(statements.isEmpty()) {
+    if (statements.isEmpty()) {
       return super.getAst();
     }
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/cfg/ControlFlowGraphWalker.java

@@ -60,7 +60,7 @@ public CfgEdge walkNext(CfgEdgeType edgeType) {
       .filter(x -> x.getType() == edgeType)
       .findAny();
 
-    if(edgeOrNot.isPresent()) {
+    if (edgeOrNot.isPresent()) {
       currentNode = graph.getEdgeTarget(edgeOrNot.get());
       return edgeOrNot.get();
     }

src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/FormatCommand.java

@@ -134,7 +134,7 @@ private List<File> findFilesForFormatting(String[] filePaths) {
         continue;
       }
 
-      if(srcDir.toFile().isDirectory()) {
+      if (srcDir.toFile().isDirectory()) {
         files.addAll(FileUtils.listFiles(srcDir.toFile(), new String[]{"bsl", "os"}, true));
       } else {
         files.add(srcDir.toFile());

src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/DisableDiagnosticTriggeringSupplier.java

@@ -46,7 +46,6 @@
 
 import static com.github._1c_syntax.bsl.languageserver.providers.DiagnosticProvider.SOURCE;
 
-
 @Component
 public class DisableDiagnosticTriggeringSupplier implements CodeActionSupplier {
 
@@ -83,14 +82,14 @@ public List<CodeAction> getCodeActions(CodeActionParams params, DocumentContext
           .stream()
           .filter(token -> token.getLine() == selectedLineNumber)
           .max(Comparator.comparingInt(Token::getCharPositionInLine))
-          .ifPresent(token -> {
-            if (params.getRange().getStart().getLine() == params.getRange().getEnd().getLine()) {
-              result.addAll(getDisableActionForLine(params, documentContext, token));
-            } else {
-              result.addAll(getDisableActionForRange(params, documentContext, token));
+          .ifPresent((Token token) -> {
+              if (params.getRange().getStart().getLine() == params.getRange().getEnd().getLine()) {
+                result.addAll(getDisableActionForLine(params, documentContext, token));
+              } else {
+                result.addAll(getDisableActionForRange(params, documentContext, token));
+              }
             }
-          }
-        );
+          );
       }
 
       result.addAll(
@@ -176,13 +175,13 @@ private List<CodeAction> actionDisableDiagnostic(Function<String, CodeAction> fu
   private List<TextEdit> createInRegionTextEdits(String diagnosticName, Token last, CodeActionParams params) {
     List<TextEdit> edits = new ArrayList<>();
 
-    Range disableRange = Ranges.create(
+    var disableRange = Ranges.create(
       params.getRange().getStart().getLine(),
       0,
       params.getRange().getStart().getLine(),
       0
     );
-    TextEdit disableTextEdit = new TextEdit(disableRange, String.format("// BSLLS%s-off%n", diagnosticName));
+    var disableTextEdit = new TextEdit(disableRange, String.format("// BSLLS%s-off%n", diagnosticName));
     edits.add(disableTextEdit);
 
     Range enableRange = Ranges.create(
@@ -191,13 +190,13 @@ private List<TextEdit> createInRegionTextEdits(String diagnosticName, Token last
       params.getRange().getEnd().getLine(),
       last.getCharPositionInLine() + last.getText().length()
     );
-    TextEdit enableTextEdit = new TextEdit(enableRange, String.format("%n// BSLLS%s-on%n", diagnosticName));
+    var enableTextEdit = new TextEdit(enableRange, String.format("%n// BSLLS%s-on%n", diagnosticName));
     edits.add(enableTextEdit);
     return edits;
   }
 
   private List<TextEdit> createInFileTextEdits(String diagnosticName) {
-    TextEdit textEdit = new TextEdit(
+    var textEdit = new TextEdit(
       Ranges.create(0, 0, 0, 0),
       String.format("// BSLLS%s-off%n", diagnosticName)
     );
@@ -206,10 +205,10 @@ private List<TextEdit> createInFileTextEdits(String diagnosticName) {
 
   private CodeAction createCodeAction(String title, List<TextEdit> edits, DocumentContext documentContext) {
     Map<String, List<TextEdit>> changes = Map.of(documentContext.getUri().toString(), edits);
-    WorkspaceEdit edit = new WorkspaceEdit();
+    var edit = new WorkspaceEdit();
     edit.setChanges(changes);
 
-    CodeAction codeAction = new CodeAction(title);
+    var codeAction = new CodeAction(title);
     codeAction.setDiagnostics(new ArrayList<>());
     codeAction.setKind(CodeActionKind.Refactor);
     codeAction.setEdit(edit);
@@ -225,15 +224,14 @@ private String getMessage(String key, Object... args) {
   }
 
   private static List<TextEdit> createInLineTextEdits(String diagnosticName, Token last, CodeActionParams params) {
-    Range range = Ranges.create(
+    var range = Ranges.create(
       params.getRange().getStart().getLine(),
       last.getCharPositionInLine() + last.getText().length(),
       params.getRange().getStart().getLine(),
       last.getCharPositionInLine() + last.getText().length()
     );
 
-    TextEdit textEdit = new TextEdit(range, String.format(" // BSLLS%s-off", diagnosticName));
+    var textEdit = new TextEdit(range, String.format(" // BSLLS%s-off", diagnosticName));
     return Collections.singletonList(textEdit);
   }
-
 }

src/main/java/com/github/_1c_syntax/bsl/languageserver/codeactions/QuickFixSupplier.java

@@ -49,8 +49,8 @@ public <T extends Either<String, Integer>> Optional<Class<? extends QuickFixProv
     T diagnosticCode
   ) {
     return Optional.ofNullable(
-      diagnosticInfos.get(DiagnosticCode.getStringValue(diagnosticCode))
-    )
+        diagnosticInfos.get(DiagnosticCode.getStringValue(diagnosticCode))
+      )
       .map(DiagnosticInfo::getDiagnosticClass)
       .filter(QuickFixProvider.class::isAssignableFrom)
       .map(aClass -> (Class<? extends QuickFixProvider>) aClass);

src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/databind/ParametersDeserializer.java

@@ -78,7 +78,8 @@ private static Map<String, Object> getParameterConfiguration(
   ) {
     Map<String, Object> parameterConfiguration;
     try {
-      JavaType type = mapper.getTypeFactory().constructType(new TypeReference<Map<String, Object>>() {});
+      JavaType type = mapper.getTypeFactory().constructType(new TypeReference<Map<String, Object>>() {
+      });
       parameterConfiguration = mapper.readValue(mapper.treeAsTokens(parameterConfig), type);
     } catch (IOException e) {
       LOGGER.error("Can't deserialize parameter configuration", e);

src/main/java/com/github/_1c_syntax/bsl/languageserver/context/DocumentContext.java

@@ -28,13 +28,13 @@
 import com.github._1c_syntax.bsl.languageserver.context.computer.CyclomaticComplexityComputer;
 import com.github._1c_syntax.bsl.languageserver.context.computer.DiagnosticComputer;
 import com.github._1c_syntax.bsl.languageserver.context.computer.DiagnosticIgnoranceComputer;
+import com.github._1c_syntax.bsl.languageserver.context.computer.ModuleTypeComputer;
 import com.github._1c_syntax.bsl.languageserver.context.computer.QueryComputer;
 import com.github._1c_syntax.bsl.languageserver.context.computer.SymbolTreeComputer;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.SymbolTree;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.mdo.MD;
-import com.github._1c_syntax.bsl.mdo.Module;
 import com.github._1c_syntax.bsl.mdo.support.ScriptVariant;
 import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.bsl.parser.BSLParser;
@@ -71,7 +71,6 @@
 import java.util.Optional;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import static java.util.Objects.requireNonNull;
 import static org.antlr.v4.runtime.Token.DEFAULT_CHANNEL;
@@ -119,6 +118,7 @@ public class DocumentContext {
 
   private final Lazy<String[]> contentList = new Lazy<>(this::computeContentList, computeLock);
   private final Lazy<ModuleType> moduleType = new Lazy<>(this::computeModuleType, computeLock);
+  private final Lazy<String> typeName = new Lazy<>(this::computeTypeName, computeLock);
   private final Lazy<ComplexityData> cognitiveComplexityData
     = new Lazy<>(this::computeCognitiveComplexity, computeLock);
   private final Lazy<ComplexityData> cyclomaticComplexityData
@@ -159,13 +159,13 @@ public List<Token> getTokens() {
   }
 
   public List<Token> getTokensFromDefaultChannel() {
-    return getTokens().stream().filter(token -> token.getChannel() == DEFAULT_CHANNEL).collect(Collectors.toList());
+    return getTokens().stream().filter(token -> token.getChannel() == DEFAULT_CHANNEL).toList();
   }
 
   public List<Token> getComments() {
     return getTokens().stream()
       .filter(token -> token.getType() == BSLLexer.LINE_COMMENT)
-      .collect(Collectors.toList());
+      .toList();
   }
 
   public String getText(Range range) {
@@ -237,6 +237,10 @@ public ModuleType getModuleType() {
     return moduleType.getOrCompute();
   }
 
+  public String getTypeName() {
+    return typeName.getOrCompute();
+  }
+
   public SupportVariant getSupportVariant() {
     return getMdObject().map(MD::getSupportVariant).orElse(SupportVariant.NONE);
   }
@@ -364,12 +368,14 @@ private SymbolTree computeSymbolTree() {
     return new SymbolTreeComputer(this).compute();
   }
 
-
   private ModuleType computeModuleType() {
-    return context.getConfiguration()
-      .getModuleByUri(uri)
-      .map(Module::getModuleType)
-      .orElse(ModuleType.UNKNOWN);
+
+    return new ModuleTypeComputer(this).computeModuleType();
+  }
+
+  private String computeTypeName() {
+
+    return new ModuleTypeComputer(this).computeTypeName();
   }
 
   private ComplexityData computeCognitiveComplexity() {

src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/ModuleTypeComputer.java

@@ -0,0 +1,76 @@
+/*
+ * 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.context.computer;
+
+import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.FileType;
+import com.github._1c_syntax.bsl.types.ModuleType;
+
+import java.nio.file.Path;
+
+public class ModuleTypeComputer {
+
+  private final DocumentContext documentContext;
+
+  public ModuleTypeComputer(DocumentContext documentContext) {
+    this.documentContext = documentContext;
+  }
+
+  public ModuleType computeModuleType() {
+
+    ModuleType moduleType;
+    if (documentContext.getFileType() == FileType.BSL) {
+      moduleType = computeBSL();
+    } else if (documentContext.getFileType() == FileType.OS) {
+      moduleType = computeOS();
+    } else {
+      moduleType = ModuleType.UNKNOWN;
+    }
+
+    return moduleType;
+  }
+
+  private ModuleType computeBSL() {
+    var type = documentContext.getServerContext()
+      .getConfiguration().getModuleTypeByURI(documentContext.getUri());
+    return ModuleType.valueOf(type.name());
+  }
+
+  private ModuleType computeOS() {
+    if (documentContext.getUri().getPath().contains("Модули")) {
+      return ModuleType.OScriptModule;
+    } else if (documentContext.getUri().getPath().contains("Классы")) {
+      return ModuleType.OScriptClass;
+    } else {
+      return ModuleType.UNKNOWN;
+    }
+  }
+
+  public String computeTypeName() {
+    if (documentContext.getModuleType() == ModuleType.OScriptModule
+      || documentContext.getModuleType() == ModuleType.OScriptClass) {
+      return Path.of(documentContext.getUri()).getFileName().toString().replace(".os", "");
+    }
+    return "";
+  }
+}
+