diff --git a/docs/ru/examples.md b/docs/ru/examples.md index b69c84a04..6c0229273 100644 --- a/docs/ru/examples.md +++ b/docs/ru/examples.md @@ -7,6 +7,7 @@ - [Базовые операции](#базовые-операции) - [Работа с конфигурацией](#работа-с-конфигурацией) - [Работа с метаданными](#работа-с-метаданными) +- [Работа с типами реквизитов](#работа-с-типами-реквизитов) - [Работа с формами](#работа-с-формами) - [Работа с модулями](#работа-с-модулями) - [Поиск и фильтрация объектов](#поиск-и-фильтрация-объектов) @@ -44,6 +45,11 @@ import com.github._1c_syntax.bsl.mdo.ModuleType; import com.github._1c_syntax.bsl.mdo.Right; import com.github._1c_syntax.bsl.mdo.Role; import com.github._1c_syntax.bsl.mdo.Subsystem; +import com.github._1c_syntax.bsl.mdo.support.AttributeType; +import com.github._1c_syntax.bsl.mdo.support.NumberQualifier; +import com.github._1c_syntax.bsl.mdo.support.StringQualifier; +import com.github._1c_syntax.bsl.mdo.support.TypeCategory; +import com.github._1c_syntax.bsl.mdo.support.TypeDescription; // ... и другие объекты метаданных // Путь к каталогу конфигурации @@ -200,6 +206,108 @@ configuration.getInformationRegisters().forEach(register -> { }); ``` +## Работа с типами реквизитов + +Библиотека предоставляет полную информацию о типах данных реквизитов метаданных. + +### Получение базовой информации о типе + +```java +// Работа с реквизитами справочника +Catalog catalog = (Catalog) configuration.findChild("Catalog.МойСправочник").orElse(null); + +if (catalog != null) { + catalog.getAllAttributes().forEach(attribute -> { + AttributeType type = attribute.getType(); + + System.out.println("Реквизит: " + attribute.getName()); + System.out.println(" Тип: " + type.getDisplayName()); + System.out.println(" Составной: " + type.isComposite()); + }); +} +``` + +### Работа с примитивными типами + +```java +// Пример работы со строковым типом +AttributeType type = attribute.getType(); +List descriptions = type.getTypeDescriptions(); + +for (TypeDescription desc : descriptions) { + if (desc.isPrimitive() && "String".equals(desc.getTypeName())) { + System.out.println("Примитивный тип: " + desc.getTypeName()); + + // Получение квалификаторов строки + if (desc.getQualifier().isPresent() && + desc.getQualifier().get() instanceof StringQualifier) { + StringQualifier sq = (StringQualifier) desc.getQualifier().get(); + System.out.println(" Длина: " + sq.getLength()); + System.out.println(" Допустимая длина: " + sq.getAllowedLength()); + } + } +} +``` + +### Работа с ссылочными типами + +```java +// Определение ссылочных типов +for (TypeDescription desc : type.getTypeDescriptions()) { + if (desc.isReference()) { + System.out.println("Ссылочный тип: " + desc.getTypeName()); + + // Анализ типа ссылки + if (desc.getTypeName().startsWith("CatalogRef.")) { + String catalogName = desc.getTypeName().substring("CatalogRef.".length()); + System.out.println(" Ссылка на справочник: " + catalogName); + } else if (desc.getTypeName().startsWith("DocumentRef.")) { + String documentName = desc.getTypeName().substring("DocumentRef.".length()); + System.out.println(" Ссылка на документ: " + documentName); + } + } +} +``` + +### Работа с составными типами + +```java +// Обработка составных типов (несколько типов в одном реквизите) +AttributeType type = attribute.getType(); + +if (type.isComposite()) { + System.out.println("Составной тип содержит:"); + + for (TypeDescription desc : type.getTypeDescriptions()) { + System.out.println(" - " + desc.getTypeName() + + " (категория: " + desc.getCategory() + ")"); + } +} +``` + +### Анализ типов по категориям + +```java +import com.github._1c_syntax.bsl.mdo.support.TypeCategory; + +// Группировка реквизитов по категориям типов +Map> attributesByCategory = + catalog.getAllAttributes().stream() + .collect(Collectors.groupingBy(attr -> { + // Берем категорию первого типа (для простых типов) + return attr.getType().getTypeDescriptions().isEmpty() + ? TypeCategory.PRIMITIVE + : attr.getType().getTypeDescriptions().get(0).getCategory(); + })); + +attributesByCategory.forEach((category, attributes) -> { + System.out.println("Категория " + category + ":"); + attributes.forEach(attr -> + System.out.println(" " + attr.getName() + ": " + + attr.getType().getDisplayName())); +}); +``` + ## Работа с формами ### Получение и анализ форм diff --git a/docs/ru/features.md b/docs/ru/features.md index d5774ca8e..c7d6516c1 100644 --- a/docs/ru/features.md +++ b/docs/ru/features.md @@ -25,6 +25,16 @@ На данный момент поддерживается загрузка всех видов метаданных, существующих в версиях платформы 1С до 8.3.24. В заивисимости от типа объекта и потребностей, объем читаемой информации может различаться (реализация чтения дополнительной информации выполняется от задач). Актуальное содержимое того или иного вида объекта метаданных можно всегда находится в классе его реализации в пакете [mdo](com.github._1c_syntax.bsl.mdo). +### Типы данных реквизитов + +Библиотека поддерживает получение информации о типах данных реквизитов метаданных. Для любого реквизита можно получить: + +- тип данных (примитивный, ссылочный, определяемый, составной) +- квалификаторы типа (длина строки, точность числа и т.д.) +- полную информацию о составных типах + +Типы поддерживаются для всех объектов, содержащих реквизиты: справочники, документы, регистры, планы счетов и видов характеристик, задачи и др. + Немного о структуре пакета: - в корне расположены классы видов объектов метаданных (Справочники, Документы, Перечисления и т.д.), базовые интерфейсы diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/Attribute.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/Attribute.java index 1b3e541f9..c29c79e5a 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/Attribute.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/Attribute.java @@ -22,6 +22,7 @@ package com.github._1c_syntax.bsl.mdo; import com.github._1c_syntax.bsl.mdo.support.AttributeKind; +import com.github._1c_syntax.bsl.mdo.support.AttributeType; import com.github._1c_syntax.bsl.mdo.support.IndexingType; /** @@ -43,4 +44,9 @@ public interface Attribute extends MDChild { * Вариант индексирования реквизита */ IndexingType getIndexing(); + + /** + * Тип данных реквизита + */ + AttributeType getType(); } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/AccountingFlag.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/AccountingFlag.java index 522f465ef..49d4ff87f 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/AccountingFlag.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/AccountingFlag.java @@ -24,6 +24,8 @@ import com.github._1c_syntax.bsl.mdo.AccessRightsOwner; import com.github._1c_syntax.bsl.mdo.Attribute; import com.github._1c_syntax.bsl.mdo.support.AttributeKind; +import com.github._1c_syntax.bsl.mdo.support.AttributeType; +import com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl; import com.github._1c_syntax.bsl.mdo.support.IndexingType; import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; @@ -69,6 +71,12 @@ public class AccountingFlag implements Attribute, AccessRightsOwner { AttributeKind kind = AttributeKind.CUSTOM; @Default IndexingType indexing = IndexingType.DONT_INDEX; + + /** + * Тип данных реквизита + */ + @Default + AttributeType type = AttributeTypeImpl.EMPTY; /** * Возвращает перечень возможных прав доступа diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/Dimension.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/Dimension.java index 172f44242..f0626ed81 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/Dimension.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/Dimension.java @@ -24,6 +24,8 @@ import com.github._1c_syntax.bsl.mdo.AccessRightsOwner; import com.github._1c_syntax.bsl.mdo.Attribute; import com.github._1c_syntax.bsl.mdo.support.AttributeKind; +import com.github._1c_syntax.bsl.mdo.support.AttributeType; +import com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl; import com.github._1c_syntax.bsl.mdo.support.IndexingType; import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; @@ -90,6 +92,12 @@ public class Dimension implements Attribute, AccessRightsOwner { */ boolean useInTotals = true; + /** + * Тип данных реквизита + */ + @Default + AttributeType type = AttributeTypeImpl.EMPTY; + /** * Возвращает перечень возможных прав доступа */ diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/DocumentJournalColumn.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/DocumentJournalColumn.java index 44ca55141..421a5a7f4 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/DocumentJournalColumn.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/DocumentJournalColumn.java @@ -23,6 +23,8 @@ import com.github._1c_syntax.bsl.mdo.Attribute; import com.github._1c_syntax.bsl.mdo.support.AttributeKind; +import com.github._1c_syntax.bsl.mdo.support.AttributeType; +import com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl; import com.github._1c_syntax.bsl.mdo.support.IndexingType; import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; @@ -65,4 +67,10 @@ public class DocumentJournalColumn implements Attribute { AttributeKind kind = AttributeKind.CUSTOM; @Default IndexingType indexing = IndexingType.DONT_INDEX; + + /** + * Тип данных реквизита + */ + @Default + AttributeType type = AttributeTypeImpl.EMPTY; } diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExtDimensionAccountingFlag.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExtDimensionAccountingFlag.java index 82d62c1be..917d8884a 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExtDimensionAccountingFlag.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExtDimensionAccountingFlag.java @@ -24,6 +24,8 @@ import com.github._1c_syntax.bsl.mdo.AccessRightsOwner; import com.github._1c_syntax.bsl.mdo.Attribute; import com.github._1c_syntax.bsl.mdo.support.AttributeKind; +import com.github._1c_syntax.bsl.mdo.support.AttributeType; +import com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl; import com.github._1c_syntax.bsl.mdo.support.IndexingType; import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; @@ -69,6 +71,12 @@ public class ExtDimensionAccountingFlag implements Attribute, AccessRightsOwner AttributeKind kind = AttributeKind.CUSTOM; @Default IndexingType indexing = IndexingType.DONT_INDEX; + + /** + * Тип данных реквизита + */ + @Default + AttributeType type = AttributeTypeImpl.EMPTY; /** * Возвращает перечень возможных прав доступа diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTableField.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTableField.java index 97cb3fd85..3af67c4bd 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTableField.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ExternalDataSourceTableField.java @@ -24,6 +24,8 @@ import com.github._1c_syntax.bsl.mdo.AccessRightsOwner; import com.github._1c_syntax.bsl.mdo.Attribute; import com.github._1c_syntax.bsl.mdo.support.AttributeKind; +import com.github._1c_syntax.bsl.mdo.support.AttributeType; +import com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl; import com.github._1c_syntax.bsl.mdo.support.IndexingType; import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; @@ -72,6 +74,12 @@ public class ExternalDataSourceTableField implements Attribute, AccessRightsOwne @Default IndexingType indexing = IndexingType.DONT_INDEX; + /** + * Тип данных реквизита + */ + @Default + AttributeType type = AttributeTypeImpl.EMPTY; + /** * Возвращает перечень возможных прав доступа */ diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectAttribute.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectAttribute.java index e40775294..c5c5c385e 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectAttribute.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/ObjectAttribute.java @@ -24,6 +24,8 @@ import com.github._1c_syntax.bsl.mdo.AccessRightsOwner; import com.github._1c_syntax.bsl.mdo.Attribute; import com.github._1c_syntax.bsl.mdo.support.AttributeKind; +import com.github._1c_syntax.bsl.mdo.support.AttributeType; +import com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl; import com.github._1c_syntax.bsl.mdo.support.IndexingType; import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; @@ -114,6 +116,12 @@ public class ObjectAttribute implements Attribute, AccessRightsOwner { */ boolean fillFromFillingValue; + /** + * Тип данных реквизита + */ + @Default + AttributeType type = AttributeTypeImpl.EMPTY; + /** * Возвращает перечень возможных прав доступа */ diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/Resource.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/Resource.java index 51ef29889..b63f21606 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/Resource.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/Resource.java @@ -24,6 +24,8 @@ import com.github._1c_syntax.bsl.mdo.AccessRightsOwner; import com.github._1c_syntax.bsl.mdo.Attribute; import com.github._1c_syntax.bsl.mdo.support.AttributeKind; +import com.github._1c_syntax.bsl.mdo.support.AttributeType; +import com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl; import com.github._1c_syntax.bsl.mdo.support.IndexingType; import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; @@ -74,6 +76,12 @@ public class Resource implements Attribute, AccessRightsOwner { * Свое */ + /** + * Тип данных реквизита + */ + @Default + AttributeType type = AttributeTypeImpl.EMPTY; + /** * Возвращает перечень возможных прав доступа */ diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/TaskAddressingAttribute.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/TaskAddressingAttribute.java index 19ab1d687..459174ce6 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/mdo/children/TaskAddressingAttribute.java +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/children/TaskAddressingAttribute.java @@ -24,6 +24,8 @@ import com.github._1c_syntax.bsl.mdo.AccessRightsOwner; import com.github._1c_syntax.bsl.mdo.Attribute; import com.github._1c_syntax.bsl.mdo.support.AttributeKind; +import com.github._1c_syntax.bsl.mdo.support.AttributeType; +import com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl; import com.github._1c_syntax.bsl.mdo.support.IndexingType; import com.github._1c_syntax.bsl.mdo.support.MultiLanguageString; import com.github._1c_syntax.bsl.mdo.support.ObjectBelonging; @@ -69,6 +71,12 @@ public class TaskAddressingAttribute implements Attribute, AccessRightsOwner { AttributeKind kind = AttributeKind.CUSTOM; @Default IndexingType indexing = IndexingType.DONT_INDEX; + + /** + * Тип данных реквизита + */ + @Default + AttributeType type = AttributeTypeImpl.EMPTY; /* * Свое diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/support/AttributeType.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/AttributeType.java new file mode 100644 index 000000000..225db471d --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/AttributeType.java @@ -0,0 +1,47 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.mdo.support; + +import java.util.List; + +/** + * Базовый интерфейс для типов реквизитов метаданных + */ +public interface AttributeType { + + /** + * Возвращает список примитивных типов, составляющих данный тип + * Для примитивных типов - один элемент + * Для составных типов - несколько элементов + */ + List getTypeDescriptions(); + + /** + * Возвращает true, если тип является составным (содержит несколько типов) + */ + boolean isComposite(); + + /** + * Возвращает строковое представление типа + */ + String getDisplayName(); +} \ No newline at end of file diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/support/AttributeTypeFactory.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/AttributeTypeFactory.java new file mode 100644 index 000000000..f8078d748 --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/AttributeTypeFactory.java @@ -0,0 +1,206 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.mdo.support; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +/** + * Фабрика для создания типов реквизитов из данных парсинга + */ +public final class AttributeTypeFactory { + + private AttributeTypeFactory() { + // utility class + } + + /** + * Создает тип на основе списка строковых представлений типов + */ + public static AttributeType createType(List typeNames) { + if (typeNames == null || typeNames.isEmpty()) { + return AttributeTypeImpl.EMPTY; + } + + List descriptions = new ArrayList<>(); + for (String typeName : typeNames) { + TypeDescription description = createTypeDescription(typeName); + descriptions.add(description); + } + + return AttributeTypeImpl.builder() + .typeDescriptions(descriptions) + .build(); + } + + /** + * Создает тип на основе одного строкового представления + */ + public static AttributeType createType(String typeName) { + if (typeName == null) { + return AttributeTypeImpl.EMPTY; + } + return createType(List.of(typeName)); + } + + /** + * Создает описание типа на основе строкового представления + */ + private static TypeDescription createTypeDescription(String typeName) { + String normalized = normalizeTypeName(typeName); + TypeCategory category = determineTypeCategory(normalized); + + return TypeDescription.builder() + .typeName(normalized) + .category(category) + .build(); + } + + /** + * Нормализует имя типа, удаляя префиксы пространств имен + */ + private static String normalizeTypeName(String typeName) { + if (typeName == null) { + return null; + } + String trimmed = typeName.trim(); + if (trimmed.startsWith("xs:")) { + return trimmed.substring(3); + } + if (trimmed.startsWith("cfg:")) { + return trimmed.substring(4); + } + return trimmed; + } + + /** + * Определяет категорию типа по его названию + */ + private static TypeCategory determineTypeCategory(String typeName) { + if (typeName == null || typeName.isEmpty()) { + return TypeCategory.PRIMITIVE; + } + + // Примитивные типы + if (isPrimitiveType(typeName)) { + return TypeCategory.PRIMITIVE; + } + + // Ссылочные типы + if (isReferenceType(typeName)) { + return TypeCategory.REFERENCE; + } + + // Определяемые типы + if (typeName.startsWith("DefinedType.")) { + return TypeCategory.DEFINED; + } + + // По умолчанию - примитивный + return TypeCategory.PRIMITIVE; + } + + /** + * Проверяет, является ли тип примитивным + */ + private static boolean isPrimitiveType(String typeName) { + return typeName.equals("String") + || typeName.equals("Number") + || typeName.equals("Boolean") + || typeName.equals("Date") + || typeName.equals("Binary") + || typeName.equals("UUID") + || typeName.startsWith("xs:"); + } + + /** + * Проверяет, является ли тип ссылочным + */ + private static boolean isReferenceType(String typeName) { + return typeName.contains("Ref.") + || typeName.contains("Object.") + || typeName.contains("Manager.") + || typeName.contains("List.") + || typeName.contains("Selection."); + } + + /** + * Создает тип с квалификаторами строки + */ + public static AttributeType createStringType(int length, StringQualifier.AllowedLength allowedLength) { + // Валидация параметров + if (length < 0) { + throw new IllegalArgumentException("String length must be >= 0"); + } + if (allowedLength == null) { + allowedLength = StringQualifier.AllowedLength.VARIABLE; + } + + StringQualifier qualifier = StringQualifier.builder() + .length(length) + .allowedLength(allowedLength) + .build(); + + TypeDescription description = TypeDescription.builder() + .typeName("String") + .category(TypeCategory.PRIMITIVE) + .qualifier(Optional.of(qualifier)) + .build(); + + return AttributeTypeImpl.builder() + .typeDescriptions(List.of(description)) + .build(); + } + + /** + * Создает тип с квалификаторами числа + */ + public static AttributeType createNumberType(int precision, int fractionDigits, NumberQualifier.AllowedSign allowedSign) { + // Валидация параметров + if (precision <= 0) { + throw new IllegalArgumentException("Number precision must be > 0"); + } + if (fractionDigits < 0 || fractionDigits > precision) { + throw new IllegalArgumentException("fractionDigits must be in range [0, precision]"); + } + if (allowedSign == null) { + allowedSign = NumberQualifier.AllowedSign.ANY; + } + + NumberQualifier qualifier = NumberQualifier.builder() + .precision(precision) + .fractionDigits(fractionDigits) + .allowedSign(allowedSign) + .build(); + + TypeDescription description = TypeDescription.builder() + .typeName("Number") + .category(TypeCategory.PRIMITIVE) + .qualifier(Optional.of(qualifier)) + .build(); + + return AttributeTypeImpl.builder() + .typeDescriptions(List.of(description)) + .build(); + } +} \ No newline at end of file diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/support/AttributeTypeImpl.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/AttributeTypeImpl.java new file mode 100644 index 000000000..6843f7da4 --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/AttributeTypeImpl.java @@ -0,0 +1,78 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.mdo.support; + +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.Value; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * Реализация типа реквизита метаданных + */ +@Value +@Builder +@ToString +@EqualsAndHashCode +public class AttributeTypeImpl implements AttributeType { + + /** + * Список описаний типов + */ + @Default + List typeDescriptions = Collections.emptyList(); + + @Override + public List getTypeDescriptions() { + return Collections.unmodifiableList(typeDescriptions); + } + + @Override + public boolean isComposite() { + return typeDescriptions.size() > 1; + } + + @Override + public String getDisplayName() { + if (typeDescriptions.isEmpty()) { + return "Unknown"; + } + + if (typeDescriptions.size() == 1) { + return typeDescriptions.get(0).getTypeName(); + } + + return typeDescriptions.stream() + .map(TypeDescription::getTypeName) + .collect(Collectors.joining(", ")); + } + + /** + * Пустой тип (когда тип не определен) + */ + public static final AttributeType EMPTY = AttributeTypeImpl.builder().build(); +} \ No newline at end of file diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/support/NumberQualifier.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/NumberQualifier.java new file mode 100644 index 000000000..5540b35a6 --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/NumberQualifier.java @@ -0,0 +1,69 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.mdo.support; + +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.Value; + +/** + * Квалификаторы числового типа данных + */ +@Value +@Builder +@ToString +@EqualsAndHashCode +public class NumberQualifier implements TypeQualifier { + + /** + * Точность числа (общее количество разрядов) + */ + @Default + int precision = 0; + + /** + * Количество разрядов в дробной части + */ + @Default + int fractionDigits = 0; + + /** + * Допустимый знак числа + */ + @Default + AllowedSign allowedSign = AllowedSign.ANY; + + @Override + public QualifierType getQualifierType() { + return QualifierType.NUMBER; + } + + /** + * Допустимые знаки числа + */ + public enum AllowedSign { + ANY, + NONNEGATIVE + } +} \ No newline at end of file diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/support/QualifierType.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/QualifierType.java new file mode 100644 index 000000000..f0126cece --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/QualifierType.java @@ -0,0 +1,47 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.mdo.support; + +/** + * Типы квалификаторов типов данных + */ +public enum QualifierType { + /** + * Квалификаторы строки (длина, допустимая длина) + */ + STRING, + + /** + * Квалификаторы числа (точность, разрядность, знак) + */ + NUMBER, + + /** + * Квалификаторы даты (части даты) + */ + DATE, + + /** + * Квалификаторы двоичных данных (длина) + */ + BINARY +} \ No newline at end of file diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/support/StringQualifier.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/StringQualifier.java new file mode 100644 index 000000000..bc4a96aa1 --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/StringQualifier.java @@ -0,0 +1,63 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.mdo.support; + +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.Value; + +/** + * Квалификаторы строкового типа данных + */ +@Value +@Builder +@ToString +@EqualsAndHashCode +public class StringQualifier implements TypeQualifier { + + /** + * Длина строки + */ + @Default + int length = 0; + + /** + * Допустимая длина (фиксированная/переменная) + */ + @Default + AllowedLength allowedLength = AllowedLength.VARIABLE; + + @Override + public QualifierType getQualifierType() { + return QualifierType.STRING; + } + + /** + * Типы допустимой длины строки + */ + public enum AllowedLength { + FIXED, + VARIABLE + } +} \ No newline at end of file diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/support/TypeCategory.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/TypeCategory.java new file mode 100644 index 000000000..4bd88cfc0 --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/TypeCategory.java @@ -0,0 +1,47 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.mdo.support; + +/** + * Категории типов данных реквизитов + */ +public enum TypeCategory { + /** + * Примитивные типы: String, Number, Boolean, Date, etc. + */ + PRIMITIVE, + + /** + * Ссылочные типы: CatalogRef.XXX, DocumentRef.XXX, etc. + */ + REFERENCE, + + /** + * Определяемые типы + */ + DEFINED, + + /** + * Типы характеристик + */ + CHARACTERISTIC +} \ No newline at end of file diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/support/TypeDescription.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/TypeDescription.java new file mode 100644 index 000000000..f1114bd3b --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/TypeDescription.java @@ -0,0 +1,72 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.mdo.support; + +import lombok.Builder; +import lombok.Builder.Default; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.Value; + +import java.util.Optional; + +/** + * Описание одного типа данных + */ +@Value +@Builder +@ToString +@EqualsAndHashCode +public class TypeDescription { + + /** + * Название типа (например: "String", "CatalogRef.Справочник1", "Boolean") + */ + @Default + String typeName = ""; + + /** + * Категория типа + */ + @Default + TypeCategory category = TypeCategory.PRIMITIVE; + + /** + * Квалификаторы типа (для строк, чисел и т.д.) + */ + @Default + Optional qualifier = Optional.empty(); + + /** + * Возвращает true, если тип является примитивным + */ + public boolean isPrimitive() { + return category == TypeCategory.PRIMITIVE; + } + + /** + * Возвращает true, если тип является ссылочным + */ + public boolean isReference() { + return category == TypeCategory.REFERENCE; + } +} \ No newline at end of file diff --git a/src/main/java/com/github/_1c_syntax/bsl/mdo/support/TypeQualifier.java b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/TypeQualifier.java new file mode 100644 index 000000000..1e0f08a8f --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/mdo/support/TypeQualifier.java @@ -0,0 +1,33 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.mdo.support; + +/** + * Базовый интерфейс для квалификаторов типов данных + */ +public interface TypeQualifier { + + /** + * Возвращает тип квалификатора + */ + QualifierType getQualifierType(); +} \ No newline at end of file diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/AttributeTypeConverterBase.java b/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/AttributeTypeConverterBase.java new file mode 100644 index 000000000..d31eed4ba --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/reader/common/converter/AttributeTypeConverterBase.java @@ -0,0 +1,119 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.converter; + +import com.github._1c_syntax.bsl.mdo.support.AttributeType; +import com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl; +import com.github._1c_syntax.bsl.mdo.support.NumberQualifier; +import com.github._1c_syntax.bsl.mdo.support.StringQualifier; +import com.github._1c_syntax.bsl.mdo.support.TypeDescription; +import com.github._1c_syntax.bsl.mdo.support.TypeCategory; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +/** + * Базовый класс для конвертеров типов атрибутов + */ +public abstract class AttributeTypeConverterBase extends AbstractReadConverter { + + /** + * Создает TypeDescription с правильным применением квалификаторов + * @param typeName имя типа + * @param stringQualifier строковый квалификатор (применяется только к String) + * @param numberQualifier числовой квалификатор (применяется только к Number) + * @return объект TypeDescription + * @throws IllegalArgumentException если typeName null или пустой + */ + protected TypeDescription createTypeDescription(String typeName, + Optional stringQualifier, + Optional numberQualifier) { + // Валидация входных данных + if (typeName == null || typeName.trim().isEmpty()) { + throw new IllegalArgumentException("Type name cannot be null or empty"); + } + + final String normalizedName = typeName.trim(); + TypeCategory category = determineTypeCategory(normalizedName); + TypeDescription.TypeDescriptionBuilder builder = TypeDescription.builder() + .typeName(normalizedName) + .category(category); + + // Применяем квалификаторы только к соответствующим примитивам + if (category == TypeCategory.PRIMITIVE) { + if ("String".equalsIgnoreCase(normalizedName) && stringQualifier.isPresent()) { + builder.qualifier(Optional.of(stringQualifier.get())); + } else if ("Number".equalsIgnoreCase(normalizedName) && numberQualifier.isPresent()) { + builder.qualifier(Optional.of(numberQualifier.get())); + } + } + + return builder.build(); + } + + /** + * Создает AttributeTypeImpl из списка типов и квалификаторов + * @param typeNames список имен типов + * @param stringQualifier строковый квалификатор + * @param numberQualifier числовой квалификатор + * @return объект AttributeType + */ + protected AttributeType createAttributeType(List typeNames, + Optional stringQualifier, + Optional numberQualifier) { + if (typeNames == null || typeNames.isEmpty()) { + return AttributeTypeImpl.EMPTY; + } + + List typeDescriptions = new ArrayList<>(); + for (String typeName : typeNames) { + if (typeName != null && !typeName.trim().isEmpty()) { + typeDescriptions.add(createTypeDescription(typeName, stringQualifier, numberQualifier)); + } + } + + if (typeDescriptions.isEmpty()) { + return AttributeTypeImpl.EMPTY; + } + + return AttributeTypeImpl.builder() + .typeDescriptions(typeDescriptions) + .build(); + } + + /** + * Определяет категорию типа по его названию + * @param typeName название типа + * @return категория типа + */ + protected TypeCategory determineTypeCategory(String typeName) { + if (typeName.contains("Ref.") || typeName.contains("Object.")) { + return TypeCategory.REFERENCE; + } + if (typeName.startsWith("DefinedType.")) { + return TypeCategory.DEFINED; + } + return TypeCategory.PRIMITIVE; + } +} + diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/designer/DesignerReader.java b/src/main/java/com/github/_1c_syntax/bsl/reader/designer/DesignerReader.java index 850ea1e75..ccb1f1836 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/reader/designer/DesignerReader.java +++ b/src/main/java/com/github/_1c_syntax/bsl/reader/designer/DesignerReader.java @@ -37,6 +37,7 @@ import com.github._1c_syntax.bsl.mdo.children.HTTPServiceURLTemplate; import com.github._1c_syntax.bsl.mdo.children.IntegrationServiceChannel; import com.github._1c_syntax.bsl.mdo.children.ObjectAttribute; +import com.github._1c_syntax.bsl.mdo.support.AttributeType; import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; import com.github._1c_syntax.bsl.mdo.children.ObjectForm; import com.github._1c_syntax.bsl.mdo.children.ObjectTabularSection; @@ -247,6 +248,7 @@ private static void registerClasses(XStream xStream) { xStream.alias("TabularSection", ObjectTabularSection.class); xStream.alias("Template", ObjectTemplate.class); xStream.alias("URLTemplate", HTTPServiceURLTemplate.class); + xStream.alias("Type", AttributeType.class); } private Path parentConfigurationsPath() { diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/AttributeTypeConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/AttributeTypeConverter.java new file mode 100644 index 000000000..3689bb5d6 --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/reader/designer/converter/AttributeTypeConverter.java @@ -0,0 +1,171 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.designer.converter; + +import com.github._1c_syntax.bsl.mdo.support.AttributeType; +import com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl; +import com.github._1c_syntax.bsl.mdo.support.NumberQualifier; +import com.github._1c_syntax.bsl.mdo.support.StringQualifier; +import com.github._1c_syntax.bsl.mdo.support.TypeDescription; +import com.github._1c_syntax.bsl.mdo.support.TypeCategory; +import com.github._1c_syntax.bsl.reader.common.converter.AttributeTypeConverterBase; +import com.thoughtworks.xstream.converters.UnmarshallingContext; +import com.thoughtworks.xstream.io.HierarchicalStreamReader; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +/** + * Конвертер типов данных для Designer формата + */ +@DesignerConverter +public class AttributeTypeConverter extends AttributeTypeConverterBase { + + @Override + public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) { + // В designer формате Type элемент содержит v8:Type и квалификаторы + List typeNames = new ArrayList<>(); + Optional stringQualifier = Optional.empty(); + Optional numberQualifier = Optional.empty(); + + while (reader.hasMoreChildren()) { + reader.moveDown(); + String nodeName = reader.getNodeName(); + + if ("v8:Type".equals(nodeName)) { + typeNames.add(normalizeTypeName(reader.getValue())); + } else if ("v8:StringQualifiers".equals(nodeName)) { + stringQualifier = Optional.of(parseStringQualifiers(reader)); + } else if ("v8:NumberQualifiers".equals(nodeName)) { + numberQualifier = Optional.of(parseNumberQualifiers(reader)); + } + + reader.moveUp(); + } + + return createAttributeType(typeNames, stringQualifier, numberQualifier); + } + + @Override + public boolean canConvert(Class type) { + return AttributeType.class.isAssignableFrom(type); + } + + + /** + * Парсит строковые квалификаторы из XML + * @param reader XML reader + * @return объект StringQualifier + */ + private StringQualifier parseStringQualifiers(HierarchicalStreamReader reader) { + StringQualifier.StringQualifierBuilder builder = StringQualifier.builder(); + + while (reader.hasMoreChildren()) { + reader.moveDown(); + String nodeName = reader.getNodeName(); + String value = reader.getValue(); + + switch (nodeName) { + case "v8:Length": + try { + builder.length(Integer.parseInt(value)); + } catch (NumberFormatException e) { + // Игнорируем некорректные значения длины + } + break; + case "v8:AllowedLength": + builder.allowedLength("Fixed".equals(value) ? StringQualifier.AllowedLength.FIXED : StringQualifier.AllowedLength.VARIABLE); + break; + default: + // Игнорируем неизвестные элементы + break; + } + + reader.moveUp(); + } + + return builder.build(); + } + + /** + * Парсит числовые квалификаторы из XML + * @param reader XML reader + * @return объект NumberQualifier + */ + private NumberQualifier parseNumberQualifiers(HierarchicalStreamReader reader) { + NumberQualifier.NumberQualifierBuilder builder = NumberQualifier.builder(); + + while (reader.hasMoreChildren()) { + reader.moveDown(); + String nodeName = reader.getNodeName(); + String value = reader.getValue(); + + switch (nodeName) { + case "v8:Digits": + try { + builder.precision(Integer.parseInt(value)); + } catch (NumberFormatException e) { + // Игнорируем некорректные значения точности + } + break; + case "v8:FractionDigits": + try { + builder.fractionDigits(Integer.parseInt(value)); + } catch (NumberFormatException e) { + // Игнорируем некорректные значения дробных разрядов + } + break; + case "v8:AllowedSign": + builder.allowedSign("Nonnegative".equals(value) ? NumberQualifier.AllowedSign.NONNEGATIVE : NumberQualifier.AllowedSign.ANY); + break; + default: + // Игнорируем неизвестные элементы + break; + } + + reader.moveUp(); + } + + return builder.build(); + } + + /** + * Нормализует имя типа, удаляя префиксы пространств имен + * @param typeName исходное имя типа + * @return нормализованное имя типа + */ + private String normalizeTypeName(String typeName) { + if (typeName == null) { + return ""; + } + String trimmed = typeName.trim(); + if (trimmed.startsWith("xs:")) { + return trimmed.substring(3); + } + if (trimmed.startsWith("cfg:")) { + return trimmed.substring(4); + } + return trimmed; + } + +} \ No newline at end of file diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/edt/EDTReader.java b/src/main/java/com/github/_1c_syntax/bsl/reader/edt/EDTReader.java index c8d0d8efa..819f42cf4 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/reader/edt/EDTReader.java +++ b/src/main/java/com/github/_1c_syntax/bsl/reader/edt/EDTReader.java @@ -37,6 +37,7 @@ import com.github._1c_syntax.bsl.mdo.children.HTTPServiceURLTemplate; import com.github._1c_syntax.bsl.mdo.children.IntegrationServiceChannel; import com.github._1c_syntax.bsl.mdo.children.ObjectAttribute; +import com.github._1c_syntax.bsl.mdo.support.AttributeType; import com.github._1c_syntax.bsl.mdo.children.ObjectCommand; import com.github._1c_syntax.bsl.mdo.children.ObjectForm; import com.github._1c_syntax.bsl.mdo.children.ObjectTabularSection; @@ -244,6 +245,7 @@ private static void registerClasses(XStream xStream) { xStream.alias("templates", ObjectTemplate.class); xStream.alias("urlTemplates", HTTPServiceURLTemplate.class); xStream.alias("Form", ManagedFormData.class); + xStream.alias("type", AttributeType.class); } private Path parentConfigurationsPath() { diff --git a/src/main/java/com/github/_1c_syntax/bsl/reader/edt/converter/AttributeTypeConverter.java b/src/main/java/com/github/_1c_syntax/bsl/reader/edt/converter/AttributeTypeConverter.java new file mode 100644 index 000000000..bcfbaf0ff --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/reader/edt/converter/AttributeTypeConverter.java @@ -0,0 +1,152 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.edt.converter; + +import com.github._1c_syntax.bsl.mdo.support.AttributeType; +import com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl; +import com.github._1c_syntax.bsl.mdo.support.NumberQualifier; +import com.github._1c_syntax.bsl.mdo.support.StringQualifier; +import com.github._1c_syntax.bsl.mdo.support.TypeDescription; +import com.github._1c_syntax.bsl.mdo.support.TypeCategory; +import com.github._1c_syntax.bsl.reader.common.converter.AttributeTypeConverterBase; +import com.thoughtworks.xstream.converters.UnmarshallingContext; +import com.thoughtworks.xstream.io.HierarchicalStreamReader; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +/** + * Конвертер типов данных для EDT формата + */ +@EDTConverter +public class AttributeTypeConverter extends AttributeTypeConverterBase { + + @Override + public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) { + // В EDT формате type элемент содержит types и квалификаторы + List typeNames = new ArrayList<>(); + Optional stringQualifier = Optional.empty(); + Optional numberQualifier = Optional.empty(); + + while (reader.hasMoreChildren()) { + reader.moveDown(); + String nodeName = reader.getNodeName(); + + if ("types".equals(nodeName)) { + typeNames.add(reader.getValue()); + } else if ("stringQualifiers".equals(nodeName)) { + stringQualifier = Optional.of(parseStringQualifiers(reader)); + } else if ("numberQualifiers".equals(nodeName)) { + numberQualifier = Optional.of(parseNumberQualifiers(reader)); + } + + reader.moveUp(); + } + + return createAttributeType(typeNames, stringQualifier, numberQualifier); + } + + @Override + public boolean canConvert(Class type) { + return AttributeType.class.isAssignableFrom(type); + } + + + /** + * Парсит строковые квалификаторы из EDT + * @param reader EDT reader + * @return объект StringQualifier + */ + private StringQualifier parseStringQualifiers(HierarchicalStreamReader reader) { + StringQualifier.StringQualifierBuilder builder = StringQualifier.builder(); + + while (reader.hasMoreChildren()) { + reader.moveDown(); + String nodeName = reader.getNodeName(); + String value = reader.getValue(); + + switch (nodeName) { + case "length": + try { + builder.length(Integer.parseInt(value)); + } catch (NumberFormatException e) { + // Игнорируем некорректные значения длины + } + break; + case "allowedLength": + builder.allowedLength("Fixed".equals(value) ? StringQualifier.AllowedLength.FIXED : StringQualifier.AllowedLength.VARIABLE); + break; + default: + // Игнорируем неизвестные элементы + break; + } + + reader.moveUp(); + } + + return builder.build(); + } + + /** + * Парсит числовые квалификаторы из EDT + * @param reader EDT reader + * @return объект NumberQualifier + */ + private NumberQualifier parseNumberQualifiers(HierarchicalStreamReader reader) { + NumberQualifier.NumberQualifierBuilder builder = NumberQualifier.builder(); + + while (reader.hasMoreChildren()) { + reader.moveDown(); + String nodeName = reader.getNodeName(); + String value = reader.getValue(); + + switch (nodeName) { + case "precision": + try { + builder.precision(Integer.parseInt(value)); + } catch (NumberFormatException e) { + // Игнорируем некорректные значения точности + } + break; + case "fractionDigits": + try { + builder.fractionDigits(Integer.parseInt(value)); + } catch (NumberFormatException e) { + // Игнорируем некорректные значения дробных разрядов + } + break; + case "allowedSign": + builder.allowedSign("Nonnegative".equals(value) ? NumberQualifier.AllowedSign.NONNEGATIVE : NumberQualifier.AllowedSign.ANY); + break; + default: + // Игнорируем неизвестные элементы + break; + } + + reader.moveUp(); + } + + return builder.build(); + } + +} \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/AccountingRegisterTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/AccountingRegisterTest.java index 354a9fcfc..711b5207e 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/AccountingRegisterTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/AccountingRegisterTest.java @@ -32,7 +32,7 @@ class AccountingRegisterTest { @ParameterizedTest @CsvSource( { - "true, mdclasses, AccountingRegisters.РегистрБухгалтерии1", + "true, mdclasses, AccountingRegisters.РегистрБухгалтерии1, _edt", "false, mdclasses, AccountingRegisters.РегистрБухгалтерии1" } ) diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegisterTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegisterTest.java index 033378813..f29be0a72 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegisterTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/AccumulationRegisterTest.java @@ -32,7 +32,7 @@ class AccumulationRegisterTest { @ParameterizedTest @CsvSource( { - "true, mdclasses, AccumulationRegisters.РегистрНакопления1", + "true, mdclasses, AccumulationRegisters.РегистрНакопления1, _edt", "false, mdclasses, AccumulationRegisters.РегистрНакопления1" } ) diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/CatalogTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/CatalogTest.java index 2a0ed0a0c..06ac80430 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/CatalogTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/CatalogTest.java @@ -45,6 +45,12 @@ void test(ArgumentsAccessor argumentsAccessor) { assertThat(mdo).isInstanceOf(Catalog.class); var catalog = (Catalog) mdo; assertThat(catalog.getAllAttributes()).hasSize(3); + + // Проверяем что типы реквизитов доступны + for (var attribute : catalog.getAllAttributes()) { + assertThat(attribute.getType()).isNotNull(); + assertThat(attribute.getType().getDisplayName()).isNotEmpty(); + } assertThat(catalog.getChildren()) .hasSize(9) .anyMatch(ObjectAttribute.class::isInstance) diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/TasksTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/TasksTest.java index 6d0eff8c5..4ad93280a 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/mdo/TasksTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/TasksTest.java @@ -30,7 +30,7 @@ class TasksTest { @ParameterizedTest @CsvSource( { - "true, mdclasses, Tasks.Задача1", + "true, mdclasses, Tasks.Задача1, _edt", "false, mdclasses, Tasks.Задача1", "true, ssl_3_1, Tasks.ЗадачаИсполнителя, _edt", "false, ssl_3_1, Tasks.ЗадачаИсполнителя" diff --git a/src/test/java/com/github/_1c_syntax/bsl/mdo/support/AttributeTypeTest.java b/src/test/java/com/github/_1c_syntax/bsl/mdo/support/AttributeTypeTest.java new file mode 100644 index 000000000..97c04d37c --- /dev/null +++ b/src/test/java/com/github/_1c_syntax/bsl/mdo/support/AttributeTypeTest.java @@ -0,0 +1,104 @@ +/* + * This file is a part of MDClasses. + * + * Copyright (c) 2019 - 2025 + * Tymko Oleg , Maximov Valery 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.mdo.support; + +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Тесты для типов реквизитов + */ +class AttributeTypeTest { + + @Test + void testCreateSimpleStringType() { + AttributeType type = AttributeTypeFactory.createType("String"); + + assertThat(type.getTypeDescriptions()).hasSize(1); + assertThat(type.getTypeDescriptions().get(0).getTypeName()).isEqualTo("String"); + assertThat(type.getTypeDescriptions().get(0).getCategory()).isEqualTo(TypeCategory.PRIMITIVE); + assertThat(type.isComposite()).isFalse(); + assertThat(type.getDisplayName()).isEqualTo("String"); + } + + @Test + void testCreateReferenceType() { + AttributeType type = AttributeTypeFactory.createType("CatalogRef.Справочник1"); + + assertThat(type.getTypeDescriptions()).hasSize(1); + assertThat(type.getTypeDescriptions().get(0).getTypeName()).isEqualTo("CatalogRef.Справочник1"); + assertThat(type.getTypeDescriptions().get(0).getCategory()).isEqualTo(TypeCategory.REFERENCE); + assertThat(type.getTypeDescriptions().get(0).isReference()).isTrue(); + assertThat(type.isComposite()).isFalse(); + } + + @Test + void testCreateCompositeType() { + AttributeType type = AttributeTypeFactory.createType(List.of("String", "Number", "CatalogRef.Справочник1")); + + assertThat(type.getTypeDescriptions()).hasSize(3); + assertThat(type.isComposite()).isTrue(); + assertThat(type.getDisplayName()).isEqualTo("String, Number, CatalogRef.Справочник1"); + } + + @Test + void testCreateStringTypeWithQualifiers() { + AttributeType type = AttributeTypeFactory.createStringType(10, StringQualifier.AllowedLength.VARIABLE); + + assertThat(type.getTypeDescriptions()).hasSize(1); + TypeDescription desc = type.getTypeDescriptions().get(0); + assertThat(desc.getTypeName()).isEqualTo("String"); + assertThat(desc.getQualifier()).isPresent(); + + StringQualifier qualifier = (StringQualifier) desc.getQualifier().get(); + assertThat(qualifier.getLength()).isEqualTo(10); + assertThat(qualifier.getAllowedLength()).isEqualTo(StringQualifier.AllowedLength.VARIABLE); + } + + @Test + void testCreateNumberTypeWithQualifiers() { + AttributeType type = AttributeTypeFactory.createNumberType(10, 2, NumberQualifier.AllowedSign.NONNEGATIVE); + + assertThat(type.getTypeDescriptions()).hasSize(1); + TypeDescription desc = type.getTypeDescriptions().get(0); + assertThat(desc.getTypeName()).isEqualTo("Number"); + assertThat(desc.getQualifier()).isPresent(); + + NumberQualifier qualifier = (NumberQualifier) desc.getQualifier().get(); + assertThat(qualifier.getPrecision()).isEqualTo(10); + assertThat(qualifier.getFractionDigits()).isEqualTo(2); + assertThat(qualifier.getAllowedSign()).isEqualTo(NumberQualifier.AllowedSign.NONNEGATIVE); + } + + @Test + void testEmptyType() { + AttributeType type = AttributeTypeFactory.createType((String) null); + + assertThat(type).isEqualTo(AttributeTypeImpl.EMPTY); + assertThat(type.getTypeDescriptions()).isEmpty(); + assertThat(type.isComposite()).isFalse(); + assertThat(type.getDisplayName()).isEqualTo("Unknown"); + } +} \ No newline at end of file diff --git a/src/test/java/com/github/_1c_syntax/bsl/test_utils/MDTestUtils.java b/src/test/java/com/github/_1c_syntax/bsl/test_utils/MDTestUtils.java index fb5ebe4ad..8878b86bd 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/test_utils/MDTestUtils.java +++ b/src/test/java/com/github/_1c_syntax/bsl/test_utils/MDTestUtils.java @@ -25,8 +25,17 @@ import com.github._1c_syntax.bsl.mdclasses.ExternalSource; import com.github._1c_syntax.bsl.mdclasses.MDClass; import com.github._1c_syntax.bsl.mdclasses.MDClasses; +import com.github._1c_syntax.bsl.mdo.Attribute; import com.github._1c_syntax.bsl.mdo.CommonModule; import com.github._1c_syntax.bsl.mdo.MD; +import com.github._1c_syntax.bsl.mdo.children.AccountingFlag; +import com.github._1c_syntax.bsl.mdo.children.Dimension; +import com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn; +import com.github._1c_syntax.bsl.mdo.children.ExtDimensionAccountingFlag; +import com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTableField; +import com.github._1c_syntax.bsl.mdo.children.ObjectAttribute; +import com.github._1c_syntax.bsl.mdo.children.Resource; +import com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute; import com.github._1c_syntax.bsl.reader.MDOReader; import com.github._1c_syntax.bsl.test_utils.assertions.Assertions; import com.github._1c_syntax.bsl.types.MDOType; @@ -102,6 +111,7 @@ public String createJson(Object obj) { if (CommonModule.class.isAssignableFrom(clazz)) { xstream.omitField(clazz, "modules"); } + xstream.omitField(clazz, "storageFields"); xstream.omitField(clazz, "plainStorageFields"); xstream.omitField(clazz, "plainChildren"); diff --git "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260.json" "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260.json" index 0351725ea..880b59ea2 100644 --- "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260.json" +++ "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260.json" @@ -36,7 +36,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "commands": [], @@ -129,7 +133,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ExternalDataProcessor/attributes/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ] } diff --git "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260_edt.json" "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260_edt.json" index 75ab909fd..7664d8d29 100644 --- "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260_edt.json" +++ "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\320\260\321\217\320\222\320\275\320\265\321\210\320\275\321\217\321\217\320\236\320\261\321\200\320\260\320\261\320\276\321\202\320\272\320\260_edt.json" @@ -36,7 +36,13 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "commands": [], @@ -129,7 +135,13 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ] } diff --git "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202.json" "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202.json" index 7ab7cdbf7..bc79843f1 100644 --- "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202.json" +++ "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202.json" @@ -36,7 +36,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "commands": [], @@ -56,7 +60,7 @@ "moduleTypes": [ [ "ObjectModule", - "src/test/resources/ext/designer/external/src/erf/Тестовы_Внешни_Отчет/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/external/src/erf/ТестовыйВнешнийОтчет/Ext/ObjectModule.bsl" ] ], "modules": [ @@ -129,7 +133,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdclasses.ExternalReport/attributes/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ] } diff --git "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202_edt.json" "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202_edt.json" index 108077699..15b12b097 100644 --- "a/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202_edt.json" +++ "b/src/test/resources/fixtures/external/\320\242\320\265\321\201\321\202\320\276\320\262\321\213\320\271\320\222\320\275\320\265\321\210\320\275\320\270\320\271\320\236\321\202\321\207\320\265\321\202_edt.json" @@ -36,7 +36,13 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "commands": [], @@ -56,7 +62,7 @@ "moduleTypes": [ [ "ObjectModule", - "src/test/resources/ext/edt/external/src/ExternalReports/Тестовы_Внешни_Отчет/ObjectModule.bsl" + "src/test/resources/ext/edt/external/src/ExternalReports/ТестовыйВнешнийОтчет/ObjectModule.bsl" ] ], "modules": [ @@ -129,7 +135,13 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ] } diff --git "a/src/test/resources/fixtures/mdclasses/AccountingRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\221\321\203\321\205\320\263\320\260\320\273\321\202\320\265\321\200\320\270\320\2701.json" "b/src/test/resources/fixtures/mdclasses/AccountingRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\221\321\203\321\205\320\263\320\260\320\273\321\202\320\265\321\200\320\270\320\2701.json" index b7fca7de9..abe9b330a 100644 --- "a/src/test/resources/fixtures/mdclasses/AccountingRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\221\321\203\321\205\320\263\320\260\320\273\321\202\320\265\321\200\320\270\320\2701.json" +++ "b/src/test/resources/fixtures/mdclasses/AccountingRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\221\321\203\321\205\320\263\320\260\320\273\321\202\320\265\321\200\320\270\320\2701.json" @@ -28,7 +28,11 @@ "indexing": "INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "explanation": { @@ -76,7 +80,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.AccountingRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } } ], "supportVariant": "NONE", diff --git "a/src/test/resources/fixtures/mdclasses/AccountingRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\221\321\203\321\205\320\263\320\260\320\273\321\202\320\265\321\200\320\270\320\2701_edt.json" "b/src/test/resources/fixtures/mdclasses/AccountingRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\221\321\203\321\205\320\263\320\260\320\273\321\202\320\265\321\200\320\270\320\2701_edt.json" new file mode 100644 index 000000000..b0d0f72c2 --- /dev/null +++ "b/src/test/resources/fixtures/mdclasses/AccountingRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\221\321\203\321\205\320\263\320\260\320\273\321\202\320\265\321\200\320\270\320\2701_edt.json" @@ -0,0 +1,132 @@ +{"com.github._1c_syntax.bsl.mdo.AccountingRegister": { + "attributes": [], + "commands": [], + "comment": "", + "description": "Регистр бухгалтерии", + "dimensions": [ + { + "uuid": "902c08a9-e457-436a-b0fb-b996f0d9bb00", + "name": "Измерение1", + "mdoReference": { + "type": "DIMENSION", + "mdoRef": "AccountingRegister.РегистрБухгалтерии1.Dimension.Измерение1", + "mdoRefRu": "РегистрБухгалтерии.РегистрБухгалтерии1.Измерение.Измерение1" + }, + "objectBelonging": "OWN", + "comment": "", + "synonym": { + "content": [] + }, + "supportVariant": "NONE", + "owner": { + "type": "ACCOUNTING_REGISTER", + "mdoRef": "AccountingRegister.РегистрБухгалтерии1", + "mdoRefRu": "РегистрБухгалтерии.РегистрБухгалтерии1" + }, + "passwordMode": false, + "kind": "CUSTOM", + "indexing": "INDEX", + "master": false, + "denyIncompleteValues": false, + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 10, + "allowedLength": "VARIABLE" + } + } + } + ] + } + } + ], + "explanation": { + "@reference": "/com.github._1c_syntax.bsl.mdo.AccountingRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/synonym" + }, + "forms": [], + "mdoReference": { + "@reference": "/com.github._1c_syntax.bsl.mdo.AccountingRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/owner" + }, + "mdoType": "ACCOUNTING_REGISTER", + "moduleTypes": [], + "modules": [], + "name": "РегистрБухгалтерии1", + "objectBelonging": "OWN", + "possibleRights": [ + { + "default": { + "tag": 4 + }, + "int": 5, + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "READ", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "VIEW", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EDIT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "TOTALS_CONTROL" + } + ], + "resources": [ + { + "uuid": "e88df8bd-bf97-41a4-88fc-09c84a51824b", + "name": "Ресурс1", + "mdoReference": { + "type": "RESOURCE", + "mdoRef": "AccountingRegister.РегистрБухгалтерии1.Resource.Ресурс1", + "mdoRefRu": "РегистрБухгалтерии.РегистрБухгалтерии1.Ресурс.Ресурс1" + }, + "objectBelonging": "OWN", + "comment": "", + "synonym": { + "@reference": "/com.github._1c_syntax.bsl.mdo.AccountingRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/synonym" + }, + "supportVariant": "NONE", + "owner": { + "@reference": "/com.github._1c_syntax.bsl.mdo.AccountingRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/owner" + }, + "passwordMode": false, + "kind": "CUSTOM", + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } + } + ], + "supportVariant": "NONE", + "synonym": { + "content": [ + [ + { + "langKey": "en", + "value": "Accounting register" + }, + { + "langKey": "ru", + "value": "Регистр бухгалтерии" + } + ] + ] + }, + "templates": [], + "uuid": "e5930f2f-15d9-48a1-ac69-379ad990b02a" +}} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/AccumulationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\235\320\260\320\272\320\276\320\277\320\273\320\265\320\275\320\270\321\2171.json" "b/src/test/resources/fixtures/mdclasses/AccumulationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\235\320\260\320\272\320\276\320\277\320\273\320\265\320\275\320\270\321\2171.json" index 01374a25e..427ac3442 100644 --- "a/src/test/resources/fixtures/mdclasses/AccumulationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\235\320\260\320\272\320\276\320\277\320\273\320\265\320\275\320\270\321\2171.json" +++ "b/src/test/resources/fixtures/mdclasses/AccumulationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\235\320\260\320\272\320\276\320\277\320\273\320\265\320\275\320\270\321\2171.json" @@ -28,7 +28,11 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "explanation": { @@ -76,7 +80,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.AccumulationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } } ], "supportVariant": "NONE", diff --git "a/src/test/resources/fixtures/mdclasses/AccumulationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\235\320\260\320\272\320\276\320\277\320\273\320\265\320\275\320\270\321\2171_edt.json" "b/src/test/resources/fixtures/mdclasses/AccumulationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\235\320\260\320\272\320\276\320\277\320\273\320\265\320\275\320\270\321\2171_edt.json" new file mode 100644 index 000000000..62c567d06 --- /dev/null +++ "b/src/test/resources/fixtures/mdclasses/AccumulationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\235\320\260\320\272\320\276\320\277\320\273\320\265\320\275\320\270\321\2171_edt.json" @@ -0,0 +1,128 @@ +{"com.github._1c_syntax.bsl.mdo.AccumulationRegister": { + "attributes": [], + "commands": [], + "comment": "", + "description": "Регистр накопления", + "dimensions": [ + { + "uuid": "461cae93-fe90-4bbb-8f79-0963e2d39ec5", + "name": "Измерение1", + "mdoReference": { + "type": "DIMENSION", + "mdoRef": "AccumulationRegister.РегистрНакопления1.Dimension.Измерение1", + "mdoRefRu": "РегистрНакопления.РегистрНакопления1.Измерение.Измерение1" + }, + "objectBelonging": "OWN", + "comment": "", + "synonym": { + "content": [] + }, + "supportVariant": "NONE", + "owner": { + "type": "ACCUMULATION_REGISTER", + "mdoRef": "AccumulationRegister.РегистрНакопления1", + "mdoRefRu": "РегистрНакопления.РегистрНакопления1" + }, + "passwordMode": false, + "kind": "CUSTOM", + "indexing": "DONT_INDEX", + "master": false, + "denyIncompleteValues": false, + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 10, + "allowedLength": "VARIABLE" + } + } + } + ] + } + } + ], + "explanation": { + "@reference": "/com.github._1c_syntax.bsl.mdo.AccumulationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/synonym" + }, + "forms": [], + "mdoReference": { + "@reference": "/com.github._1c_syntax.bsl.mdo.AccumulationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/owner" + }, + "mdoType": "ACCUMULATION_REGISTER", + "moduleTypes": [], + "modules": [], + "name": "РегистрНакопления1", + "objectBelonging": "OWN", + "possibleRights": [ + { + "default": { + "tag": 4 + }, + "int": 5, + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "READ", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "VIEW", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EDIT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "TOTALS_CONTROL" + } + ], + "resources": [ + { + "uuid": "a187a281-f5cd-4e1c-8f3f-37212a840339", + "name": "Ресурс1", + "mdoReference": { + "type": "RESOURCE", + "mdoRef": "AccumulationRegister.РегистрНакопления1.Resource.Ресурс1", + "mdoRefRu": "РегистрНакопления.РегистрНакопления1.Ресурс.Ресурс1" + }, + "objectBelonging": "OWN", + "comment": "", + "synonym": { + "@reference": "/com.github._1c_syntax.bsl.mdo.AccumulationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/synonym" + }, + "supportVariant": "NONE", + "owner": { + "@reference": "/com.github._1c_syntax.bsl.mdo.AccumulationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/owner" + }, + "passwordMode": false, + "kind": "CUSTOM", + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } + } + ], + "supportVariant": "NONE", + "synonym": { + "content": [ + [ + { + "langKey": "ru", + "value": "Регистр накопления" + } + ] + ] + }, + "templates": [], + "uuid": "8ea07f36-d671-4649-bc7a-94daa939e77f" +}} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" "b/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" index cb4777e9d..50e40c8ce 100644 --- "a/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601.json" @@ -28,7 +28,11 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": true, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "explanation": { @@ -113,7 +117,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.CalculationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } } ], "supportVariant": "NONE", diff --git "a/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601_edt.json" index de279a186..86226f4d8 100644 --- "a/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CalculationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\240\320\260\321\201\321\207\320\265\321\202\320\2601_edt.json" @@ -28,7 +28,23 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": true, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 10, + "allowedLength": "VARIABLE" + } + } + } + ] + } } ], "explanation": { @@ -113,7 +129,24 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } } ], "supportVariant": "NONE", diff --git "a/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.json" "b/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.json" index 8a464bc87..88676d5db 100644 --- "a/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.json" +++ "b/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721.json" @@ -33,7 +33,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } }, { "uuid": "dff5b5d8-762d-4490-a336-dcc8d93c17d5", @@ -65,7 +69,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "ecd3c57a-75c8-474c-9c48-ac4c3831ab15", @@ -97,7 +105,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] @@ -612,33 +624,33 @@ }, "mdoType": "CATALOG", "moduleTypes": [ - [ - "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ManagerModule.bsl" - ], [ "ObjectModule", "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ObjectModule.bin" + ], + [ + "ManagerModule", + "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ManagerModule.bsl" ] ], "modules": [ { - "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ManagerModule.bsl", + "moduleType": "ObjectModule", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ObjectModule.bin", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, "supportVariant": "NONE", - "isProtected": false + "isProtected": true }, { - "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ObjectModule.bin", + "moduleType": "ManagerModule", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Catalogs/Справочник1/Ext/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, "supportVariant": "NONE", - "isProtected": true + "isProtected": false } ], "name": "Справочник1", @@ -730,7 +742,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "7580cfcb-eadd-4bfe-8199-ce1c14867e10", @@ -762,7 +778,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] diff --git "a/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721_edt.json" "b/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721_edt.json" index 2a1a9cf82..b763d43eb 100644 --- "a/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Catalogs.\320\241\320\277\321\200\320\260\320\262\320\276\321\207\320\275\320\270\320\2721_edt.json" @@ -33,7 +33,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 10, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "dff5b5d8-762d-4490-a336-dcc8d93c17d5", @@ -65,7 +81,24 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } }, { "uuid": "ecd3c57a-75c8-474c-9c48-ac4c3831ab15", @@ -97,7 +130,17 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": {} + } + ] + } } ], [] @@ -612,33 +655,33 @@ }, "mdoType": "CATALOG", "moduleTypes": [ - [ - "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ManagerModule.bsl" - ], [ "ObjectModule", "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ObjectModule.bsl" + ], + [ + "ManagerModule", + "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ManagerModule.bsl" ] ], "modules": [ { - "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ManagerModule.bsl", + "moduleType": "ObjectModule", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ObjectModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, "supportVariant": "NONE", - "isProtected": false + "isProtected": true }, { - "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ObjectModule.bsl", + "moduleType": "ManagerModule", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Catalogs/Справочник1/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, "supportVariant": "NONE", - "isProtected": true + "isProtected": false } ], "name": "Справочник1", @@ -730,7 +773,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 10, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "7580cfcb-eadd-4bfe-8199-ce1c14867e10", @@ -762,7 +821,24 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } } ], [] diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621.json" index 3ea902e9e..2441d90ba 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621.json" @@ -28,7 +28,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "attributes": [], @@ -58,7 +62,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/accountingFlags/com.github._1c_syntax.bsl.mdo.children.AccountingFlag/type" + } } ], "forms": [], diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621_edt.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621_edt.json" index 45d3c111d..4a9e353fc 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfAccounts.\320\237\320\273\320\260\320\275\320\241\321\207\320\265\321\202\320\276\320\2621_edt.json" @@ -28,7 +28,17 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": {} + } + ] + } } ], "attributes": [], @@ -58,7 +68,19 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfAccounts/accountingFlags/com.github._1c_syntax.bsl.mdo.children.AccountingFlag/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } } ], "forms": [], diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721.json" index 53c963361..882c81461 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721.json" @@ -14,19 +14,19 @@ }, "mdoType": "CHART_OF_CHARACTERISTIC_TYPES", "moduleTypes": [ - [ - "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ManagerModule.bsl" - ], [ "ObjectModule", "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ObjectModule.bsl" + ], + [ + "ManagerModule", + "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ManagerModule.bsl" ] ], "modules": [ { - "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ManagerModule.bsl", + "moduleType": "ObjectModule", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ObjectModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/mdoReference" }, @@ -34,8 +34,8 @@ "isProtected": false }, { - "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ObjectModule.bsl", + "moduleType": "ManagerModule", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/Ext/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/mdoReference" }, diff --git "a/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721_edt.json" "b/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721_edt.json" index a7ed8308e..6e84f15cc 100644 --- "a/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/ChartsOfCharacteristicTypes.\320\237\320\273\320\260\320\275\320\222\320\270\320\264\320\276\320\262\320\245\320\260\321\200\320\260\320\272\321\202\320\265\321\200\320\270\321\201\321\202\320\270\320\2721_edt.json" @@ -14,19 +14,19 @@ }, "mdoType": "CHART_OF_CHARACTERISTIC_TYPES", "moduleTypes": [ - [ - "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ManagerModule.bsl" - ], [ "ObjectModule", "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ObjectModule.bsl" + ], + [ + "ManagerModule", + "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ManagerModule.bsl" ] ], "modules": [ { - "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ManagerModule.bsl", + "moduleType": "ObjectModule", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ObjectModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/mdoReference" }, @@ -34,8 +34,8 @@ "isProtected": false }, { - "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ObjectModule.bsl", + "moduleType": "ManagerModule", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/ChartsOfCharacteristicTypes/ПланВидовХарактеристик1/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/mdoReference" }, diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" index ff8d52305..00b68fe07 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" @@ -15,7 +15,7 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Глобальны_Общи_Модуль/Ext/Module.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/ГлобальныйОбщийМодуль/Ext/Module.bsl" ] ], "name": "ГлобальныйОбщийМодуль", @@ -36,6 +36,6 @@ ] ] }, - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Глобальны_Общи_Модуль/Ext/Module.bsl", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/ГлобальныйОбщийМодуль/Ext/Module.bsl", "uuid": "9e9c021c-bdbd-4804-a53a-9442ba9eb18c" }} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" index a2a19de0a..1f8aacbee 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\223\320\273\320\276\320\261\320\260\320\273\321\214\320\275\321\213\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" @@ -15,7 +15,7 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Глобальны_Общи_Модуль/Module.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/ГлобальныйОбщийМодуль/Module.bsl" ] ], "name": "ГлобальныйОбщийМодуль", @@ -36,6 +36,6 @@ ] ] }, - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Глобальны_Общи_Модуль/Module.bsl", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/ГлобальныйОбщийМодуль/Module.bsl", "uuid": "9e9c021c-bdbd-4804-a53a-9442ba9eb18c" }} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260.json" index 07fa545c9..e88c66027 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260.json" @@ -15,7 +15,7 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульВызовСервера/Ext/Module.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/ОбщийМодульВызовСервера/Ext/Module.bsl" ] ], "name": "ОбщийМодульВызовСервера", @@ -36,6 +36,6 @@ ] ] }, - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульВызовСервера/Ext/Module.bsl", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/ОбщийМодульВызовСервера/Ext/Module.bsl", "uuid": "96504c9f-4126-439a-9c62-19f43d260c82" }} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260_edt.json" index 747363bf8..db57c2eb5 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\222\321\213\320\267\320\276\320\262\320\241\320\265\321\200\320\262\320\265\321\200\320\260_edt.json" @@ -15,7 +15,7 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульВызовСервера/Module.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/ОбщийМодульВызовСервера/Module.bsl" ] ], "name": "ОбщийМодульВызовСервера", @@ -36,6 +36,6 @@ ] ] }, - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульВызовСервера/Module.bsl", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/ОбщийМодульВызовСервера/Module.bsl", "uuid": "96504c9f-4126-439a-9c62-19f43d260c82" }} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262.json" index e28d4f8f7..45789e831 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262.json" @@ -15,7 +15,7 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульПовтИспВызов/Ext/Module.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/ОбщийМодульПовтИспВызов/Ext/Module.bsl" ] ], "name": "ОбщийМодульПовтИспВызов", @@ -36,6 +36,6 @@ ] ] }, - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульПовтИспВызов/Ext/Module.bsl", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/ОбщийМодульПовтИспВызов/Ext/Module.bsl", "uuid": "d1bc1b16-1de7-4819-9ca8-01278d5e6f2e" }} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262_edt.json" index f884e82f0..d9ad2ceb4 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\222\321\213\320\267\320\276\320\262_edt.json" @@ -15,7 +15,7 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульПовтИспВызов/Module.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/ОбщийМодульПовтИспВызов/Module.bsl" ] ], "name": "ОбщийМодульПовтИспВызов", @@ -36,6 +36,6 @@ ] ] }, - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульПовтИспВызов/Module.bsl", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/ОбщийМодульПовтИспВызов/Module.bsl", "uuid": "d1bc1b16-1de7-4819-9ca8-01278d5e6f2e" }} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201.json" index b1df6981c..e63c3e9fb 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201.json" @@ -15,7 +15,7 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульПовтИспСеанс/Ext/Module.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/ОбщийМодульПовтИспСеанс/Ext/Module.bsl" ] ], "name": "ОбщийМодульПовтИспСеанс", @@ -36,6 +36,6 @@ ] ] }, - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульПовтИспСеанс/Ext/Module.bsl", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/ОбщийМодульПовтИспСеанс/Ext/Module.bsl", "uuid": "a09f73b1-0058-4f3b-a22b-799ef3c2a33d" }} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201_edt.json" index a76ab0946..19f0575d8 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\262\321\202\320\230\321\201\320\277\320\241\320\265\320\260\320\275\321\201_edt.json" @@ -15,7 +15,7 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульПовтИспСеанс/Module.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/ОбщийМодульПовтИспСеанс/Module.bsl" ] ], "name": "ОбщийМодульПовтИспСеанс", @@ -36,6 +36,6 @@ ] ] }, - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульПовтИспСеанс/Module.bsl", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/ОбщийМодульПовтИспСеанс/Module.bsl", "uuid": "a09f73b1-0058-4f3b-a22b-799ef3c2a33d" }} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260.json" index d7cd0b8d9..4a85405c1 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260.json" @@ -15,7 +15,7 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульПолны_еПрава/Ext/Module.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/ОбщийМодульПолныйеПрава/Ext/Module.bsl" ] ], "name": "ОбщийМодульПолныйеПрава", @@ -36,6 +36,6 @@ ] ] }, - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Общи_МодульПолны_еПрава/Ext/Module.bsl", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/ОбщийМодульПолныйеПрава/Ext/Module.bsl", "uuid": "5733cabc-1b65-48f8-9ab6-269f1b73a21c" }} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260_edt.json" index f2808a4b8..0a745ce23 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214\320\237\320\276\320\273\320\275\321\213\320\271\320\265\320\237\321\200\320\260\320\262\320\260_edt.json" @@ -15,7 +15,7 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульПолны_еПрава/Module.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/ОбщийМодульПолныйеПрава/Module.bsl" ] ], "name": "ОбщийМодульПолныйеПрава", @@ -36,6 +36,6 @@ ] ] }, - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Общи_МодульПолны_еПрава/Module.bsl", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/ОбщийМодульПолныйеПрава/Module.bsl", "uuid": "5733cabc-1b65-48f8-9ab6-269f1b73a21c" }} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" index 04a6ea349..11934d86d 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214.json" @@ -15,7 +15,7 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Просто_Общи_Модуль/Ext/Module.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/ПростойОбщийМодуль/Ext/Module.bsl" ] ], "name": "ПростойОбщийМодуль", @@ -36,6 +36,6 @@ ] ] }, - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/Просто_Общи_Модуль/Ext/Module.bsl", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/CommonModules/ПростойОбщийМодуль/Ext/Module.bsl", "uuid": "1be4af7e-334e-49fa-a9f9-d80c737ff954" }} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" index cce2f6b3c..3d5fec5a0 100644 --- "a/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/CommonModules.\320\237\321\200\320\276\321\201\321\202\320\276\320\271\320\236\320\261\321\211\320\270\320\271\320\234\320\276\320\264\321\203\320\273\321\214_edt.json" @@ -15,7 +15,7 @@ "moduleTypes": [ [ "CommonModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Просто_Общи_Модуль/Module.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/ПростойОбщийМодуль/Module.bsl" ] ], "name": "ПростойОбщийМодуль", @@ -36,6 +36,6 @@ ] ] }, - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/Просто_Общи_Модуль/Module.bsl", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/CommonModules/ПростойОбщийМодуль/Module.bsl", "uuid": "1be4af7e-334e-49fa-a9f9-d80c737ff954" }} \ No newline at end of file diff --git a/src/test/resources/fixtures/mdclasses/Configuration.json b/src/test/resources/fixtures/mdclasses/Configuration.json index 55aa369c7..94f9ce886 100644 --- a/src/test/resources/fixtures/mdclasses/Configuration.json +++ b/src/test/resources/fixtures/mdclasses/Configuration.json @@ -91,7 +91,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "dimensions": [ @@ -117,7 +121,11 @@ "indexing": "INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/resources/com.github._1c_syntax.bsl.mdo.children.Resource/type" + } } ], "forms": [], @@ -169,7 +177,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/resources/com.github._1c_syntax.bsl.mdo.children.Resource/type" + } } ], "dimensions": [ @@ -195,7 +207,11 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/resources/com.github._1c_syntax.bsl.mdo.children.Resource/type" + } } ], "forms": [], @@ -284,7 +300,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/resources/com.github._1c_syntax.bsl.mdo.children.Resource/type" + } } ], "dimensions": [ @@ -310,7 +330,11 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": true, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/resources/com.github._1c_syntax.bsl.mdo.children.Resource/type" + } } ], "forms": [], @@ -507,7 +531,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/resources/com.github._1c_syntax.bsl.mdo.children.Resource/type" + } } ], "extDimensionAccountingFlags": [ @@ -530,7 +558,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/resources/com.github._1c_syntax.bsl.mdo.children.Resource/type" + } } ], "explanation": { @@ -878,7 +910,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/resources/com.github._1c_syntax.bsl.mdo.children.Resource/type" + } } ], "forms": [], @@ -1368,14 +1404,14 @@ "mdoType": "CONFIGURATION", "modalityUseMode": "USE", "moduleTypes": [ - [ - "SessionModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Ext/SessionModule.bsl" - ], [ "ExternalConnectionModule", "src/test/resources/ext/designer/mdclasses/src/cf/Ext/ExternalConnectionModule.bsl" ], + [ + "SessionModule", + "src/test/resources/ext/designer/mdclasses/src/cf/Ext/SessionModule.bsl" + ], [ "ManagedApplicationModule", "src/test/resources/ext/designer/mdclasses/src/cf/Ext/ManagedApplicationModule.bsl" @@ -1553,7 +1589,11 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/resources/com.github._1c_syntax.bsl.mdo.children.Resource/type" + } } ], "documents": [ @@ -1697,6 +1737,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/accountingRegisters/com.github._1c_syntax.bsl.mdo.AccountingRegister/resources/com.github._1c_syntax.bsl.mdo.children.Resource/type" + }, "format": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" }, diff --git a/src/test/resources/fixtures/mdclasses/Configuration_edt.json b/src/test/resources/fixtures/mdclasses/Configuration_edt.json index 953dc0b4e..e0d9fb46c 100644 --- a/src/test/resources/fixtures/mdclasses/Configuration_edt.json +++ b/src/test/resources/fixtures/mdclasses/Configuration_edt.json @@ -91,7 +91,13 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "dimensions": [ @@ -117,7 +123,13 @@ "indexing": "INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "forms": [], @@ -169,7 +181,13 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "dimensions": [ @@ -195,7 +213,13 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "forms": [], @@ -284,7 +308,13 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "dimensions": [ @@ -310,7 +340,13 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": true, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "forms": [], @@ -507,7 +543,13 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "extDimensionAccountingFlags": [ @@ -530,7 +572,13 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "explanation": { @@ -878,7 +926,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "forms": [], @@ -1363,14 +1415,14 @@ "mdoType": "CONFIGURATION", "modalityUseMode": "USE", "moduleTypes": [ - [ - "SessionModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Configuration/SessionModule.bsl" - ], [ "ExternalConnectionModule", "src/test/resources/ext/edt/mdclasses/configuration/src/Configuration/ExternalConnectionModule.bsl" ], + [ + "SessionModule", + "src/test/resources/ext/edt/mdclasses/configuration/src/Configuration/SessionModule.bsl" + ], [ "ManagedApplicationModule", "src/test/resources/ext/edt/mdclasses/configuration/src/Configuration/ManagedApplicationModule.bsl" @@ -1548,7 +1600,13 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "documents": [ @@ -1672,6 +1730,12 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + }, "format": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" }, diff --git "a/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621.json" "b/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621.json" index d277ef9f0..8c8071c80 100644 --- "a/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621.json" +++ "b/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621.json" @@ -28,7 +28,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "commands": [], diff --git "a/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621_edt.json" "b/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621_edt.json" index e7dc62c49..3cf920799 100644 --- "a/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/DocumentJournals.\320\226\321\203\321\200\320\275\320\260\320\273\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\202\320\276\320\2621_edt.json" @@ -28,7 +28,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "commands": [], diff --git "a/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.json" "b/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.json" index 9457f6043..028532e75 100644 --- "a/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.json" +++ "b/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021.json" @@ -33,7 +33,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } }, { "uuid": "bdbbb8f0-84af-4a72-80c4-21f7436bbe99", @@ -65,7 +69,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "f9b6dbc4-79c1-4985-bfd2-87cb8c9fb01c", @@ -97,7 +105,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] @@ -754,19 +766,19 @@ }, "mdoType": "DOCUMENT", "moduleTypes": [ - [ - "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ManagerModule.bsl" - ], [ "ObjectModule", "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ObjectModule.bsl" + ], + [ + "ManagerModule", + "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ManagerModule.bsl" ] ], "modules": [ { - "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ManagerModule.bsl", + "moduleType": "ObjectModule", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ObjectModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, @@ -774,8 +786,8 @@ "isProtected": false }, { - "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ObjectModule.bsl", + "moduleType": "ManagerModule", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Documents/Документ1/Ext/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, @@ -899,7 +911,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "22b9ca2e-c861-4f47-8377-cc364b9ebf5d", @@ -931,7 +947,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] diff --git "a/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021_edt.json" "b/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021_edt.json" index 71d4db5f4..96de97674 100644 --- "a/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Documents.\320\224\320\276\320\272\321\203\320\274\320\265\320\275\321\2021_edt.json" @@ -33,7 +33,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 10, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "bdbbb8f0-84af-4a72-80c4-21f7436bbe99", @@ -65,7 +81,24 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } }, { "uuid": "f9b6dbc4-79c1-4985-bfd2-87cb8c9fb01c", @@ -97,7 +130,17 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": {} + } + ] + } } ], [] @@ -754,19 +797,19 @@ }, "mdoType": "DOCUMENT", "moduleTypes": [ - [ - "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ManagerModule.bsl" - ], [ "ObjectModule", "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ObjectModule.bsl" + ], + [ + "ManagerModule", + "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ManagerModule.bsl" ] ], "modules": [ { - "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ManagerModule.bsl", + "moduleType": "ObjectModule", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ObjectModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, @@ -774,8 +817,8 @@ "isProtected": false }, { - "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ObjectModule.bsl", + "moduleType": "ManagerModule", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Documents/Документ1/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, @@ -899,7 +942,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.Справочник1", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute[3]/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "22b9ca2e-c861-4f47-8377-cc364b9ebf5d", @@ -931,7 +986,24 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } } ], [] diff --git "a/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224.json" "b/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224.json" index f796b80dd..c3064fd3b 100644 --- "a/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224.json" +++ "b/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224.json" @@ -147,7 +147,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } }, { "uuid": "e6e7c2e1-b4b4-4da5-8d1a-b5b7e0c18cdd", @@ -175,7 +179,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/fields/c/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTableField/type" + } }, { "uuid": "5569bb8a-91fa-40b4-a86c-0840769ddf76", @@ -203,7 +211,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/fields/c/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTableField/type" + } }, { "uuid": "e04f524f-a38c-4a4a-9810-f8a87b17089c", @@ -231,7 +243,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/fields/c/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTableField/type" + } }, { "uuid": "09a537fe-b8df-490d-8800-bc1959376cd3", @@ -259,7 +275,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/fields/c/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTableField/type" + } }, { "uuid": "2abf5cec-cec6-4493-9da0-bdc8ae4cf962", @@ -287,7 +307,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/fields/c/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTableField/type" + } }, { "uuid": "995d9173-88e3-4afb-b60f-242f530978e7", @@ -315,7 +339,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/fields/c/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTableField/type" + } }, { "uuid": "8dbba219-9048-43ac-88b3-ff5cdd4071d1", @@ -343,7 +371,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/fields/c/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTableField/type" + } } ], [] diff --git "a/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224_edt.json" "b/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224_edt.json" index 4939c5f78..3e6307945 100644 --- "a/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/ExternalDataSources.\320\242\320\265\320\272\321\203\321\211\320\260\321\217\320\241\320\243\320\221\320\224_edt.json" @@ -147,7 +147,23 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 20, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "e6e7c2e1-b4b4-4da5-8d1a-b5b7e0c18cdd", @@ -175,7 +191,17 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "DefinedType.ТипUIDСтрока", + "category": "DEFINED", + "qualifier": {} + } + ] + } }, { "uuid": "5569bb8a-91fa-40b4-a86c-0840769ddf76", @@ -203,7 +229,19 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "UUID", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/fields/c/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTableField[2]/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "e04f524f-a38c-4a4a-9810-f8a87b17089c", @@ -231,7 +269,19 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "UUID", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/fields/c/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTableField[2]/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "09a537fe-b8df-490d-8800-bc1959376cd3", @@ -259,7 +309,24 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 15, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } }, { "uuid": "2abf5cec-cec6-4493-9da0-bdc8ae4cf962", @@ -287,7 +354,19 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "UUID", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ExternalDataSource/tables/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTable/fields/c/com.github._1c_syntax.bsl.mdo.children.ExternalDataSourceTableField[2]/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "995d9173-88e3-4afb-b60f-242f530978e7", @@ -315,7 +394,23 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 20, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "8dbba219-9048-43ac-88b3-ff5cdd4071d1", @@ -343,7 +438,23 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } } ], [] diff --git "a/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601.json" "b/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601.json" index 1aff5c634..2d6729cbb 100644 --- "a/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601.json" @@ -30,13 +30,13 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/FilterCriteria/Критери_Отбора1/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/FilterCriteria/КритерийОтбора1/Ext/ManagerModule.bsl" ] ], "modules": [ { "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/FilterCriteria/Критери_Отбора1/Ext/ManagerModule.bsl", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/FilterCriteria/КритерийОтбора1/Ext/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.FilterCriterion/mdoReference" }, diff --git "a/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601_edt.json" index 91464eb9f..7bbd3e7eb 100644 --- "a/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/FilterCriteria.\320\232\321\200\320\270\321\202\320\265\321\200\320\270\320\271\320\236\321\202\320\261\320\276\321\200\320\2601_edt.json" @@ -30,13 +30,13 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/FilterCriteria/Критери_Отбора1/ManagerModule.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/FilterCriteria/КритерийОтбора1/ManagerModule.bsl" ] ], "modules": [ { "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/FilterCriteria/Критери_Отбора1/ManagerModule.bsl", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/FilterCriteria/КритерийОтбора1/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.FilterCriterion/mdoReference" }, diff --git "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.json" "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.json" index 97c9ba8fe..875b1decb 100644 --- "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.json" +++ "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711.json" @@ -28,7 +28,11 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "explanation": { @@ -42,13 +46,13 @@ "moduleTypes": [ [ "RecordSetModule", - "src/test/resources/ext/designer/mdclasses/src/cf/InformationRegisters/РегистрСведени_1/Ext/RecordSetModule.bsl" + "src/test/resources/ext/designer/mdclasses/src/cf/InformationRegisters/РегистрСведений1/Ext/RecordSetModule.bsl" ] ], "modules": [ { "moduleType": "RecordSetModule", - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/InformationRegisters/РегистрСведени_1/Ext/RecordSetModule.bsl", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/InformationRegisters/РегистрСведений1/Ext/RecordSetModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/owner" }, diff --git "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711_edt.json" "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711_edt.json" index fb0629871..66c87090f 100644 --- "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2711_edt.json" @@ -28,7 +28,23 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 10, + "allowedLength": "VARIABLE" + } + } + } + ] + } } ], "explanation": { @@ -42,13 +58,13 @@ "moduleTypes": [ [ "RecordSetModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/InformationRegisters/РегистрСведени_1/RecordSetModule.bsl" + "src/test/resources/ext/edt/mdclasses/configuration/src/InformationRegisters/РегистрСведений1/RecordSetModule.bsl" ] ], "modules": [ { "moduleType": "RecordSetModule", - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/InformationRegisters/РегистрСведени_1/RecordSetModule.bsl", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/InformationRegisters/РегистрСведений1/RecordSetModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/owner" }, diff --git "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2712.json" "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2712.json" new file mode 100644 index 000000000..cc2d7928b --- /dev/null +++ "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2712.json" @@ -0,0 +1,79 @@ +{"com.github._1c_syntax.bsl.mdo.InformationRegister": { + "attributes": [], + "commands": [], + "comment": "", + "description": "РегистрСведений2", + "dimensions": [ + { + "uuid": "d231ea0e-e29e-447c-b5f8-4dec638e9b41", + "name": "Измерение1", + "mdoReference": { + "type": "DIMENSION", + "mdoRef": "InformationRegister.РегистрСведений2.Dimension.Измерение1", + "mdoRefRu": "РегистрСведений.РегистрСведений2.Измерение.Измерение1" + }, + "objectBelonging": "OWN", + "comment": "", + "synonym": { + "content": [] + }, + "supportVariant": "NONE", + "owner": { + "type": "INFORMATION_REGISTER", + "mdoRef": "InformationRegister.РегистрСведений2", + "mdoRefRu": "РегистрСведений.РегистрСведений2" + }, + "passwordMode": false, + "kind": "CUSTOM", + "indexing": "DONT_INDEX", + "master": false, + "denyIncompleteValues": false, + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } + } + ], + "explanation": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/synonym" + }, + "forms": [], + "mdoReference": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/owner" + }, + "mdoType": "INFORMATION_REGISTER", + "moduleTypes": [], + "modules": [], + "name": "РегистрСведений2", + "objectBelonging": "OWN", + "possibleRights": [ + { + "default": { + "tag": 4 + }, + "int": 14, + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "READ", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "VIEW", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EDIT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "TOTALS_CONTROL", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "READ_DATA_HISTORY", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "VIEW_DATA_HISTORY", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "READ_DATA_HISTORY_OF_MISSING_DATA", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_HISTORY", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_HISTORY_OF_MISSING_DATA", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_HISTORY_SETTINGS", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_HISTORY_VERSION_COMMENT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EDIT_DATA_HISTORY_VERSION_COMMENT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "SWITCH_TO_DATA_HISTORY_VERSION" + } + ], + "resources": [], + "supportVariant": "NONE", + "synonym": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/synonym" + }, + "templates": [], + "uuid": "af7fecd7-c58e-489c-b020-9a6f50aafb4d" +}} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2712_edt.json" "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2712_edt.json" new file mode 100644 index 000000000..7c552dbdf --- /dev/null +++ "b/src/test/resources/fixtures/mdclasses/InformationRegisters.\320\240\320\265\320\263\320\270\321\201\321\202\321\200\320\241\320\262\320\265\320\264\320\265\320\275\320\270\320\2712_edt.json" @@ -0,0 +1,91 @@ +{"com.github._1c_syntax.bsl.mdo.InformationRegister": { + "attributes": [], + "commands": [], + "comment": "", + "description": "РегистрСведений2", + "dimensions": [ + { + "uuid": "d231ea0e-e29e-447c-b5f8-4dec638e9b41", + "name": "Измерение1", + "mdoReference": { + "type": "DIMENSION", + "mdoRef": "InformationRegister.РегистрСведений2.Dimension.Измерение1", + "mdoRefRu": "РегистрСведений.РегистрСведений2.Измерение.Измерение1" + }, + "objectBelonging": "OWN", + "comment": "", + "synonym": { + "content": [] + }, + "supportVariant": "NONE", + "owner": { + "type": "INFORMATION_REGISTER", + "mdoRef": "InformationRegister.РегистрСведений2", + "mdoRefRu": "РегистрСведений.РегистрСведений2" + }, + "passwordMode": false, + "kind": "CUSTOM", + "indexing": "DONT_INDEX", + "master": false, + "denyIncompleteValues": false, + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 10, + "allowedLength": "VARIABLE" + } + } + } + ] + } + } + ], + "explanation": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/synonym" + }, + "forms": [], + "mdoReference": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/owner" + }, + "mdoType": "INFORMATION_REGISTER", + "moduleTypes": [], + "modules": [], + "name": "РегистрСведений2", + "objectBelonging": "OWN", + "possibleRights": [ + { + "default": { + "tag": 4 + }, + "int": 14, + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "READ", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "VIEW", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EDIT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "TOTALS_CONTROL", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "READ_DATA_HISTORY", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "VIEW_DATA_HISTORY", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "READ_DATA_HISTORY_OF_MISSING_DATA", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_HISTORY", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_HISTORY_OF_MISSING_DATA", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_HISTORY_SETTINGS", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_HISTORY_VERSION_COMMENT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EDIT_DATA_HISTORY_VERSION_COMMENT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "SWITCH_TO_DATA_HISTORY_VERSION" + } + ], + "resources": [], + "supportVariant": "NONE", + "synonym": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/com.github._1c_syntax.bsl.mdo.children.Dimension/synonym" + }, + "templates": [], + "uuid": "af7fecd7-c58e-489c-b020-9a6f50aafb4d" +}} \ No newline at end of file diff --git "a/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021.json" "b/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021.json" index c9408572a..277fc4bd6 100644 --- "a/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021.json" +++ "b/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021.json" @@ -14,19 +14,19 @@ }, "mdoType": "REPORT", "moduleTypes": [ - [ - "ManagerModule", - "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ManagerModule.bsl" - ], [ "ObjectModule", "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ObjectModule.bsl" + ], + [ + "ManagerModule", + "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ManagerModule.bsl" ] ], "modules": [ { - "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ManagerModule.bsl", + "moduleType": "ObjectModule", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ObjectModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Report/mdoReference" }, @@ -34,8 +34,8 @@ "isProtected": false }, { - "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ObjectModule.bsl", + "moduleType": "ManagerModule", + "uri": "src/test/resources/ext/designer/mdclasses/src/cf/Reports/Отчет1/Ext/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Report/mdoReference" }, diff --git "a/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021_edt.json" "b/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021_edt.json" index ef6a26961..54b06472a 100644 --- "a/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Reports.\320\236\321\202\321\207\320\265\321\2021_edt.json" @@ -14,19 +14,19 @@ }, "mdoType": "REPORT", "moduleTypes": [ - [ - "ManagerModule", - "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ManagerModule.bsl" - ], [ "ObjectModule", "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ObjectModule.bsl" + ], + [ + "ManagerModule", + "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ManagerModule.bsl" ] ], "modules": [ { - "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ManagerModule.bsl", + "moduleType": "ObjectModule", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ObjectModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Report/mdoReference" }, @@ -34,8 +34,8 @@ "isProtected": false }, { - "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ObjectModule.bsl", + "moduleType": "ManagerModule", + "uri": "src/test/resources/ext/edt/mdclasses/configuration/src/Reports/Отчет1/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Report/mdoReference" }, diff --git "a/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141.json" "b/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141.json" index acf3d6cd3..6eb930a10 100644 --- "a/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141.json" +++ "b/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141.json" @@ -26,7 +26,11 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "documents": [ diff --git "a/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141_edt.json" "b/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141_edt.json" index c03a320e9..bfd278b33 100644 --- "a/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141_edt.json" +++ "b/src/test/resources/fixtures/mdclasses/Sequences.\320\237\320\276\321\201\320\273\320\265\320\264\320\276\320\262\320\260\321\202\320\265\320\273\321\214\320\275\320\276\321\201\321\202\321\2141_edt.json" @@ -26,7 +26,17 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "DocumentRef.Документ1", + "category": "REFERENCE", + "qualifier": {} + } + ] + } } ], "documents": [ diff --git "a/src/test/resources/fixtures/mdclasses/Tasks.\320\227\320\260\320\264\320\260\321\207\320\2601.json" "b/src/test/resources/fixtures/mdclasses/Tasks.\320\227\320\260\320\264\320\260\321\207\320\2601.json" index 668b02e31..e3ce8b7b8 100644 --- "a/src/test/resources/fixtures/mdclasses/Tasks.\320\227\320\260\320\264\320\260\321\207\320\2601.json" +++ "b/src/test/resources/fixtures/mdclasses/Tasks.\320\227\320\260\320\264\320\260\321\207\320\2601.json" @@ -29,6 +29,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "format": { "content": [] }, diff --git "a/src/test/resources/fixtures/mdclasses/Tasks.\320\227\320\260\320\264\320\260\321\207\320\2601_edt.json" "b/src/test/resources/fixtures/mdclasses/Tasks.\320\227\320\260\320\264\320\260\321\207\320\2601_edt.json" new file mode 100644 index 000000000..326a5df11 --- /dev/null +++ "b/src/test/resources/fixtures/mdclasses/Tasks.\320\227\320\260\320\264\320\260\321\207\320\2601_edt.json" @@ -0,0 +1,124 @@ +{"com.github._1c_syntax.bsl.mdo.Task": { + "addressingAttributes": [ + { + "uuid": "bf531047-7ec7-4c74-bfdb-917138b2127c", + "name": "РеквизитАдресации", + "mdoReference": { + "type": "TASK_ADDRESSING_ATTRIBUTE", + "mdoRef": "Task.Задача1.AddressingAttribute.РеквизитАдресации", + "mdoRefRu": "Задача.Задача1.РеквизитАдресации.РеквизитАдресации" + }, + "objectBelonging": "OWN", + "comment": "", + "synonym": { + "content": [ + [ + { + "langKey": "ru", + "value": "Реквизит адресации" + } + ] + ] + }, + "supportVariant": "NONE", + "owner": { + "type": "TASK", + "mdoRef": "Task.Задача1", + "mdoRefRu": "Задача.Задача1" + }, + "passwordMode": false, + "kind": "CUSTOM", + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 10, + "allowedLength": "VARIABLE" + } + } + } + ] + }, + "format": { + "content": [] + }, + "editFormat": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" + }, + "toolTip": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" + }, + "markNegatives": false, + "mask": "", + "multiLine": false, + "extendedEdit": false, + "fillFromFillingValue": false, + "choiceForm": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + } + } + ], + "attributes": [], + "commands": [], + "comment": "", + "description": "Задача1", + "explanation": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" + }, + "forms": [], + "mdoReference": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/owner" + }, + "mdoType": "TASK", + "moduleTypes": [], + "modules": [], + "name": "Задача1", + "objectBelonging": "OWN", + "possibleRights": [ + { + "default": { + "tag": 4 + }, + "int": 24, + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "INSERT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "READ", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "DELETE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "VIEW", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EDIT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "INPUT_BY_STRING", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "INTERACTIVE_DELETE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "INTERACTIVE_INSERT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "INTERACTIVE_SET_DELETION_MARK", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "INTERACTIVE_CLEAR_DELETION_MARK", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "INTERACTIVE_DELETE_MARKED", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "INTERACTIVE_ACTIVATE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EXECUTE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "INTERACTIVE_EXECUTE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "READ_DATA_HISTORY", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "VIEW_DATA_HISTORY", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "READ_DATA_HISTORY_OF_MISSING_DATA", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_HISTORY", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_HISTORY_OF_MISSING_DATA", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_HISTORY_SETTINGS", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_HISTORY_VERSION_COMMENT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EDIT_DATA_HISTORY_VERSION_COMMENT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "SWITCH_TO_DATA_HISTORY_VERSION" + } + ], + "supportVariant": "NONE", + "synonym": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" + }, + "tabularSections": [], + "templates": [], + "uuid": "c251fcec-ec02-4ef4-8f70-4d70db6631ea" +}} \ No newline at end of file diff --git a/src/test/resources/fixtures/mdclasses_3_18/Configuration.json b/src/test/resources/fixtures/mdclasses_3_18/Configuration.json index 842f8c6b7..c58fad1de 100644 --- a/src/test/resources/fixtures/mdclasses_3_18/Configuration.json +++ b/src/test/resources/fixtures/mdclasses_3_18/Configuration.json @@ -83,7 +83,7 @@ }, "supportVariant": "NONE", "moduleType": "CommonModule", - "uri": "src/test/resources/ext/designer/mdclasses_3_18/src/cf/CommonModules/Общи_Модуль1/Ext/Module.bsl", + "uri": "src/test/resources/ext/designer/mdclasses_3_18/src/cf/CommonModules/ОбщийМодуль1/Ext/Module.bsl", "isProtected": false, "server": true, "global": false, @@ -210,7 +210,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "dimensions": [ diff --git a/src/test/resources/fixtures/mdclasses_3_18/Configuration_edt.json b/src/test/resources/fixtures/mdclasses_3_18/Configuration_edt.json index 2b3e0b0ef..98f9d5262 100644 --- a/src/test/resources/fixtures/mdclasses_3_18/Configuration_edt.json +++ b/src/test/resources/fixtures/mdclasses_3_18/Configuration_edt.json @@ -83,7 +83,7 @@ }, "supportVariant": "NONE", "moduleType": "CommonModule", - "uri": "src/test/resources/ext/edt/mdclasses_3_18/configuration/src/CommonModules/Общи_Модуль1/Module.bsl", + "uri": "src/test/resources/ext/edt/mdclasses_3_18/configuration/src/CommonModules/ОбщийМодуль1/Module.bsl", "isProtected": false, "server": true, "global": false, @@ -210,7 +210,13 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "dimensions": [ diff --git a/src/test/resources/fixtures/mdclasses_3_24/Configuration.json b/src/test/resources/fixtures/mdclasses_3_24/Configuration.json new file mode 100644 index 000000000..fa905d819 --- /dev/null +++ b/src/test/resources/fixtures/mdclasses_3_24/Configuration.json @@ -0,0 +1,135 @@ +{"com.github._1c_syntax.bsl.mdclasses.Configuration": { + "XDTOPackages": [], + "accountingRegisters": [], + "accumulationRegisters": [], + "bots": [], + "briefInformation": { + "content": [] + }, + "businessProcesses": [], + "calculationRegisters": [], + "catalogs": [], + "chartsOfAccounts": [], + "chartsOfCalculationTypes": [], + "chartsOfCharacteristicTypes": [], + "commandGroups": [], + "comment": "", + "commonAttributes": [], + "commonCommands": [], + "commonForms": [], + "commonModules": [], + "commonPictures": [], + "commonTemplates": [], + "compatibilityMode": { + "minor": 3, + "version": 99 + }, + "configurationExtensionCompatibilityMode": { + "minor": 3, + "version": 99 + }, + "configurationSource": "EMPTY", + "constants": [], + "copyrights": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/briefInformation" + }, + "dataLockControlMode": "AUTOMATIC", + "dataProcessors": [], + "defaultLanguage": { + "type": "UNKNOWN", + "mdoRef": "", + "mdoRefRu": "" + }, + "defaultRunMode": "AUTO", + "definedTypes": [], + "description": "empty", + "detailedInformation": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/briefInformation" + }, + "documentJournals": [], + "documentNumerators": [], + "documents": [], + "enums": [], + "eventSubscriptions": [], + "exchangePlans": [], + "externalDataSources": [], + "filterCriteria": [], + "functionalOptions": [], + "functionalOptionsParameters": [], + "httpServices": [], + "informationRegisters": [], + "integrationServices": [], + "interfaceCompatibilityMode": "VERSION_8_2", + "interfaces": [], + "languages": [], + "mdoReference": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/defaultLanguage" + }, + "mdoType": "CONFIGURATION", + "modalityUseMode": "USE", + "moduleTypes": [], + "modules": [], + "name": "empty", + "objectAutonumerationMode": "", + "objectBelonging": "OWN", + "paletteColors": [], + "possibleRights": [ + { + "default": { + "tag": 4 + }, + "int": 26, + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "ADMINISTRATION", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "DATA_ADMINISTRATION", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "UPDATE_DATA_BASE_CONFIGURATION", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EXCLUSIVE_MODE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "ACTIVE_USERS", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EVENT_LOG", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "THIN_CLIENT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "WEB_CLIENT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "MOBILE_CLIENT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "THICK_CLIENT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EXTERNAL_CONNECTION", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "AUTOMATION", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "TECHNICAL_SPECIALIST_MODE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "COLLABORATION_SYSTEM_INFO_BASE_REGISTRATION", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "MAIN_WINDOW_MODE_EMBEDDED_WORKPLACE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "MAIN_WINDOW_MODE_KIOSK", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "MAIN_WINDOW_MODE_NORMAL", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "MAIN_WINDOW_MODE_FULLSCREEN_WORKPLACE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "MAIN_WINDOW_MODE_WORKPLACE", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "ANALYTICS_SYSTEM_CLIENT", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "EXCLUSIVE_MODE_TERMINATION_AT_SESSION_START", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "SAVE_USER_DATA", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "CONFIGURATION_EXTENSIONS_ADMINISTRATION", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "INTERACTIVE_OPEN_EXT_DATA_PROCESSORS", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "INTERACTIVE_OPEN_EXT_REPORTS", + "com.github._1c_syntax.bsl.mdo.support.RoleRight": "OUTPUT" + } + ], + "reports": [], + "roles": [], + "scheduledJobs": [], + "scriptVariant": "ENGLISH", + "sequences": [], + "sessionParameters": [], + "settingsStorages": [], + "styleItems": [], + "styles": [], + "subsystems": [], + "supportVariant": "NONE", + "synchronousExtensionAndAddInCallUseMode": "USE_WITH_WARNINGS", + "synchronousPlatformExtensionAndAddInCallUseMode": "USE", + "synonym": { + "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/briefInformation" + }, + "tasks": [], + "useManagedFormInOrdinaryApplication": false, + "useOrdinaryFormInManagedApplication": false, + "usePurposes": [], + "uuid": "empty", + "vendor": "", + "version": "", + "webServices": [], + "wsReferences": [] +}} \ No newline at end of file diff --git a/src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json b/src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json index 66ce8f931..0711f6eee 100644 --- a/src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json +++ b/src/test/resources/fixtures/mdclasses_3_24/Configuration_edt.json @@ -91,7 +91,13 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "dimensions": [ @@ -117,7 +123,13 @@ "indexing": "INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "forms": [], @@ -169,7 +181,13 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "dimensions": [ @@ -195,7 +213,13 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "forms": [], @@ -284,7 +308,13 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "dimensions": [ @@ -310,7 +340,13 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": true, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "forms": [], @@ -507,7 +543,13 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "extDimensionAccountingFlags": [ @@ -530,7 +572,13 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "explanation": { @@ -878,7 +926,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "forms": [], @@ -1358,14 +1410,14 @@ "mdoType": "CONFIGURATION", "modalityUseMode": "USE_WITH_WARNINGS", "moduleTypes": [ - [ - "SessionModule", - "src/test/resources/ext/edt/mdclasses_3_24/configuration/src/Configuration/SessionModule.bsl" - ], [ "ExternalConnectionModule", "src/test/resources/ext/edt/mdclasses_3_24/configuration/src/Configuration/ExternalConnectionModule.bsl" ], + [ + "SessionModule", + "src/test/resources/ext/edt/mdclasses_3_24/configuration/src/Configuration/SessionModule.bsl" + ], [ "ManagedApplicationModule", "src/test/resources/ext/edt/mdclasses_3_24/configuration/src/Configuration/ManagedApplicationModule.bsl" @@ -1543,7 +1595,13 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "documents": [ @@ -1690,6 +1748,12 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + }, "format": { "@reference": "/com.github._1c_syntax.bsl.mdclasses.Configuration/XDTOPackages/com.github._1c_syntax.bsl.mdo.XDTOPackage/synonym" }, diff --git a/src/test/resources/fixtures/mdclasses_5_1/Configuration.json b/src/test/resources/fixtures/mdclasses_5_1/Configuration.json index 7e676ceeb..a3285d199 100644 --- a/src/test/resources/fixtures/mdclasses_5_1/Configuration.json +++ b/src/test/resources/fixtures/mdclasses_5_1/Configuration.json @@ -83,7 +83,7 @@ }, "supportVariant": "NONE", "moduleType": "CommonModule", - "uri": "src/test/resources/ext/designer/mdclasses_5_1/src/cf/CommonModules/Общи_Модуль1/Ext/Module.bsl", + "uri": "src/test/resources/ext/designer/mdclasses_5_1/src/cf/CommonModules/ОбщийМодуль1/Ext/Module.bsl", "isProtected": false, "server": true, "global": false, @@ -210,7 +210,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "dimensions": [ diff --git a/src/test/resources/fixtures/mdclasses_ext/Configuration.json b/src/test/resources/fixtures/mdclasses_ext/Configuration.json index ee03bc837..a30f20adc 100644 --- a/src/test/resources/fixtures/mdclasses_ext/Configuration.json +++ b/src/test/resources/fixtures/mdclasses_ext/Configuration.json @@ -453,7 +453,11 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "documents": [] diff --git a/src/test/resources/fixtures/mdclasses_ext/Configuration_edt.json b/src/test/resources/fixtures/mdclasses_ext/Configuration_edt.json index 52b89834c..261e7d67f 100644 --- a/src/test/resources/fixtures/mdclasses_ext/Configuration_edt.json +++ b/src/test/resources/fixtures/mdclasses_ext/Configuration_edt.json @@ -488,7 +488,13 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + 1 + ] + } } ], "documents": [] diff --git "a/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" "b/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" index da9d2d331..3e403b373 100644 --- "a/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" +++ "b/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265.json" @@ -40,7 +40,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } }, { "uuid": "5c913626-48d1-4e0a-a423-64078ce59c7b", @@ -79,7 +83,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": true + "fillFromFillingValue": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "0a4e6b7a-b380-4547-bc3c-5d6895a5d19a", @@ -118,7 +126,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "7b0ec304-1904-413e-a9c6-ff62e87107dd", @@ -157,7 +169,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "d4dd8c96-914d-496f-b735-ef85ec473605", @@ -196,7 +212,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "62517db4-59e6-4945-bcd6-b3f1845572bf", @@ -235,7 +255,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "a6a9dd40-24cd-4d40-a12d-44f94f8c05a7", @@ -274,7 +298,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "f0f72149-0e7f-441a-b70d-8f47d4977927", @@ -313,7 +341,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "776efc3e-ac27-4550-bafd-6e91aa987af2", @@ -352,7 +384,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "9f478c85-b72c-40ae-aa08-7ddf73b5b15c", @@ -391,7 +427,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "cc438366-85ea-48be-8b74-d05cddb1fc51", @@ -430,7 +470,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "4688fd3b-4a92-4ed8-b111-0cf22a729b1c", @@ -469,7 +513,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "92029d1f-0472-4aaa-8fd6-9fb3c3cf414e", @@ -508,7 +556,11 @@ "mask": "", "multiLine": true, "extendedEdit": true, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "3271b800-1825-422f-97bb-757baf403e90", @@ -547,7 +599,11 @@ "mask": "", "multiLine": true, "extendedEdit": true, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "6fd6efc1-facc-4ece-a5b3-3dce6acca81d", @@ -586,7 +642,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": true + "fillFromFillingValue": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "4ee82868-7a20-4c3a-91f9-42a6bf53ac37", @@ -625,7 +685,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "a040c756-4687-4bfd-a690-b122d3c490e5", @@ -664,7 +728,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "bd5940d5-13fd-4f59-bb6c-614f93f9c8e4", @@ -703,7 +771,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "961a9801-3956-4ea0-b0d3-908f09bf4929", @@ -742,7 +814,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "6fac5c14-e126-4342-9078-edf1d0efcbf2", @@ -781,7 +857,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "0a3325a1-21c4-4997-882f-4ac2edc175f0", @@ -820,7 +900,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "71102d3f-f020-4d6f-9582-9a7eefb4e797", @@ -859,7 +943,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "53ef6849-a3f3-4171-9167-f349f2d6a736", @@ -898,7 +986,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "3f588bd3-d461-42b7-8ab1-386af6399d56", @@ -937,7 +1029,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "c04ff85e-b4af-4a9f-b0e9-c5c65e3d10a1", @@ -976,7 +1072,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "8c576405-29c1-46b1-ab2e-40e52c21cab0", @@ -1015,7 +1115,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "b33a89da-8589-4902-83fa-6545e5fce23e", @@ -1054,7 +1158,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] @@ -1098,7 +1206,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Forms/Де_ствиеВыполнить/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Forms/ДействиеВыполнить/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" }, @@ -1768,7 +1876,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Forms/Де_ствиеПроверить/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/BusinessProcesses/Задание/Forms/ДействиеПроверить/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" }, diff --git "a/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" "b/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" index 5f239fb4d..ad9d07efc 100644 --- "a/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/BusinessProcesses.\320\227\320\260\320\264\320\260\320\275\320\270\320\265_edt.json" @@ -40,7 +40,24 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.ВнешниеПользователи", + "category": "REFERENCE", + "qualifier": {} + }, + { + "typeName": "CatalogRef.Пользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "5c913626-48d1-4e0a-a423-64078ce59c7b", @@ -79,7 +96,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": true + "fillFromFillingValue": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "EnumRef.ВариантыВажностиЗадачи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "0a4e6b7a-b380-4547-bc3c-5d6895a5d19a", @@ -118,7 +147,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "7b0ec304-1904-413e-a9c6-ff62e87107dd", @@ -157,7 +198,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "TaskRef.ЗадачаИсполнителя", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "d4dd8c96-914d-496f-b735-ef85ec473605", @@ -196,7 +249,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "62517db4-59e6-4945-bcd6-b3f1845572bf", @@ -235,7 +300,33 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.ВнешниеПользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "CatalogRef.РолиИсполнителей", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "CatalogRef.Пользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "a6a9dd40-24cd-4d40-a12d-44f94f8c05a7", @@ -274,7 +365,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 250, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "f0f72149-0e7f-441a-b70d-8f47d4977927", @@ -313,7 +420,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "776efc3e-ac27-4550-bafd-6e91aa987af2", @@ -352,7 +471,24 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } }, { "uuid": "9f478c85-b72c-40ae-aa08-7ddf73b5b15c", @@ -391,7 +527,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "cc438366-85ea-48be-8b74-d05cddb1fc51", @@ -430,7 +578,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "DefinedType.ПредметЗадачи", + "category": "DEFINED", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "4688fd3b-4a92-4ed8-b111-0cf22a729b1c", @@ -469,7 +629,33 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.ВнешниеПользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "CatalogRef.РолиИсполнителей", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "CatalogRef.Пользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "92029d1f-0472-4aaa-8fd6-9fb3c3cf414e", @@ -508,7 +694,23 @@ "mask": "", "multiLine": true, "extendedEdit": true, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "3271b800-1825-422f-97bb-757baf403e90", @@ -547,7 +749,23 @@ "mask": "", "multiLine": true, "extendedEdit": true, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "6fd6efc1-facc-4ece-a5b3-3dce6acca81d", @@ -586,7 +804,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": true + "fillFromFillingValue": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "EnumRef.СостоянияБизнесПроцессов", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "4ee82868-7a20-4c3a-91f9-42a6bf53ac37", @@ -625,7 +855,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "a040c756-4687-4bfd-a690-b122d3c490e5", @@ -664,7 +906,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "bd5940d5-13fd-4f59-bb6c-614f93f9c8e4", @@ -703,7 +957,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 150, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "961a9801-3956-4ea0-b0d3-908f09bf4929", @@ -742,7 +1012,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "6fac5c14-e126-4342-9078-edf1d0efcbf2", @@ -781,7 +1063,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "TaskRef.ЗадачаИсполнителя", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "0a3325a1-21c4-4997-882f-4ac2edc175f0", @@ -820,7 +1114,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "ValueStorage", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "71102d3f-f020-4d6f-9582-9a7eefb4e797", @@ -859,7 +1165,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Characteristic.ОбъектыАдресацииЗадач", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "53ef6849-a3f3-4171-9167-f349f2d6a736", @@ -898,7 +1216,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Characteristic.ОбъектыАдресацииЗадач", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "3f588bd3-d461-42b7-8ab1-386af6399d56", @@ -937,7 +1267,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Characteristic.ОбъектыАдресацииЗадач", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "c04ff85e-b4af-4a9f-b0e9-c5c65e3d10a1", @@ -976,7 +1318,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Characteristic.ОбъектыАдресацииЗадач", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "8c576405-29c1-46b1-ab2e-40e52c21cab0", @@ -1015,7 +1369,33 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.ВнешниеПользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "CatalogRef.Пользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "CatalogRef.ГруппыИсполнителейЗадач", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "b33a89da-8589-4902-83fa-6545e5fce23e", @@ -1054,7 +1434,33 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.ВнешниеПользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "CatalogRef.Пользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "CatalogRef.ГруппыИсполнителейЗадач", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } } ], [] @@ -1098,7 +1504,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/Forms/Де_ствиеВыполнить/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/Forms/ДействиеВыполнить/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" }, @@ -1756,7 +2162,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/Forms/Де_ствиеПроверить/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/BusinessProcesses/Задание/Forms/ДействиеПроверить/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.BusinessProcess/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" }, diff --git "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" index bba84f5a6..59401a9f0 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270.json" @@ -40,7 +40,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } }, { "uuid": "08c2f92c-eb05-49e7-bfc9-4a89607b9864", @@ -79,7 +83,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": true + "fillFromFillingValue": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "6d751379-89a7-49b5-93e5-578329c63d9c", @@ -118,7 +126,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "c3f156ef-947e-4ebb-883f-4f099a116063", @@ -150,7 +162,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "5e3ab0a3-c0a6-4f41-85d3-2eede4abb555", @@ -189,7 +205,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "a065ffc3-f50b-4a78-9b84-bfc4e5515a4b", @@ -228,7 +248,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": true + "fillFromFillingValue": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "4cba5a06-1484-4dd1-8e35-2d702c7d96d0", @@ -267,7 +291,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "e98e9e56-2995-430c-bd3b-f1070aec15a5", @@ -299,7 +327,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] diff --git "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" index af06443bb..289b050ca 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Catalogs.\320\227\320\260\320\274\320\265\321\202\320\272\320\270_edt.json" @@ -40,7 +40,17 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.Пользователи", + "category": "REFERENCE", + "qualifier": {} + } + ] + } }, { "uuid": "08c2f92c-eb05-49e7-bfc9-4a89607b9864", @@ -79,7 +89,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": true + "fillFromFillingValue": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "DefinedType.ПредметЗаметок", + "category": "DEFINED", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "6d751379-89a7-49b5-93e5-578329c63d9c", @@ -118,7 +140,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "ValueStorage", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "c3f156ef-947e-4ebb-883f-4f099a116063", @@ -150,7 +184,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "5e3ab0a3-c0a6-4f41-85d3-2eede4abb555", @@ -189,7 +239,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "a065ffc3-f50b-4a78-9b84-bfc4e5515a4b", @@ -228,7 +290,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": true + "fillFromFillingValue": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "EnumRef.ЦветаЗаметок", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "4cba5a06-1484-4dd1-8e35-2d702c7d96d0", @@ -267,7 +341,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Catalog/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "e98e9e56-2995-430c-bd3b-f1070aec15a5", @@ -299,7 +385,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 100, + "allowedLength": "VARIABLE" + } + } + } + ] + } } ], [] diff --git "a/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" "b/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" index efe0616b4..0cd696b01 100644 --- "a/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217.json" @@ -40,7 +40,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } }, { "uuid": "fe926c88-d792-4db3-abcf-3c94dfdcc407", @@ -79,7 +83,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "b1c3a6c1-5245-4a65-8a45-13948be6f6a1", @@ -118,7 +126,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "bcbdba9e-0b29-4ea7-a7d5-1de819bf86ec", @@ -157,7 +169,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "e0c51555-1614-4aa7-a075-c5e1251579ba", @@ -196,7 +212,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "c75a1c6d-fa33-4b57-b359-6253aff5f3e7", @@ -235,7 +255,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "af88ea84-5742-4c9f-9a02-6d0f25186f72", @@ -274,7 +298,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "51363236-c8eb-4eb7-9692-5c18edc9a5a8", @@ -313,7 +341,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "cb65fbad-69a0-47d8-b4a9-da49274c3eb7", @@ -352,7 +384,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "872521e3-413c-45ac-a6ea-39fe1324bae8", @@ -391,7 +427,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "8adebe50-a946-40c2-9258-b17efe787e0e", @@ -430,7 +470,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "8cad6cfd-91d0-4563-800a-d60c8a1b6a03", @@ -469,7 +513,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "81ef02df-498d-4af0-8254-dc6730cbf140", @@ -508,7 +556,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "2902460a-ed86-41cf-8e8f-895adab9a72f", @@ -547,7 +599,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "402f2fe0-4d08-4701-9c8f-0c2bb75815ef", @@ -586,7 +642,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "1a4ed7cf-3294-4a5c-9650-75b61d6b2531", @@ -625,7 +685,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "79ad09ba-875a-46bd-9cd9-9d084bf4f6ea", @@ -664,7 +728,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "f237a21e-066a-48e6-a5c4-5dc2487c7a3b", @@ -703,7 +771,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] @@ -3128,7 +3200,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Forms/ИзменениеНастро_киСво_ства/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Forms/ИзменениеНастройкиСвойства/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[4]/mdoReference" }, @@ -4173,7 +4245,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "14077038-2e41-4a05-a476-99f6f88a5c29", @@ -4205,7 +4281,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "917b0acc-88fe-4afc-b19b-6da69e060393", @@ -4244,7 +4324,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "a091b76e-8ba4-4534-bbb0-9990e69b8603", @@ -4283,7 +4367,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "867ee5d2-7566-4052-a311-b56e7e46b90d", @@ -4322,7 +4410,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] @@ -4391,7 +4483,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "ffec426d-2556-46d6-b313-aeca43581865", @@ -4423,7 +4519,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "f32e0941-2061-4e12-bdae-fcb65f91ac28", @@ -4455,7 +4555,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "6f0e0f44-db5a-4a13-9131-866b77b90f14", @@ -4487,7 +4591,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "9415e0aa-391f-4798-ad7d-3b854a756de8", @@ -4519,7 +4627,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] diff --git "a/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" index 2a351479d..78399d334 100644 --- "a/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/ChartsOfCharacteristicTypes.\320\224\320\276\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\240\320\265\320\272\320\262\320\270\320\267\320\270\321\202\321\213\320\230\320\241\320\262\320\265\320\264\320\265\320\275\320\270\321\217_edt.json" @@ -40,7 +40,17 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": {} + } + ] + } }, { "uuid": "fe926c88-d792-4db3-abcf-3c94dfdcc407", @@ -79,7 +89,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "ChartOfCharacteristicTypesRef.ДополнительныеРеквизитыИСведения", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "b1c3a6c1-5245-4a65-8a45-13948be6f6a1", @@ -118,7 +140,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "bcbdba9e-0b29-4ea7-a7d5-1de819bf86ec", @@ -157,7 +191,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "e0c51555-1614-4aa7-a075-c5e1251579ba", @@ -196,7 +242,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "c75a1c6d-fa33-4b57-b359-6253aff5f3e7", @@ -235,7 +293,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "af88ea84-5742-4c9f-9a02-6d0f25186f72", @@ -274,7 +344,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 75, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "51363236-c8eb-4eb7-9692-5c18edc9a5a8", @@ -313,7 +399,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 150, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "cb65fbad-69a0-47d8-b4a9-da49274c3eb7", @@ -352,7 +454,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 150, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "872521e3-413c-45ac-a6ea-39fe1324bae8", @@ -391,7 +509,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "8adebe50-a946-40c2-9258-b17efe787e0e", @@ -430,7 +560,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 100, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "8cad6cfd-91d0-4563-800a-d60c8a1b6a03", @@ -469,7 +615,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "81ef02df-498d-4af0-8254-dc6730cbf140", @@ -508,7 +670,24 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 2, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } }, { "uuid": "2902460a-ed86-41cf-8e8f-895adab9a72f", @@ -547,7 +726,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "402f2fe0-4d08-4701-9c8f-0c2bb75815ef", @@ -586,7 +781,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "1a4ed7cf-3294-4a5c-9650-75b61d6b2531", @@ -625,7 +836,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "79ad09ba-875a-46bd-9cd9-9d084bf4f6ea", @@ -664,7 +887,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.НаборыДополнительныхРеквизитовИСведений", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "f237a21e-066a-48e6-a5c4-5dc2487c7a3b", @@ -703,7 +938,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 150, + "allowedLength": "VARIABLE" + } + } + } + ] + } } ], [] @@ -3104,7 +3355,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Forms/ИзменениеНастро_киСво_ства/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/ChartsOfCharacteristicTypes/ДополнительныеРеквизитыИСведения/Forms/ИзменениеНастройкиСвойства/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[4]/mdoReference" }, @@ -4149,7 +4400,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 25, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "14077038-2e41-4a05-a476-99f6f88a5c29", @@ -4181,7 +4448,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.НаборыДополнительныхРеквизитовИСведений", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "917b0acc-88fe-4afc-b19b-6da69e060393", @@ -4220,7 +4499,30 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "ChartOfCharacteristicTypesRef.ДополнительныеРеквизитыИСведения", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 99, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "a091b76e-8ba4-4534-bbb0-9990e69b8603", @@ -4259,7 +4561,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 20, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "867ee5d2-7566-4052-a311-b56e7e46b90d", @@ -4298,7 +4616,56 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 50, + "allowedLength": "VARIABLE" + } + } + }, + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + }, + { + "typeName": "AnyRef", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.ChartOfCharacteristicTypes/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } } ], [] @@ -4367,7 +4734,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 10, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "ffec426d-2556-46d6-b313-aeca43581865", @@ -4399,7 +4782,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 75, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "f32e0941-2061-4e12-bdae-fcb65f91ac28", @@ -4431,7 +4830,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "6f0e0f44-db5a-4a13-9131-866b77b90f14", @@ -4463,7 +4878,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 150, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "9415e0aa-391f-4798-ad7d-3b854a756de8", @@ -4495,7 +4926,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 150, + "allowedLength": "VARIABLE" + } + } + } + ] + } } ], [] diff --git "a/src/test/resources/fixtures/ssl_3_1/CommonAttributes.\320\236\320\261\320\273\320\260\321\201\321\202\321\214\320\224\320\260\320\275\320\275\321\213\321\205\320\222\321\201\320\277\320\276\320\274\320\276\320\263\320\260\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\224\320\260\320\275\320\275\321\213\320\265.json" "b/src/test/resources/fixtures/ssl_3_1/CommonAttributes.\320\236\320\261\320\273\320\260\321\201\321\202\321\214\320\224\320\260\320\275\320\275\321\213\321\205\320\222\321\201\320\277\320\276\320\274\320\276\320\263\320\260\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\224\320\260\320\275\320\275\321\213\320\265.json" index d8397c900..b8e3ba53c 100644 --- "a/src/test/resources/fixtures/ssl_3_1/CommonAttributes.\320\236\320\261\320\273\320\260\321\201\321\202\321\214\320\224\320\260\320\275\320\275\321\213\321\205\320\222\321\201\320\277\320\276\320\274\320\276\320\263\320\260\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\224\320\260\320\275\320\275\321\213\320\265.json" +++ "b/src/test/resources/fixtures/ssl_3_1/CommonAttributes.\320\236\320\261\320\273\320\260\321\201\321\202\321\214\320\224\320\260\320\275\320\275\321\213\321\205\320\222\321\201\320\277\320\276\320\274\320\276\320\263\320\260\321\202\320\265\320\273\321\214\320\275\321\213\320\265\320\224\320\260\320\275\320\275\321\213\320\265.json" @@ -138,6 +138,10 @@ }, "description": "Область данных вспомогательные данные", "indexing": "DONT_INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "mdoReference": { "type": "COMMON_ATTRIBUTE", "mdoRef": "CommonAttribute.ОбластьДанныхВспомогательныеДанные", diff --git a/src/test/resources/fixtures/ssl_3_1/Configuration.json b/src/test/resources/fixtures/ssl_3_1/Configuration.json index 43f5431ca..61c3b0288 100644 --- a/src/test/resources/fixtures/ssl_3_1/Configuration.json +++ b/src/test/resources/fixtures/ssl_3_1/Configuration.json @@ -132,6 +132,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "master": false, "denyIncompleteValues": false, "useInTotals": true @@ -214,6 +218,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "DONT_INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "master": false, "denyIncompleteValues": false, "useInTotals": true @@ -329,6 +337,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "DONT_INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "master": false, "denyIncompleteValues": true, "useInTotals": true @@ -670,6 +682,10 @@ "autoUse": "USE", "passwordMode": false, "indexing": "DONT_INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "dataSeparation": "DONT_USE", "dataSeparationValue": { "type": "UNKNOWN", @@ -1575,6 +1591,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "DONT_INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "master": false, "denyIncompleteValues": false, "useInTotals": true @@ -1725,6 +1745,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "DONT_INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "format": { "content": [] }, diff --git a/src/test/resources/fixtures/ssl_3_1/Configuration_edt.json b/src/test/resources/fixtures/ssl_3_1/Configuration_edt.json index 414aafc18..59faac797 100644 --- a/src/test/resources/fixtures/ssl_3_1/Configuration_edt.json +++ b/src/test/resources/fixtures/ssl_3_1/Configuration_edt.json @@ -132,6 +132,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "master": false, "denyIncompleteValues": false, "useInTotals": true @@ -214,6 +218,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "DONT_INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "master": false, "denyIncompleteValues": false, "useInTotals": true @@ -329,6 +337,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "DONT_INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "master": false, "denyIncompleteValues": true, "useInTotals": true @@ -670,6 +682,10 @@ "autoUse": "USE", "passwordMode": false, "indexing": "DONT_INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "dataSeparation": "DONT_USE", "dataSeparationValue": { "type": "UNKNOWN", @@ -1568,6 +1584,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "DONT_INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "master": false, "denyIncompleteValues": false, "useInTotals": true @@ -1697,6 +1717,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "DONT_INDEX", + "type": { + "": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "format": { "content": [] }, diff --git "a/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" "b/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" index e084bb026..e4d39dfe9 100644 --- "a/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" +++ "b/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202.json" @@ -40,7 +40,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } }, { "uuid": "2b4f6e2f-6cc4-4c7c-98a6-786f3793366b", @@ -79,7 +83,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] @@ -1441,7 +1449,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "ba49a9e4-6ec1-43ff-92cd-9dbf221bbf09", @@ -1473,7 +1485,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "4f25ef45-c8d9-401d-b0e8-2217ac310f04", @@ -1512,7 +1528,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "504ca240-b5ae-433e-ae5f-d818263eea23", @@ -1551,7 +1571,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "32461819-9437-417d-8d1e-851c9a2dcee2", @@ -1590,7 +1614,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "74228950-8a4b-4dd6-a053-8650de202521", @@ -1629,7 +1657,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "6b9ce91e-08b9-4972-9878-1724c67b68ec", @@ -1668,7 +1700,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "640814f2-6082-475e-8006-25fd5b24afdb", @@ -1707,7 +1743,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] diff --git "a/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" "b/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" index 49620f53b..9ab0970e4 100644 --- "a/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/DataProcessors.\320\227\320\260\320\263\321\200\321\203\320\267\320\272\320\260\320\232\321\203\321\200\321\201\320\276\320\262\320\222\320\260\320\273\321\216\321\202_edt.json" @@ -40,7 +40,17 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": {} + } + ] + } }, { "uuid": "2b4f6e2f-6cc4-4c7c-98a6-786f3793366b", @@ -79,7 +89,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } } ], [] @@ -1441,7 +1463,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 3, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "ba49a9e4-6ec1-43ff-92cd-9dbf221bbf09", @@ -1473,7 +1511,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.Валюты", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "4f25ef45-c8d9-401d-b0e8-2217ac310f04", @@ -1512,7 +1562,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "504ca240-b5ae-433e-ae5f-d818263eea23", @@ -1551,7 +1613,24 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } }, { "uuid": "32461819-9437-417d-8d1e-851c9a2dcee2", @@ -1590,7 +1669,24 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } }, { "uuid": "74228950-8a4b-4dd6-a053-8650de202521", @@ -1629,7 +1725,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.DataProcessor/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "6b9ce91e-08b9-4972-9878-1724c67b68ec", @@ -1668,7 +1776,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 50, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "640814f2-6082-475e-8006-25fd5b24afdb", @@ -1707,7 +1831,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 10, + "allowedLength": "VARIABLE" + } + } + } + ] + } } ], [] diff --git "a/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" "b/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" index c7a015cb4..19756d7d0 100644 --- "a/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217.json" @@ -29,7 +29,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX_WITH_ADDITIONAL_ORDER" + "indexing": "INDEX_WITH_ADDITIONAL_ORDER", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } }, { "uuid": "a2accf54-5966-42e8-ab2e-e56e415963ee", @@ -57,7 +61,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "d8eb5329-5900-4b5d-b45e-458513dddfef", @@ -85,7 +93,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX_WITH_ADDITIONAL_ORDER" + "indexing": "INDEX_WITH_ADDITIONAL_ORDER", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "6d521e58-24a3-4f19-b4b0-dff84f7ca86b", @@ -113,7 +125,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "8c413fa5-9e24-4b81-aa55-0e78c5e3e20f", @@ -141,7 +157,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "a4322f22-7de0-4018-8e06-9f1aa7cf0c07", @@ -169,7 +189,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "eaaed107-69d4-4963-be83-74519e331715", @@ -197,7 +221,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX_WITH_ADDITIONAL_ORDER" + "indexing": "INDEX_WITH_ADDITIONAL_ORDER", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "38cddf96-8703-4396-8c73-47fb22828a48", @@ -225,7 +253,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "2c2cb793-0177-4983-91ca-9c292c5b10f1", @@ -253,7 +285,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX_WITH_ADDITIONAL_ORDER" + "indexing": "INDEX_WITH_ADDITIONAL_ORDER", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "2a2e7f51-a4e5-48ec-b969-b1fca18ba9b5", @@ -281,7 +317,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX_WITH_ADDITIONAL_ORDER" + "indexing": "INDEX_WITH_ADDITIONAL_ORDER", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "221fa473-3327-44e6-a033-6fdfd2be713c", @@ -309,7 +349,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "7a5973f0-7e29-44af-8e7b-70af71f704a4", @@ -337,7 +381,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX" + "indexing": "INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "2b2bf0f7-0946-4492-bba0-27f007a70e64", @@ -365,7 +413,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "22c9a703-5ed3-4156-8fa6-476b1c1452f1", @@ -393,7 +445,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "8be10d88-8c37-4444-9c89-6cbbe9913bda", @@ -421,7 +477,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX" + "indexing": "INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } } ], [] @@ -452,7 +512,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/Взаимоде_ствияПоКонтакту/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/ВзаимодействияПоКонтакту/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand/mdoReference" }, @@ -481,7 +541,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/Взаимоде_ствияПоПредмету/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/ВзаимодействияПоПредмету/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[2]/mdoReference" }, @@ -517,7 +577,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/ЗапланироватьВзаимоде_ствиеПоКонтакту/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/ЗапланироватьВзаимодействиеПоКонтакту/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[3]/mdoReference" }, @@ -546,7 +606,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/ЗапланироватьВзаимоде_ствиеПоПредмету/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/ЗапланироватьВзаимодействиеПоПредмету/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[4]/mdoReference" }, @@ -582,7 +642,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/ЗапланироватьВстречуПоКонтакту/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/ЗапланироватьВстречуПоКонтакту/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[5]/mdoReference" }, @@ -611,7 +671,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/ЗапланироватьВстречуПоПредмету/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/ЗапланироватьВстречуПоПредмету/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[6]/mdoReference" }, @@ -647,7 +707,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/НаписатьSMSПоКонтакту/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/НаписатьSMSПоКонтакту/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[7]/mdoReference" }, @@ -676,7 +736,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/НаписатьSMSПоПредмету/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/НаписатьSMSПоПредмету/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[8]/mdoReference" }, @@ -712,7 +772,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/НаписатьЭлектронноеПисьмоПоКонтакту/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/НаписатьЭлектронноеПисьмоПоКонтакту/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[9]/mdoReference" }, @@ -741,7 +801,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/НаписатьЭлектронноеПисьмоПоПредмету/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/НаписатьЭлектронноеПисьмоПоПредмету/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[10]/mdoReference" }, @@ -777,7 +837,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/Настро_киРаботыСПочто_/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/НастройкиРаботыСПочтой/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[11]/mdoReference" }, @@ -813,7 +873,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/ПечатьЭлектронногоПисьма/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/ПечатьЭлектронногоПисьма/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[12]/mdoReference" }, @@ -849,7 +909,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/ПозвонитьПоКонтакту/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/ПозвонитьПоКонтакту/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[13]/mdoReference" }, @@ -878,7 +938,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/ПозвонитьПоПредмету/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/ПозвонитьПоПредмету/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[14]/mdoReference" }, @@ -914,7 +974,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Commands/СохранитьПисьмоНаДиск/Ext/CommandModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Commands/СохранитьПисьмоНаДиск/Ext/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[15]/mdoReference" }, @@ -960,7 +1020,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Forms/ФормаСписка/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Forms/ФормаСписка/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" }, @@ -3385,7 +3445,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Forms/ФормаСпискаПараметрическая/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Forms/ФормаСпискаПараметрическая/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" }, @@ -3937,7 +3997,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Forms/ПечатьЭлектронногоПисьма/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Forms/ПечатьЭлектронногоПисьма/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[3]/mdoReference" }, @@ -4299,7 +4359,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Forms/ПараметрыЭлектронногоПисьма/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Forms/ПараметрыЭлектронногоПисьма/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[4]/mdoReference" }, @@ -4712,7 +4772,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Forms/Настро_киРаботыСПочто_/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Forms/НастройкиРаботыСПочтой/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[5]/mdoReference" }, @@ -5538,7 +5598,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Forms/ВыборТипаПредмета/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Forms/ВыборТипаПредмета/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[6]/mdoReference" }, @@ -5674,13 +5734,13 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Ext/ManagerModule.bsl" ] ], "modules": [ { "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимоде_ствия/Ext/ManagerModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/DocumentJournals/Взаимодействия/Ext/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/owner" }, diff --git "a/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" index 88c7689d6..a0afe3b8e 100644 --- "a/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/DocumentJournals.\320\222\320\267\320\260\320\270\320\274\320\276\320\264\320\265\320\271\321\201\321\202\320\262\320\270\321\217_edt.json" @@ -29,7 +29,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX_WITH_ADDITIONAL_ORDER" + "indexing": "INDEX_WITH_ADDITIONAL_ORDER", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } }, { "uuid": "a2accf54-5966-42e8-ab2e-e56e415963ee", @@ -57,7 +61,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "d8eb5329-5900-4b5d-b45e-458513dddfef", @@ -85,7 +93,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX_WITH_ADDITIONAL_ORDER" + "indexing": "INDEX_WITH_ADDITIONAL_ORDER", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "6d521e58-24a3-4f19-b4b0-dff84f7ca86b", @@ -113,7 +125,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "8c413fa5-9e24-4b81-aa55-0e78c5e3e20f", @@ -141,7 +157,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "a4322f22-7de0-4018-8e06-9f1aa7cf0c07", @@ -169,7 +189,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "eaaed107-69d4-4963-be83-74519e331715", @@ -197,7 +221,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX_WITH_ADDITIONAL_ORDER" + "indexing": "INDEX_WITH_ADDITIONAL_ORDER", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "38cddf96-8703-4396-8c73-47fb22828a48", @@ -225,7 +253,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "2c2cb793-0177-4983-91ca-9c292c5b10f1", @@ -253,7 +285,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX_WITH_ADDITIONAL_ORDER" + "indexing": "INDEX_WITH_ADDITIONAL_ORDER", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "2a2e7f51-a4e5-48ec-b969-b1fca18ba9b5", @@ -281,7 +317,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX_WITH_ADDITIONAL_ORDER" + "indexing": "INDEX_WITH_ADDITIONAL_ORDER", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "221fa473-3327-44e6-a033-6fdfd2be713c", @@ -309,7 +349,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "7a5973f0-7e29-44af-8e7b-70af71f704a4", @@ -337,7 +381,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX" + "indexing": "INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "2b2bf0f7-0946-4492-bba0-27f007a70e64", @@ -365,7 +413,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "22c9a703-5ed3-4156-8fa6-476b1c1452f1", @@ -393,7 +445,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } }, { "uuid": "8be10d88-8c37-4444-9c89-6cbbe9913bda", @@ -421,7 +477,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "INDEX" + "indexing": "INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/type" + } } ], [] @@ -452,7 +512,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/Взаимоде_ствияПоКонтакту/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/ВзаимодействияПоКонтакту/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand/mdoReference" }, @@ -481,7 +541,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/Взаимоде_ствияПоПредмету/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/ВзаимодействияПоПредмету/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[2]/mdoReference" }, @@ -517,7 +577,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/ЗапланироватьВзаимоде_ствиеПоКонтакту/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/ЗапланироватьВзаимодействиеПоКонтакту/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[3]/mdoReference" }, @@ -546,7 +606,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/ЗапланироватьВзаимоде_ствиеПоПредмету/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/ЗапланироватьВзаимодействиеПоПредмету/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[4]/mdoReference" }, @@ -582,7 +642,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/ЗапланироватьВстречуПоКонтакту/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/ЗапланироватьВстречуПоКонтакту/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[5]/mdoReference" }, @@ -611,7 +671,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/ЗапланироватьВстречуПоПредмету/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/ЗапланироватьВстречуПоПредмету/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[6]/mdoReference" }, @@ -647,7 +707,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/НаписатьSMSПоКонтакту/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/НаписатьSMSПоКонтакту/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[7]/mdoReference" }, @@ -676,7 +736,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/НаписатьSMSПоПредмету/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/НаписатьSMSПоПредмету/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[8]/mdoReference" }, @@ -712,7 +772,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/НаписатьЭлектронноеПисьмоПоКонтакту/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/НаписатьЭлектронноеПисьмоПоКонтакту/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[9]/mdoReference" }, @@ -741,7 +801,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/НаписатьЭлектронноеПисьмоПоПредмету/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/НаписатьЭлектронноеПисьмоПоПредмету/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[10]/mdoReference" }, @@ -777,7 +837,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/Настро_киРаботыСПочто_/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/НастройкиРаботыСПочтой/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[11]/mdoReference" }, @@ -813,7 +873,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/ПечатьЭлектронногоПисьма/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/ПечатьЭлектронногоПисьма/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[12]/mdoReference" }, @@ -849,7 +909,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/ПозвонитьПоКонтакту/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/ПозвонитьПоКонтакту/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[13]/mdoReference" }, @@ -878,7 +938,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/ПозвонитьПоПредмету/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/ПозвонитьПоПредмету/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[14]/mdoReference" }, @@ -914,7 +974,7 @@ "modules": [ { "moduleType": "CommandModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Commands/СохранитьПисьмоНаДиск/CommandModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Commands/СохранитьПисьмоНаДиск/CommandModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/commands/c/com.github._1c_syntax.bsl.mdo.children.ObjectCommand[15]/mdoReference" }, @@ -960,7 +1020,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Forms/ФормаСписка/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Forms/ФормаСписка/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" }, @@ -3385,7 +3445,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Forms/ФормаСпискаПараметрическая/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Forms/ФормаСпискаПараметрическая/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[2]/mdoReference" }, @@ -3937,7 +3997,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Forms/ПечатьЭлектронногоПисьма/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Forms/ПечатьЭлектронногоПисьма/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[3]/mdoReference" }, @@ -4299,7 +4359,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Forms/ПараметрыЭлектронногоПисьма/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Forms/ПараметрыЭлектронногоПисьма/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[4]/mdoReference" }, @@ -4712,7 +4772,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Forms/Настро_киРаботыСПочто_/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Forms/НастройкиРаботыСПочтой/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[5]/mdoReference" }, @@ -5538,7 +5598,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/Forms/ВыборТипаПредмета/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/Forms/ВыборТипаПредмета/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[6]/mdoReference" }, @@ -5674,13 +5734,13 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/ManagerModule.bsl" ] ], "modules": [ { "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимоде_ствия/ManagerModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/DocumentJournals/Взаимодействия/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.DocumentJournal/columns/c/com.github._1c_syntax.bsl.mdo.children.DocumentJournalColumn/owner" }, diff --git "a/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" "b/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" index 8d78277c4..d81944907 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260.json" @@ -40,7 +40,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } }, { "uuid": "f6a29b80-e4c3-4c4f-8e2c-d4dda851d813", @@ -79,7 +83,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "2d8d5d74-2bc0-4282-af66-e4a37694c147", @@ -118,7 +126,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "cfd31341-287b-4684-9ac0-b28b4e066f15", @@ -157,7 +169,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "81de1b0b-7f2d-4098-ae99-061c6a90dc29", @@ -196,7 +212,11 @@ "mask": "", "multiLine": true, "extendedEdit": true, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "77c8a065-a8aa-4f39-93b6-c88f4c38ec66", @@ -235,7 +255,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "366fa6da-d3bf-4bb0-9a55-a307f9edee6a", @@ -274,7 +298,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "dd0610c8-cd87-4fe2-8a1f-70157132785b", @@ -313,7 +341,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] @@ -1703,7 +1735,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "5cec5e16-46ad-4f8c-b869-f5b1cc487884", @@ -1742,7 +1778,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "ca0363bb-81c2-4fce-b2f0-e8f42d118a74", @@ -1781,7 +1821,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "7aacdf81-49fd-47a3-a36a-c483f1b05872", @@ -1820,7 +1864,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } }, { "uuid": "857015e2-afb2-403d-bfb7-7acb5080797b", @@ -1859,7 +1907,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type" + } } ], [] diff --git "a/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" index 9e7628512..700cee6ad 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Documents.\320\220\320\275\320\272\320\265\321\202\320\260_edt.json" @@ -40,7 +40,17 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "DocumentRef.НазначениеОпросов", + "category": "REFERENCE", + "qualifier": {} + } + ] + } }, { "uuid": "f6a29b80-e4c3-4c4f-8e2c-d4dda851d813", @@ -79,7 +89,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "DefinedType.Респондент", + "category": "DEFINED", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "2d8d5d74-2bc0-4282-af66-e4a37694c147", @@ -118,7 +140,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "cfd31341-287b-4684-9ac0-b28b4e066f15", @@ -157,7 +191,30 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.ВопросыШаблонаАнкеты", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 10, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "81de1b0b-7f2d-4098-ae99-061c6a90dc29", @@ -196,7 +253,23 @@ "mask": "", "multiLine": true, "extendedEdit": true, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "77c8a065-a8aa-4f39-93b6-c88f4c38ec66", @@ -235,7 +308,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "DefinedType.Интервьюер", + "category": "DEFINED", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "366fa6da-d3bf-4bb0-9a55-a307f9edee6a", @@ -274,7 +359,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.ШаблоныАнкет", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "dd0610c8-cd87-4fe2-8a1f-70157132785b", @@ -313,7 +410,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "EnumRef.РежимыАнкетирования", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } } ], [] @@ -1547,19 +1656,19 @@ }, "mdoType": "DOCUMENT", "moduleTypes": [ - [ - "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ManagerModule.bsl" - ], [ "ObjectModule", "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ObjectModule.bsl" + ], + [ + "ManagerModule", + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ManagerModule.bsl" ] ], "modules": [ { - "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ManagerModule.bsl", + "moduleType": "ObjectModule", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ObjectModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, @@ -1567,8 +1676,8 @@ "isProtected": false }, { - "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ObjectModule.bsl", + "moduleType": "ManagerModule", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Documents/Анкета/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, @@ -1695,7 +1804,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.ВопросыШаблонаАнкеты", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "5cec5e16-46ad-4f8c-b869-f5b1cc487884", @@ -1734,7 +1855,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "ChartOfCharacteristicTypesRef.ВопросыДляАнкетирования", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "ca0363bb-81c2-4fce-b2f0-e8f42d118a74", @@ -1773,7 +1906,24 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } }, { "uuid": "7aacdf81-49fd-47a3-a36a-c483f1b05872", @@ -1812,7 +1962,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Characteristic.ВопросыДляАнкетирования", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Document/attributes/c/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "857015e2-afb2-403d-bfb7-7acb5080797b", @@ -1851,7 +2013,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } } ], [] diff --git "a/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" "b/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" index ae13dfd10..ab1e76ab1 100644 --- "a/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" +++ "b/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213.json" @@ -39,7 +39,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } } ], "commands": [], @@ -2001,8 +2005,8 @@ { "metadata": { "type": "CONSTANT", - "mdoRef": "Constant.ИспользоватьНесколькоПроизводственныхКалендарей", - "mdoRefRu": "Константа.ИспользоватьНесколькоПроизводственныхКалендарей" + "mdoRef": "Constant.ИспользоватьНесколькоПроизводственныхКалендаре_", + "mdoRefRu": "Константа.ИспользоватьНесколькоПроизводственныхКалендаре_" }, "autoRecord": "DENY" }, @@ -2855,17 +2859,17 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ManagerModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационнойБазы/Ext/ManagerModule.bsl" ], [ "ObjectModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ObjectModule.bsl" + "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационнойБазы/Ext/ObjectModule.bsl" ] ], "modules": [ { "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ManagerModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационнойБазы/Ext/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/attributes/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, @@ -2874,7 +2878,7 @@ }, { "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационно_Базы/Ext/ObjectModule.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/ExchangePlans/ОбновлениеИнформационнойБазы/Ext/ObjectModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/attributes/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, diff --git "a/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" "b/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" index e0b3735c3..48b86a4ba 100644 --- "a/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/ExchangePlans.\320\236\320\261\320\275\320\276\320\262\320\273\320\265\320\275\320\270\320\265\320\230\320\275\321\204\320\276\321\200\320\274\320\260\321\206\320\270\320\276\320\275\320\275\320\276\320\271\320\221\320\260\320\267\321\213_edt.json" @@ -39,7 +39,24 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } } ], "commands": [], @@ -2855,17 +2872,17 @@ "moduleTypes": [ [ "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ManagerModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационнойБазы/ManagerModule.bsl" ], [ "ObjectModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ObjectModule.bsl" + "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационнойБазы/ObjectModule.bsl" ] ], "modules": [ { "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ManagerModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационнойБазы/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/attributes/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, @@ -2874,7 +2891,7 @@ }, { "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационно_Базы/ObjectModule.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/ExchangePlans/ОбновлениеИнформационнойБазы/ObjectModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.ExchangePlan/attributes/com.github._1c_syntax.bsl.mdo.children.ObjectAttribute/owner" }, diff --git "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" index 6c9888789..5324de539 100644 --- "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" +++ "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270.json" @@ -36,7 +36,11 @@ "indexing": "DONT_INDEX", "master": true, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + } }, { "uuid": "fe6de86a-54c9-4ae2-9f17-cfce38b7b560", @@ -67,7 +71,11 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } } ], [] @@ -149,7 +157,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } }, { "uuid": "f779f4a1-1fab-46d4-8043-ac25c247d361", @@ -177,7 +189,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } }, { "uuid": "308358bc-773a-43fa-adff-dcc5884a2bd4", @@ -205,7 +221,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } }, { "uuid": "ed541a1c-a842-40a9-b357-612db71ec32c", @@ -233,7 +253,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } }, { "uuid": "b0e37495-7d9e-41d0-8225-652f9ac328cf", @@ -261,7 +285,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } }, { "uuid": "3bd2e1c8-9ef3-449b-acf6-397b90669c49", @@ -289,7 +317,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } }, { "uuid": "cb334191-2ff3-439e-bdaf-4b8fe6561c3b", @@ -317,7 +349,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } }, { "uuid": "f9865a2a-50e3-4f9c-a509-319be62dc468", @@ -345,7 +381,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } }, { "uuid": "5f3a30b0-1ba8-423c-9bc2-f9a87cafe818", @@ -373,7 +413,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } }, { "uuid": "766d8852-3bb4-4a6c-81c0-911722af4e8e", @@ -401,7 +445,11 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type" + } } ], [] diff --git "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" index 4db0713f9..a88983492 100644 --- "a/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/InformationRegisters.\320\255\320\273\320\265\320\272\321\202\321\200\320\276\320\275\320\275\321\213\320\265\320\237\320\276\320\264\320\277\320\270\321\201\320\270_edt.json" @@ -36,7 +36,17 @@ "indexing": "DONT_INDEX", "master": true, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "DefinedType.ПодписанныйОбъект", + "category": "DEFINED", + "qualifier": {} + } + ] + } }, { "uuid": "fe6de86a-54c9-4ae2-9f17-cfce38b7b560", @@ -67,7 +77,24 @@ "indexing": "DONT_INDEX", "master": false, "denyIncompleteValues": false, - "useInTotals": true + "useInTotals": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Number", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.NumberQualifier", + "precision": 10, + "fractionDigits": 0, + "allowedSign": "ANY" + } + } + } + ] + } } ], [] @@ -149,7 +176,19 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "f779f4a1-1fab-46d4-8043-ac25c247d361", @@ -177,7 +216,23 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 260, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "308358bc-773a-43fa-adff-dcc5884a2bd4", @@ -205,7 +260,23 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "ed541a1c-a842-40a9-b357-612db71ec32c", @@ -233,7 +304,23 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "b0e37495-7d9e-41d0-8225-652f9ac328cf", @@ -261,7 +348,23 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 28, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "3bd2e1c8-9ef3-449b-acf6-397b90669c49", @@ -289,7 +392,19 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "ValueStorage", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "cb334191-2ff3-439e-bdaf-4b8fe6561c3b", @@ -317,7 +432,19 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "f9865a2a-50e3-4f9c-a509-319be62dc468", @@ -345,7 +472,19 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "ValueStorage", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "5f3a30b0-1ba8-423c-9bc2-f9a87cafe818", @@ -373,7 +512,19 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "766d8852-3bb4-4a6c-81c0-911722af4e8e", @@ -401,7 +552,19 @@ }, "passwordMode": false, "kind": "CUSTOM", - "indexing": "DONT_INDEX" + "indexing": "DONT_INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.Пользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.InformationRegister/dimensions/c/com.github._1c_syntax.bsl.mdo.children.Dimension/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } } ], [] diff --git "a/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" "b/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" index 8e1df4187..8f4ce57ed 100644 --- "a/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" +++ "b/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262.json" @@ -27,7 +27,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/БыстрыеНастро_киОтчета/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/БыстрыеНастройкиОтчета/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" }, @@ -1568,7 +1568,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/ГруппаВыбранныхПоле_/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/ГруппаВыбранныхПолей/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[6]/mdoReference" }, @@ -1685,7 +1685,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/КонтекстнаяНастро_каОтчета/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/КонтекстнаяНастройкаОтчета/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[7]/mdoReference" }, @@ -3132,7 +3132,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/ОписаниеНово_ВозможностиПоВыводуОписани_/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/ОписаниеНовойВозможностиПоВыводуОписаний/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[8]/mdoReference" }, @@ -3509,7 +3509,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/РасширеннаяНастро_каФильтраОтчета/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/РасширеннаяНастройкаФильтраОтчета/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[10]/mdoReference" }, @@ -4911,7 +4911,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/СохранениеВариантаОтчетаВФа_л/Ext/Form/Module.bsl", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/SettingsStorages/ХранилищеВариантовОтчетов/Forms/СохранениеВариантаОтчетаВФайл/Ext/Form/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[12]/mdoReference" }, diff --git "a/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" "b/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" index 696cf4d57..33afe2d79 100644 --- "a/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/SettingsStorages.\320\245\321\200\320\260\320\275\320\270\320\273\320\270\321\211\320\265\320\222\320\260\321\200\320\270\320\260\320\275\321\202\320\276\320\262\320\236\321\202\321\207\320\265\321\202\320\276\320\262_edt.json" @@ -27,7 +27,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/БыстрыеНастро_киОтчета/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/БыстрыеНастройкиОтчета/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm/mdoReference" }, @@ -1568,7 +1568,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/ГруппаВыбранныхПоле_/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/ГруппаВыбранныхПолей/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[6]/mdoReference" }, @@ -1685,7 +1685,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/КонтекстнаяНастро_каОтчета/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/КонтекстнаяНастройкаОтчета/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[7]/mdoReference" }, @@ -3132,7 +3132,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/ОписаниеНово_ВозможностиПоВыводуОписани_/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/ОписаниеНовойВозможностиПоВыводуОписаний/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[8]/mdoReference" }, @@ -3509,7 +3509,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/РасширеннаяНастро_каФильтраОтчета/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/РасширеннаяНастройкаФильтраОтчета/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[10]/mdoReference" }, @@ -4911,7 +4911,7 @@ "modules": [ { "moduleType": "FormModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/СохранениеВариантаОтчетаВФа_л/Module.bsl", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/SettingsStorages/ХранилищеВариантовОтчетов/Forms/СохранениеВариантаОтчетаВФайл/Module.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.SettingsStorage/forms/c/com.github._1c_syntax.bsl.mdo.children.ObjectForm[12]/mdoReference" }, diff --git "a/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" "b/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" index 1c0fed5bb..4237df491 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217.json" @@ -30,6 +30,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [] + }, "format": { "content": [] }, @@ -84,6 +88,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + }, "format": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" }, @@ -136,6 +144,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + }, "format": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" }, @@ -188,6 +200,10 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + }, "format": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" }, @@ -255,7 +271,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "b1dc619d-8d91-4f7a-aa50-1d07ff9aebdc", @@ -294,7 +314,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": true + "fillFromFillingValue": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "370f0c75-d2c5-4be5-a633-4bcc77998ece", @@ -333,7 +357,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "f80b505f-b4ff-45fb-bd88-74b274ae9d2b", @@ -372,7 +400,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "2139532c-f6cb-4393-936e-cc912e5adca9", @@ -411,7 +443,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "755c3eca-4956-4a44-9b38-c11dae00b87f", @@ -450,7 +486,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "f57c558c-2c94-4b9d-8697-448d0548ab1a", @@ -489,7 +529,11 @@ "mask": "", "multiLine": true, "extendedEdit": true, - "fillFromFillingValue": true + "fillFromFillingValue": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "a310c09f-4d3a-4d3a-9ad5-7a5735a33a1d", @@ -528,7 +572,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "c32db021-eca1-4b67-aa85-3d6e28c51b53", @@ -560,7 +608,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "e9ed0ee4-3fbe-4093-9078-cb265ed6842c", @@ -599,7 +651,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "02466dcf-02a1-4853-814f-a913a9baba45", @@ -638,7 +694,11 @@ "mask": "", "multiLine": true, "extendedEdit": true, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "c4a40dc9-b619-4219-9d9a-e11f49a14fb1", @@ -677,7 +737,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "62b75eb2-42e1-4484-a77f-b676dd36f3d4", @@ -716,7 +780,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } }, { "uuid": "5e28e22a-dd6e-4703-92bd-13f5cb0dc023", @@ -755,7 +823,11 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type" + } } ], [] @@ -5336,19 +5408,19 @@ }, "mdoType": "TASK", "moduleTypes": [ - [ - "ManagerModule", - "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ManagerModule.bsl" - ], [ "ObjectModule", "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ObjectModule.bsl" + ], + [ + "ManagerModule", + "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ManagerModule.bsl" ] ], "modules": [ { - "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ManagerModule.bsl", + "moduleType": "ObjectModule", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ObjectModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/owner" }, @@ -5356,8 +5428,8 @@ "isProtected": false }, { - "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ObjectModule.bsl", + "moduleType": "ManagerModule", + "uri": "src/test/resources/ext/designer/ssl_3_1/src/cf/Tasks/ЗадачаИсполнителя/Ext/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/owner" }, diff --git "a/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" "b/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" index eeb09199f..0f02910ea 100644 --- "a/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" +++ "b/src/test/resources/fixtures/ssl_3_1/Tasks.\320\227\320\260\320\264\320\260\321\207\320\260\320\230\321\201\320\277\320\276\320\273\320\275\320\270\321\202\320\265\320\273\321\217_edt.json" @@ -30,6 +30,16 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Characteristic.ОбъектыАдресацииЗадач", + "category": "PRIMITIVE", + "qualifier": {} + } + ] + }, "format": { "content": [] }, @@ -84,6 +94,25 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.ВнешниеПользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "CatalogRef.Пользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + }, "format": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" }, @@ -136,6 +165,18 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Characteristic.ОбъектыАдресацииЗадач", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + }, "format": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" }, @@ -188,6 +229,18 @@ "passwordMode": false, "kind": "CUSTOM", "indexing": "INDEX", + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.РолиИсполнителей", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + }, "format": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/format" }, @@ -255,7 +308,26 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.ВнешниеПользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "CatalogRef.Пользователи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "b1dc619d-8d91-4f7a-aa50-1d07ff9aebdc", @@ -294,7 +366,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": true + "fillFromFillingValue": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "EnumRef.ВариантыВажностиЗадачи", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "370f0c75-d2c5-4be5-a633-4bcc77998ece", @@ -333,7 +417,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "CatalogRef.ГруппыИсполнителейЗадач", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "f80b505f-b4ff-45fb-bd88-74b274ae9d2b", @@ -372,7 +468,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "2139532c-f6cb-4393-936e-cc912e5adca9", @@ -411,7 +519,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "755c3eca-4956-4a44-9b38-c11dae00b87f", @@ -450,7 +570,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "f57c558c-2c94-4b9d-8697-448d0548ab1a", @@ -489,7 +621,23 @@ "mask": "", "multiLine": true, "extendedEdit": true, - "fillFromFillingValue": true + "fillFromFillingValue": true, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "a310c09f-4d3a-4d3a-9ad5-7a5735a33a1d", @@ -528,7 +676,40 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "DocumentRef", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "TaskRef", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "ChartOfCharacteristicTypesRef", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + }, + { + "typeName": "CatalogRef", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "c32db021-eca1-4b67-aa85-3d6e28c51b53", @@ -560,7 +741,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 500, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "e9ed0ee4-3fbe-4093-9078-cb265ed6842c", @@ -599,7 +796,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Boolean", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "02466dcf-02a1-4853-814f-a913a9baba45", @@ -638,7 +847,23 @@ "mask": "", "multiLine": true, "extendedEdit": true, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 0, + "allowedLength": "VARIABLE" + } + } + } + ] + } }, { "uuid": "c4a40dc9-b619-4219-9d9a-e11f49a14fb1", @@ -677,7 +902,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "EnumRef.СостоянияБизнесПроцессов", + "category": "REFERENCE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "62b75eb2-42e1-4484-a77f-b676dd36f3d4", @@ -716,7 +953,19 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "Date", + "category": "PRIMITIVE", + "qualifier": { + "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/type/typeDescriptions/com.github._1c_syntax.bsl.mdo.support.TypeDescription/qualifier" + } + } + ] + } }, { "uuid": "5e28e22a-dd6e-4703-92bd-13f5cb0dc023", @@ -755,7 +1004,23 @@ "mask": "", "multiLine": false, "extendedEdit": false, - "fillFromFillingValue": false + "fillFromFillingValue": false, + "type": { + "@class": "com.github._1c_syntax.bsl.mdo.support.AttributeTypeImpl", + "typeDescriptions": [ + { + "typeName": "String", + "category": "PRIMITIVE", + "qualifier": { + "value": { + "@class": "com.github._1c_syntax.bsl.mdo.support.StringQualifier", + "length": 150, + "allowedLength": "VARIABLE" + } + } + } + ] + } } ], [] @@ -5319,19 +5584,19 @@ }, "mdoType": "TASK", "moduleTypes": [ - [ - "ManagerModule", - "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ManagerModule.bsl" - ], [ "ObjectModule", "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ObjectModule.bsl" + ], + [ + "ManagerModule", + "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ManagerModule.bsl" ] ], "modules": [ { - "moduleType": "ManagerModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ManagerModule.bsl", + "moduleType": "ObjectModule", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ObjectModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/owner" }, @@ -5339,8 +5604,8 @@ "isProtected": false }, { - "moduleType": "ObjectModule", - "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ObjectModule.bsl", + "moduleType": "ManagerModule", + "uri": "src/test/resources/ext/edt/ssl_3_1/configuration/src/Tasks/ЗадачаИсполнителя/ManagerModule.bsl", "owner": { "@reference": "/com.github._1c_syntax.bsl.mdo.Task/addressingAttributes/c/com.github._1c_syntax.bsl.mdo.children.TaskAddressingAttribute/owner" },