sq fix

Author: bia-tech

src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/EnumConverter.java

@@ -37,7 +37,8 @@ public class EnumConverter<T extends Enum<T> & EnumWithValue> extends AbstractSi
 
   private static final String URL_TEMPLATE =
     "https://github.com/1c-syntax/mdclasses/issues/new?labels=bug&title=%5BBUG%5D%20Unknown%20element%20%5B{}%20{}%5D";
-  private static final String WARN_TEMPLATE = "Parsing error due to unknown element {}. Please, create issue using link " + URL_TEMPLATE;
+  private static final String WARN_TEMPLATE = "Parsing error due to unknown element {}. Please, create issue using link "
+    + URL_TEMPLATE;
 
   private final Class<T> enumClazz;
 

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

@@ -155,35 +155,12 @@ private void readPropertiesNode(HierarchicalStreamReader reader,
       var name = reader.getNodeName();
       if (USE_PURPOSES_NODE.equals(name)) {
         readItemNode(reader, context, readerContext, USE_PURPOSES_NODE);
-        reader.moveUp();
-        continue;
-      }
-
-      var fieldClass = readerContext.fieldType(name);
-      if (fieldClass == null) {
-        reader.moveUp();
-        continue;
-      }
-
-      var value = readValue(reader, context, fieldClass);
-
-      if (name.equals(NAME_NODE) && value instanceof String string) {
-        readerContext.setName(string);
-      }
-
-      if (readerContext instanceof MDReaderContext mdReaderContext) {
-        if (name.equals(TEMPLATE_TYPE_NODE) && value instanceof TemplateType templateType) {
-          mdReaderContext.setTemplateType(templateType);
-        }
       } else {
-        var mdcReaderContext = (MDCReaderContext) readerContext;
-        if (name.equals(CP_MODE_NODE) && value instanceof CompatibilityMode compatibilityMode) {
-          mdcReaderContext.setCompatibilityMode(compatibilityMode);
-        } else if (name.equals(CP_EXT_MODE_NODE) && value instanceof CompatibilityMode compatibilityMode) {
-          mdcReaderContext.setConfigurationExtensionCompatibilityMode(compatibilityMode);
+        var fieldClass = readerContext.fieldType(name);
+        if (fieldClass != null) {
+          readValue(reader, context, readerContext, fieldClass, name);
         }
       }
-      readerContext.setValue(name, value);
       reader.moveUp();
     }
   }
@@ -198,6 +175,32 @@ private void readChildrenNames(HierarchicalStreamReader reader, AbstractReaderCo
     }
   }
 
+  private void readValue(HierarchicalStreamReader reader,
+                         UnmarshallingContext context,
+                         AbstractReaderContext readerContext,
+                         Class<?> fieldClass,
+                         String name) {
+    var value = readValue(reader, context, fieldClass);
+
+    if (name.equals(NAME_NODE) && value instanceof String string) {
+      readerContext.setName(string);
+    }
+
+    if (readerContext instanceof MDReaderContext mdReaderContext) {
+      if (name.equals(TEMPLATE_TYPE_NODE) && value instanceof TemplateType templateType) {
+        mdReaderContext.setTemplateType(templateType);
+      }
+    } else {
+      var mdcReaderContext = (MDCReaderContext) readerContext;
+      if (name.equals(CP_MODE_NODE) && value instanceof CompatibilityMode compatibilityMode) {
+        mdcReaderContext.setCompatibilityMode(compatibilityMode);
+      } else if (name.equals(CP_EXT_MODE_NODE) && value instanceof CompatibilityMode compatibilityMode) {
+        mdcReaderContext.setConfigurationExtensionCompatibilityMode(compatibilityMode);
+      }
+    }
+    readerContext.setValue(name, value);
+  }
+
   private Object readValue(HierarchicalStreamReader reader,
                            UnmarshallingContext context,
                            Class<?> fieldClass) {

src/test/java/com/github/_1c_syntax/bsl/smoke/EnumsTest.java

@@ -30,7 +30,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class EnumsTest {
+class EnumsTest {
 
   @Test
   void unknown() {

src/test/resources/ext/edt/mdclasses_ext/configuration/src/Styles/Стиль1/Стиль1.mdo

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mdclass:Style xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdclass="http://g5.1c.ru/v8/dt/metadata/mdclass" xmlns:mdclassExtension="http://g5.1c.ru/v8/dt/metadata/mdclass/extension" uuid="9c8c5d45-d08e-41bb-b0c6-a327475837b7" extendedConfigurationObject="2ef7f6ca-b11c-4e2d-a233-5c5b01675e9a">
+  <name>Стиль1</name>
+  <objectBelonging>Adopted</objectBelonging>
+  <extension xsi:type="mdclassExtension:StyleExtension"/>
+</mdclass:Style>

src/test/resources/ext/edt/mdclasses_ext/configuration/src/Styles/Стиль2/Стиль2.mdo

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mdclass:Style xmlns:mdclass="http://g5.1c.ru/v8/dt/metadata/mdclass" uuid="370755d5-e7d4-4735-a080-d15380d86067">
+  <name>Стиль2</name>
+</mdclass:Style>

src/test/resources/fixtures/mdclasses_ext/Configuration_edt.json

@@ -487,7 +487,12 @@
     ],
     []
   ],
-  "styles": [],
+  "styles": [
+    [
+      2
+    ],
+    []
+  ],
   "subsystems": [
     [
       2