Skip to content

Исправление пропущенного мержа ПлановОбмена в MDMerger #580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theshadowco merged 3 commits into from
Feb 12, 2026
Merged

Исправление пропущенного мержа ПлановОбмена в MDMerger #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaa9bf8
Initial plan
Copilot Feb 11, 2026
9d84fb1
Merge branch 'develop' into copilot/fix-missing-metadata-query
nixel2007 Feb 11, 2026
fd945de
fix: add missing ExchangePlans merge in MDMerger
nixel2007 Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/com/github/_1c_syntax/bsl/reader/MDMerger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ public static Configuration merge(Configuration cf, ConfigurationExtension exten
.clearWebSocketClients().webSocketClients(mergeMD(cf, extension, CF::getWebSocketClients, newChildren))
.clearHttpServices().httpServices(mergeMD(cf, extension, CF::getHttpServices, newChildren))
.clearIntegrationServices().integrationServices(mergeMD(cf, extension, CF::getIntegrationServices, newChildren))
.clearExchangePlans().exchangePlans(mergeMD(cf, extension, CF::getExchangePlans, newChildren))
.clearConstants().constants(mergeMD(cf, extension, CF::getConstants, newChildren))
.clearCatalogs().catalogs(mergeMD(cf, extension, CF::getCatalogs, newChildren))
.clearDocuments().documents(mergeMD(cf, extension, CF::getDocuments, newChildren))
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/com/github/_1c_syntax/bsl/mdclasses/MDClassesSolutionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,19 @@ void createSolutionCf_2_exts() {
var cf = (Configuration) solution;
assertThat(cf.getSupportVariant()).isEqualTo(SupportVariant.NONE);
assertThat(cf.getModules()).hasSize(3);
assertThat(cf.getChildren()).hasSize(10);
assertThat(cf.getChildren()).hasSize(12);

assertThat(cf.getAllModules()).hasSize(7);

assertThat(cf.getRoles()).hasSize(2);
assertThat(cf.getLanguages()).hasSize(1);
assertThat(cf.getExchangePlans()).hasSize(2);
assertThat(cf.getConstants()).hasSize(1);
assertThat(cf.getCatalogs()).hasSize(3);
assertThat(cf.getDocuments()).hasSize(1);
assertThat(cf.getEnums()).hasSize(1);
assertThat(cf.getDataProcessors()).hasSize(1);
assertThat(cf.getPlainChildren().stream().map(MD::getMdoRef).sorted()).hasSize(53);
assertThat(cf.getPlainChildren().stream().map(MD::getMdoRef).sorted()).hasSize(71);

assertThat(cf.getModulesByType()).hasSize(7)
.containsValue(ModuleType.FormModule)
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/solutions/sol1/Конфигурация/src/Configuration/Configuration.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
</synonym>
<languageCode>ru</languageCode>
</languages>
<exchangePlans>ExchangePlan.ПланОбмена1</exchangePlans>
<catalogs>Catalog.Справочник1</catalogs>
<catalogs>Catalog.Справочник2</catalogs>
<documents>Document.Документ1</documents>
Expand Down
23 changes: 23 additions & 0 deletions src/test/resources/solutions/sol1/Конфигурация/src/ExchangePlans/ПланОбмена1/ПланОбмена1.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<mdclass:ExchangePlan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:core="http://g5.1c.ru/v8/dt/mcore" xmlns:mdclass="http://g5.1c.ru/v8/dt/metadata/mdclass" uuid="a1b2c3d4-e5f6-7890-abcd-ef1234567890" thisNode="11111111-2222-3333-4444-555555555555">
<producedTypes>
<objectType typeId="aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee" valueTypeId="11111111-bbbb-cccc-dddd-eeeeeeeeeeee"/>
<refType typeId="22222222-bbbb-cccc-dddd-eeeeeeeeeeee" valueTypeId="33333333-bbbb-cccc-dddd-eeeeeeeeeeee"/>
<selectionType typeId="44444444-bbbb-cccc-dddd-eeeeeeeeeeee" valueTypeId="55555555-bbbb-cccc-dddd-eeeeeeeeeeee"/>
<listType typeId="66666666-bbbb-cccc-dddd-eeeeeeeeeeee" valueTypeId="77777777-bbbb-cccc-dddd-eeeeeeeeeeee"/>
<managerType typeId="88888888-bbbb-cccc-dddd-eeeeeeeeeeee" valueTypeId="99999999-bbbb-cccc-dddd-eeeeeeeeeeee"/>
</producedTypes>
<name>ПланОбмена1</name>
<useStandardCommands>true</useStandardCommands>
<inputByString>ExchangePlan.ПланОбмена1.StandardAttribute.Description</inputByString>
<inputByString>ExchangePlan.ПланОбмена1.StandardAttribute.Code</inputByString>
<fullTextSearchOnInputByString>DontUse</fullTextSearchOnInputByString>
<createOnInput>DontUse</createOnInput>
<dataLockControlMode>Managed</dataLockControlMode>
<fullTextSearch>Use</fullTextSearch>
<codeLength>9</codeLength>
<codeAllowedLength>Variable</codeAllowedLength>
<descriptionLength>25</descriptionLength>
<editType>InDialog</editType>
<choiceMode>BothWays</choiceMode>
</mdclass:ExchangePlan>
1 change: 1 addition & 0 deletions src/test/resources/solutions/sol1/Расширение1/src/Configuration/Configuration.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<languageCode>ru</languageCode>
</languages>
<roles>Role.Расш1_ОсновнаяРоль</roles>
<exchangePlans>ExchangePlan.Расш1_ПланОбмена2</exchangePlans>
<constants>Constant.Расш1_Константа1</constants>
<catalogs>Catalog.Расш1_Справочник3</catalogs>
<documents>Document.Документ1</documents>
Expand Down
23 changes: 23 additions & 0 deletions ...rces/solutions/sol1/Расширение1/src/ExchangePlans/Расш1_ПланОбмена2/Расш1_ПланОбмена2.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<mdclass:ExchangePlan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:core="http://g5.1c.ru/v8/dt/mcore" xmlns:mdclass="http://g5.1c.ru/v8/dt/metadata/mdclass" uuid="b2c3d4e5-f6a7-8901-bcde-f12345678901" thisNode="22222222-3333-4444-5555-666666666666">
<producedTypes>
<objectType typeId="aabbccdd-1111-2222-3333-444444444444" valueTypeId="aabbccdd-5555-6666-7777-888888888888"/>
<refType typeId="aabbccdd-9999-aaaa-bbbb-cccccccccccc" valueTypeId="aabbccdd-dddd-eeee-ffff-000000000000"/>
<selectionType typeId="11223344-1111-2222-3333-444444444444" valueTypeId="11223344-5555-6666-7777-888888888888"/>
<listType typeId="11223344-9999-aaaa-bbbb-cccccccccccc" valueTypeId="11223344-dddd-eeee-ffff-000000000000"/>
<managerType typeId="55667788-1111-2222-3333-444444444444" valueTypeId="55667788-5555-6666-7777-888888888888"/>
</producedTypes>
<name>Расш1_ПланОбмена2</name>
<useStandardCommands>true</useStandardCommands>
<inputByString>ExchangePlan.Расш1_ПланОбмена2.StandardAttribute.Description</inputByString>
<inputByString>ExchangePlan.Расш1_ПланОбмена2.StandardAttribute.Code</inputByString>
<fullTextSearchOnInputByString>DontUse</fullTextSearchOnInputByString>
<createOnInput>DontUse</createOnInput>
<dataLockControlMode>Managed</dataLockControlMode>
<fullTextSearch>Use</fullTextSearch>
<codeLength>9</codeLength>
<codeAllowedLength>Variable</codeAllowedLength>
<descriptionLength>25</descriptionLength>
<editType>InDialog</editType>
<choiceMode>BothWays</choiceMode>
</mdclass:ExchangePlan>
Loading