sq fix

Author: theshadowco

src/main/java/com/github/_1c_syntax/bsl/reader/common/context/MDCReaderContext.java

@@ -23,7 +23,6 @@
 
 import com.github._1c_syntax.bsl.mdo.MD;
 import com.github._1c_syntax.bsl.mdo.Module;
-import com.github._1c_syntax.bsl.mdo.ModuleOwner;
 import com.github._1c_syntax.bsl.mdo.children.ObjectModule;
 import com.github._1c_syntax.bsl.reader.MDOReader;
 import com.github._1c_syntax.bsl.reader.common.TransformationUtils;
@@ -55,8 +54,12 @@
 public class MDCReaderContext implements ReaderContext {
 
   private static final String UUID_FIELD_NAME = "uuid";
+  private static final String MDO_REFERENCE_FIELD_NAME = "mdoReference";
   private static final String SUPPORT_VALIANT_FIELD_NAME = "SupportVariant";
   private static final String CHILD_FILED_NAME = "child";
+  private static final String COMPATIBILITY_MODE_FILED_NAME = "compatibilityMode";
+  private static final String CONFIGURATION_SOURCE_MODE_FILED_NAME = "configurationSource";
+  private static final String MODULES_FIELD_NAME = "modules";
 
   /**
    * Класс будущего объекта
@@ -131,22 +134,19 @@ public MDCReaderContext(@NonNull Class<?> clazz, @NonNull HierarchicalStreamRead
   @Override
   public Object build() {
     var mdoReference = MdoReference.create(mdoType, name);
-    setValue("mdoReference", mdoReference);
+    setValue(MDO_REFERENCE_FIELD_NAME, mdoReference);
 
     if (compatibilityMode == null) {
-      setValue("compatibilityMode", configurationExtensionCompatibilityMode);
+      setValue(COMPATIBILITY_MODE_FILED_NAME, configurationExtensionCompatibilityMode);
     }
 
     if (isDesignerFormat) {
-      setValue("configurationSource", ConfigurationSource.DESIGNER);
+      setValue(CONFIGURATION_SOURCE_MODE_FILED_NAME, ConfigurationSource.DESIGNER);
     } else {
-      setValue("configurationSource", ConfigurationSource.EDT);
-    }
-
-    if (ModuleOwner.class.isAssignableFrom(realClass)) {
-      setValueModules(mdoReference);
+      setValue(CONFIGURATION_SOURCE_MODE_FILED_NAME, ConfigurationSource.EDT);
     }
 
+    setValueModules(mdoReference);
     setValueChildren();
 
     return TransformationUtils.build(builder);
@@ -175,36 +175,19 @@ private void setValueChildren() {
   }
 
   private void setValueModules(MdoReference mdoReference) {
-    var moduleTypes = ModuleType.byMDOType(mdoType);
-    if (moduleTypes.isEmpty()) {
+    var folder = getModuleFolder();
+    if (!folder.toFile().exists()) {
       return;
     }
 
-    // todo переделать
-    Path folder;
-    if (isDesignerFormat) {
-      folder = DesignerPaths.moduleFolder(currentPath, mdoType);
-    } else {
-      folder = EDTPaths.moduleFolder(currentPath, mdoType);
-    }
-
-    if (!folder.toFile().exists()) {
+    var moduleTypes = ModuleType.byMDOType(mdoType);
+    if (moduleTypes.isEmpty()) {
       return;
     }
 
     List<Module> modules = new ArrayList<>();
     moduleTypes.forEach((ModuleType moduleType) -> {
-        Path modulePath;
-        // todo переделать
-        if (isDesignerFormat) {
-          modulePath = DesignerPaths.modulePath(folder, name, moduleType);
-        } else if (mdoType == MDOType.CONFIGURATION) {
-          modulePath = EDTPaths.modulePath(folder, MDOType.CONFIGURATION.getName(), moduleType);
-        } else {
-          modulePath = EDTPaths.modulePath(folder, name, moduleType);
-        }
-
-        var protectedModuleInfo = new ProtectedModuleInfo(modulePath);
+        var protectedModuleInfo = getModuleInfo(folder, moduleType);
         if (protectedModuleInfo.getModulePath().toFile().exists()) {
           modules.add(ObjectModule.builder()
             .moduleType(moduleType)
@@ -216,7 +199,24 @@ private void setValueModules(MdoReference mdoReference) {
         }
       }
     );
-    setValue("modules", modules);
+    setValue(MODULES_FIELD_NAME, modules);
   }
 
+  private Path getModuleFolder() {
+    if (isDesignerFormat) {
+      return DesignerPaths.moduleFolder(currentPath, mdoType);
+    } else {
+      return EDTPaths.moduleFolder(currentPath, mdoType);
+    }
+  }
+
+  private ProtectedModuleInfo getModuleInfo(Path folder, ModuleType moduleType) {
+    Path modulePath;
+    if (isDesignerFormat) {
+      modulePath = DesignerPaths.modulePath(folder, name, moduleType);
+    } else {
+      modulePath = EDTPaths.modulePath(folder, MDOType.CONFIGURATION.getName(), moduleType);
+    }
+    return new ProtectedModuleInfo(modulePath);
+  }
 }

src/main/java/com/github/_1c_syntax/bsl/reader/common/context/package-info.java

@@ -0,0 +1,25 @@
+/*
+ * This file is a part of MDClasses.
+ *
+ * Copyright (c) 2019 - 2023
+ * Tymko Oleg <[email protected]>, Maximov Valery <[email protected]> and contributors
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ *
+ * MDClasses 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.
+ *
+ * MDClasses 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 MDClasses.
+ */
+/**
+ * Контексты, используемые при чтении файлов
+ */
+package com.github._1c_syntax.bsl.reader.common.context;

src/main/java/com/github/_1c_syntax/bsl/reader/edt/converter/Unmarshaller.java

@@ -114,8 +114,9 @@ private void readNode(String name, UnmarshallingContext context, ReaderContext r
   private Object transformMultiLanguageString(ReaderContext readerContext, String name, Object value) {
     var newVal = value;
     if (readerContext.getLastName().equals(name)
-      && readerContext.getLastValue() instanceof MultiLanguageString && value instanceof MultiLanguageString) {
-      newVal = new MultiLanguageString((MultiLanguageString) readerContext.getLastValue(), (MultiLanguageString) value);
+      && readerContext.getLastValue() instanceof MultiLanguageString lastValue
+      && value instanceof MultiLanguageString newValue) {
+      newVal = new MultiLanguageString(lastValue, newValue);
     }
     readerContext.setLastName(name);
     readerContext.setLastValue(newVal);

src/main/java/com/github/_1c_syntax/bsl/reader/edt/converter/XDTOPackageConverter.java

@@ -23,7 +23,6 @@
 
 import com.github._1c_syntax.bsl.mdo.XDTOPackage;
 import com.github._1c_syntax.bsl.mdo.storage.XdtoPackageData;
-import com.github._1c_syntax.bsl.reader.common.TransformationUtils;
 import com.github._1c_syntax.bsl.reader.common.converter.AbstractReadConverter;
 import com.github._1c_syntax.bsl.reader.edt.EDTPaths;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;