Свой ModuleType

Author: asosnoviy

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

@@ -25,11 +25,11 @@
 import com.github._1c_syntax.bsl.languageserver.configuration.LanguageServerConfiguration;
 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.context.ModuleType;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.RegionSymbol;
 import com.github._1c_syntax.bsl.languageserver.utils.Regions;
 import com.github._1c_syntax.mdclasses.Configuration;
 import com.github._1c_syntax.mdclasses.common.ConfigurationSource;
-import com.github._1c_syntax.mdclasses.mdo.support.ModuleType;
 import com.github._1c_syntax.mdclasses.mdo.support.ScriptVariant;
 import org.eclipse.lsp4j.CodeAction;
 import org.eclipse.lsp4j.CodeActionKind;

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

@@ -28,6 +28,7 @@
 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;
@@ -39,7 +40,6 @@
 import com.github._1c_syntax.bsl.parser.SDBLTokenizer;
 import com.github._1c_syntax.mdclasses.common.ConfigurationSource;
 import com.github._1c_syntax.mdclasses.mdo.AbstractMDObjectBase;
-import com.github._1c_syntax.mdclasses.mdo.support.ModuleType;
 import com.github._1c_syntax.mdclasses.mdo.support.ScriptVariant;
 import com.github._1c_syntax.mdclasses.supportconf.SupportConfiguration;
 import com.github._1c_syntax.mdclasses.supportconf.SupportVariant;
@@ -344,7 +344,8 @@ private SymbolTree computeSymbolTree() {
 
 
   private ModuleType computeModuleType() {
-    return context.getConfiguration().getModuleType(uri);
+
+    return new ModuleTypeComputer(this).computeModuleType();
   }
 
   private Map<SupportConfiguration, SupportVariant> computeSupportVariants() {

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

@@ -0,0 +1,49 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright (c) 2018-2022
+ * 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;
+
+public enum ModuleType {
+  BotModule(),
+  IntegrationServiceModule(),
+  CommandModule(),
+  CommonModule(),
+  ObjectModule(),
+  ManagerModule(),
+  FormModule(),
+  RecordSetModule(),
+  ValueManagerModule(),
+  ApplicationModule(),
+  ManagedApplicationModule(),
+  SessionModule(),
+  ExternalConnectionModule(),
+  OrdinaryApplicationModule(),
+  HTTPServiceModule(),
+  WEBServiceModule(),
+  Class(),
+  Module(),
+  UNKNOWN(); // для неизвестных типов модулей
+
+  public static ModuleType valueOf(com.github._1c_syntax.mdclasses.mdo.support.ModuleType mdoModuleType){
+
+    return valueOf(mdoModuleType.name());
+  }
+}

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

@@ -23,7 +23,6 @@
 
 import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
 import com.github._1c_syntax.mdclasses.Configuration;
-import com.github._1c_syntax.mdclasses.mdo.support.ModuleType;
 import com.github._1c_syntax.utils.Absolute;
 import com.github._1c_syntax.utils.Lazy;
 import lombok.RequiredArgsConstructor;

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

@@ -22,11 +22,11 @@
 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.ModuleType;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.ModuleSymbol;
 import com.github._1c_syntax.bsl.languageserver.utils.MdoRefBuilder;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import com.github._1c_syntax.bsl.parser.BSLLexer;
-import com.github._1c_syntax.mdclasses.mdo.support.ModuleType;
 import org.antlr.v4.runtime.Token;
 import org.eclipse.lsp4j.SymbolKind;
 

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

@@ -0,0 +1,66 @@
+/*
+ * This file is a part of BSL Language Server.
+ *
+ * Copyright (c) 2018-2022
+ * 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.languageserver.context.ModuleType;
+
+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() {
+    com.github._1c_syntax.mdclasses.mdo.support.ModuleType type = documentContext.getServerContext()
+      .getConfiguration().getModuleType(documentContext.getUri());
+    return ModuleType.valueOf(type.name());
+  }
+
+  private ModuleType computeOS() {
+    if (documentContext.getUri().toString().contains("Модули")) {
+      return ModuleType.Module;
+    } else if (documentContext.getUri().toString().contains("Классы")) {
+      return ModuleType.Class;
+    } else {
+      return ModuleType.UNKNOWN;
+    }
+  }
+}
+

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/AbstractMetadataDiagnostic.java

@@ -21,11 +21,11 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.context.ModuleType;
 import com.github._1c_syntax.bsl.languageserver.utils.Ranges;
 import com.github._1c_syntax.mdclasses.mdo.AbstractMDObjectBSL;
 import com.github._1c_syntax.mdclasses.mdo.AbstractMDObjectBase;
 import com.github._1c_syntax.mdclasses.mdo.support.MDOType;
-import com.github._1c_syntax.mdclasses.mdo.support.ModuleType;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.eclipse.lsp4j.Range;
 
@@ -111,7 +111,7 @@ private void checkMetadataWithModules() {
     documentContext.getMdObject().ifPresent((AbstractMDObjectBase mdo) -> {
       if (mdo instanceof AbstractMDObjectBSL) {
         var modules = ((AbstractMDObjectBSL) mdo).getModules().stream()
-          .filter(mdoModule -> OBJECT_MODULES.contains(mdoModule.getModuleType()))
+          .filter(mdoModule -> OBJECT_MODULES.contains(ModuleType.valueOf(mdoModule.getModuleType())))
           .collect(Collectors.toList());
 
         // чтобы не анализировать несколько раз, выберем только один модуль, например модуль менеджера
@@ -134,7 +134,7 @@ private void checkMetadataWithoutModules() {
       .filter(mdo -> filterMdoTypes.contains(mdo.getType()))
       .filter(mdo -> !(mdo instanceof AbstractMDObjectBSL)
         || (((AbstractMDObjectBSL) mdo).getModules().stream()
-        .noneMatch(module -> OBJECT_MODULES.contains(module.getModuleType()))))
+        .noneMatch(module -> OBJECT_MODULES.contains(ModuleType.valueOf(module.getModuleType())))))
       .forEach(this::checkMetadata);
   }
 }

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CachedPublicDiagnostic.java

@@ -29,7 +29,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.utils.Keywords;
 import com.github._1c_syntax.mdclasses.mdo.MDCommonModule;
-import com.github._1c_syntax.mdclasses.mdo.support.ModuleType;
+import com.github._1c_syntax.bsl.languageserver.context.ModuleType;
 import com.github._1c_syntax.mdclasses.mdo.support.ReturnValueReuse;
 import com.github._1c_syntax.utils.CaseInsensitivePattern;
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeAfterAsyncCallDiagnostic.java

@@ -28,7 +28,7 @@
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType;
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
-import com.github._1c_syntax.mdclasses.mdo.support.ModuleType;
+import com.github._1c_syntax.bsl.languageserver.context.ModuleType;
 import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import org.antlr.v4.runtime.tree.ParseTree;
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/CodeOutOfRegionDiagnostic.java

@@ -21,6 +21,7 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
+import com.github._1c_syntax.bsl.languageserver.context.ModuleType;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
 import com.github._1c_syntax.bsl.languageserver.context.symbol.RegionSymbol;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCompatibilityMode;
@@ -35,7 +36,6 @@
 import com.github._1c_syntax.bsl.languageserver.utils.Trees;
 import com.github._1c_syntax.bsl.parser.BSLParser;
 import com.github._1c_syntax.bsl.parser.BSLParserRuleContext;
-import com.github._1c_syntax.mdclasses.mdo.support.ModuleType;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.antlr.v4.runtime.tree.TerminalNode;
 import org.antlr.v4.runtime.tree.Tree;
@@ -72,6 +72,7 @@ public class CodeOutOfRegionDiagnostic extends AbstractVisitorDiagnostic {
   public ParseTree visitFile(BSLParser.FileContext ctx) {
 
     // Для неизвестных модулей не будем требовать нахождения кода в области
+    // fix me bsl only
     if (documentContext.getModuleType() == ModuleType.UNKNOWN && !checkUnknownModuleType) {
       return ctx;
     }