From 126df85d4dd362793555a1206fd31170d12fc9fb Mon Sep 17 00:00:00 2001 From: Almaz Nasibullin <2514001+AlmazNasibullin@users.noreply.github.com> Date: Fri, 4 Jul 2025 17:00:31 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BD=D0=B0=20EDT=202025.1=20(#1491)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Поднятие версий com._1c.g5.v8.dt.form * Перевод таргета на 2024.2 * Подъем версий в dt.bsl.comment * G5V8DT-25485 * Поднятие версий com.e1c.g5.v8.dt.cli.api (#1468) * Исправление ошибок в сообщениях * Поднятие версий com._1c.g5.v8.dt.ui.util * Исправление ошибок в сообщениях * Fix build.yml * G5V8DT-25849 Нет переноса строки при создании новой области в модуле * Revert "G5V8DT-25849 Нет переноса строки при создании новой области в модуле" This reverts commit af7a6669551e4ded71332eada7a125e37888548b. * G5V8DT-25849 Нет переноса строки при создании новой области в модуле * G5V8DT-24042 Починить все тесты, падающие в публичных плагинах (#1467) * G5V8DT-24042 Починить все тесты, падающие в публичных плагинах * G5V8DT-24042 fix build-ci * G5V8DT-24042 Починить все тесты, падающие в публичных плагинах * G5V8DT-24042 Починить все тесты, падающие в публичных плагинах * G5V8DT-24042 Починить все тесты, падающие в публичных плагинах * G5V8DT-24042: Запуск билда без ожидания всего WS Для защиты от блокировки нескольких проектов во время ожидания --------- Co-authored-by: Alexander Tretyakevich * Исправлена версия зависимостей на theming.ui.util * G5V8DT-24085 DcsOutputParameters содержит несуществующие поля Versioning * G5V8DT-26116 При добавлении модулей излишне добавляется область * Update build.yml Removed wrong goal from maven build * Update build.yml Removed verbose output * G5V8DT-25913 Поддержка протокола WebSocket * G5V8DT-25625 Повышение гибкости настройки индексов (#1478) Поднятие версий * Fix default.target to 2025.1 * G5V8DT-26113 Общий макет в качестве Основного макета оформления отчета #1574 Поднятие версий * Исправление target-а - явное добавление dt.feature * G5V8DT-22280 Синхронизация версий с com._1c.g5.v8.dt.ui.wizards * G5V8DT-26092 Поддержка платформы 8.5.1 * G5V8DT-25396 Поддержка тегов в панели док коммента (#1483) * G5V8DT-25396 Добавить поддержку тегов документирующего комментария * G5V8DT-25396 Добавить картинки и тест для тегов --------- Co-authored-by: Nikolay Babin * edt-2025-1: Поднятие версии QFix * NPE "deleteInvocation" is null * G5V8DT-26943 Исключить срабатывание проверки на секции Пример (#1493) * Добавить сценарий в тестовый кейс * Количество маркеров и их положение не изменяется Co-authored-by: Nikolay Babin * G5V8DT-26157 Глифы векторных картинок в новом интерфейсе Поднятие версий * G5V8DT-26157 Глифы векторных картинок в новом интерфейсе Поднятие версий * G5V8DT-26429 - Автозаполнение синонимов (псевдонимов полей) в конструкторе запросов Подъём версий --------- Co-authored-by: Vadim Geraskin Co-authored-by: Alexander Tretyakevich Co-authored-by: Almaz Nasibullin Co-authored-by: Maxim Dzyuba Co-authored-by: MaksimDzyuba <77277424+MaksimDzyuba@users.noreply.github.com> Co-authored-by: Dmitry Savenko Co-authored-by: Nikita Kuznetsov Co-authored-by: Alexander Tretyakevich Co-authored-by: nikolay-martynov Co-authored-by: ukolabrother <71124350+ukolabrother@users.noreply.github.com> Co-authored-by: Nikolay Babin Co-authored-by: Dmitry Belov <109139509+DmitryBelov-e1c@users.noreply.github.com> --- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 8 ++-- .../icons/obj16/atsign.png | Bin 0 -> 512 bytes .../icons/obj16/atsign@2x.png | Bin 0 -> 939 bytes .../icons/obj16/atsign_dark.png | Bin 0 -> 481 bytes .../icons/obj16/atsign_dark@2x.png | Bin 0 -> 908 bytes .../internal/bsl/ui/SharedImages.java | 2 + .../views/BslDocCommentSelectionListener.java | 9 +++++ .../bsl/ui/views/BslDocCommentView.java | 9 +++++ .../internal/bsl/ui/views/Messages.java | 1 + .../internal/bsl/ui/views/messages.properties | 2 + .../bsl/ui/views/messages_ru.properties | 2 + .../META-INF/MANIFEST.MF | 4 +- .../MissingTemporaryFileDeletionCheck.java | 35 +++++++++++++----- .../MultilineDescriptionEndsOnDotCheck.java | 8 +++- ...edValueAddingToUntypedCollectionCheck.java | 22 ++++++++--- .../META-INF/MANIFEST.MF | 6 +-- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 +-- .../META-INF/MANIFEST.MF | 2 +- targets/default/default.target | 5 ++- .../doc-comment-description-ends-on-dot.bsl | 10 +++++ .../META-INF/MANIFEST.MF | 2 +- .../resources/doc-comment-view.bsl | 8 ++-- .../bsl/ui/itests/BslDocCommentViewTest.java | 30 +++++++++++---- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- 30 files changed, 138 insertions(+), 51 deletions(-) create mode 100644 bundles/com.e1c.v8codestyle.bsl.ui/icons/obj16/atsign.png create mode 100644 bundles/com.e1c.v8codestyle.bsl.ui/icons/obj16/atsign@2x.png create mode 100644 bundles/com.e1c.v8codestyle.bsl.ui/icons/obj16/atsign_dark.png create mode 100644 bundles/com.e1c.v8codestyle.bsl.ui/icons/obj16/atsign_dark@2x.png diff --git a/bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF index fb2af3d9..0d9ffb19 100644 --- a/bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Import-Package: com._1c.g5.v8.dt.common;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.lifecycle;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.md.sort;version="[1.0.0,2.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[11.0.0,12.0.0)", com._1c.g5.wiring;version="[2.2.0,3.0.0)", com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)", com.e1c.v8codestyle.autosort;version="[0.7.0,0.8.0)", diff --git a/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF index 6fb8ee9b..7a9a2f6d 100644 --- a/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF @@ -23,11 +23,11 @@ Import-Package: com._1c.g5.v8.activitytracking.core;version="[1.0.0,2.0.0)", com._1c.g5.v8.bm.integration.event;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.core.lifecycle;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.core.model;version="[6.0.0,7.0.0)", - com._1c.g5.v8.dt.core.operations;version="[4.0.0,5.0.0)", + com._1c.g5.v8.dt.core.operations;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.lifecycle;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.md.sort;version="[1.0.0,2.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[11.0.0,12.0.0)", com.e1c.g5.v8.dt.cli.api;version="[3.0.0,4.0.0)", com.e1c.g5.v8.dt.cli.api.components;version="[3.0.0,4.0.0)", com.e1c.v8codestyle;version="[0.7.0,0.8.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF index f9a14fa4..1cc6f6cc 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF @@ -42,14 +42,14 @@ Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[6.0.0,7.0 com._1c.g5.v8.dt.lcore.nodemodel.util;version="[1.0.0,2.0.0)", com._1c.g5.v8.dt.lcore.ui.texteditor;version="[1.1.0,2.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.theming.ui.util;version="[2.0.0,3.0.0)", - com._1c.g5.v8.dt.ui.util;version="[8.0.0,9.0.0)", - com._1c.g5.v8.dt.ui.wizards;version="[8.0.0,9.0.0)", + com._1c.g5.v8.dt.ui.util;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.ui.wizards;version="[9.0.0,10.0.0)", com._1c.g5.wiring;version="[2.2.0,3.0.0)", com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)", com.e1c.g5.v8.dt.bsl.check.qfix;version="[3.0.0,4.0.0)", - com.e1c.g5.v8.dt.check.qfix;version="[3.0.0,4.0.0)", + com.e1c.g5.v8.dt.check.qfix;version="[4.0.0,5.0.0)", com.e1c.g5.v8.dt.check.qfix.components;version="[1.0.0,2.0.0)", com.e1c.g5.v8.dt.check.settings;version="[4.0.0,5.0.0)", com.e1c.v8codestyle.bsl;version="[0.7.0,0.8.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/icons/obj16/atsign.png b/bundles/com.e1c.v8codestyle.bsl.ui/icons/obj16/atsign.png new file mode 100644 index 0000000000000000000000000000000000000000..7154f55179184a6b7c20f8e242f2ed1a4a231358 GIT binary patch literal 512 zcmV+b0{{JqP)0l#3;ufgDPytE>F%=LhAasyi!B(6K@R5tXv0q5f0(5IF8G*jCEaK1wjz0`G&gbcDr7!R@(~T zyFAaYP@rR-0N@qAM9z|${Gfu1DLloct(~!6ujj*Gjz$;^1~$5E;hiXoIGy$T{V_V; zio6B=Ncsd|7{=pzyyiABsvZFO!cQ1@WE$5K}Tj*Mt)XAJsK_qYN;M^4mb z1MEE#Ru-71>8SuTKbkxoYQ>B`tx(yQdjdhyN{C1R98T1!`!jOK6$8vjXj4J$0E90y z5)D(_J2>kgo*}-G#T5fGJfb1K?Hu7q5%fxF_Z%4LF30@is=3T*0000`u z+dvQ(IRWAXAt%5-0rrlfpioYLd;{Ge$}UxWocHV= zGaip58{$>ys&PxBneNwbdV0o6{qIs)W$?klK?wB)Ev!^3{&+n0jn4^MivGA(s|~NO zuhV60E(PH5@UR1CZ8}!VOI)p1dp9>Xef3rV$H&M1)6>(X;Wz^j8jPQxpOZL_Q+9@7 z=t22#7=Qt?bAosFDU9!JY;2t8F_H`5=;)~R^72CG9*l5uba!`G7>yPJ0+NOZrUIg00`|5YD(ex?d@%(-YH1l9#or5 zJU%`)&0y;GV65%En$rFQlt(Uuq!{bk;x2&EU(h1}jdT1fGKlCK7#Bcy(KWL>$ADz} zCD$B4nl|lp3#8btkIIFHE^ zcLf2H4K5v=M;ycTH|GmOYz(5K`|Bn`8lf>)w!=7+(ie7i^%gYd_n_LUK#<;>A z=)M^P=xoX3(4NSpfeP}RON1PgsA2$viBo`B008P5q6hXwse+Wq<=k*kRwpvC=Pv+& z1pEQjt|&tOAo`&y5FKHjxN3^p+!h#oBfkOPM(8;*&6(Pi7LoA-@%1VK*bBbP2*07jyB z?a9W3?*9IMyUc;>o0Ry;@oeVGtQ6;!N-cYPdtL0`@7jnypjd1=rb4VUof@ zWZrtz^jzra63#KKb{NC^<8LyNcUo2)QEC@s+S>XF#4WVXJ3Bi*-_tbx zqt+zOE1A%IUv{5c8vq-GbVbOE{=WuNcr7;)&fMPvB-ns;1Gk^q`M|N8o0|c)8Ix~p z--zA>pae*fWB~AKnSm?)H8Zx?i7d^m_A^&dbQ0(h_WJ62{DmL zHoLPsGw;3GG3K9UPcQO3kG9+GV7J>PxUst~thELAS*z8W`0>F>a+jc-WhwAjtJSWW z&8Efg<9`N0FkCK|LxKFFvREtz^Z9(mW5b*=Vp3v1jwDQ{(?-2s&q2J!N>{MQcCRz& zZ`$|tRe;!cVzWvDPKw6SJ{g)XY+Y8y8jCvb2UH3^Z#EkNn6PR@5ZrLlcN9BlPC&c% zXqSG0FboUgW50=UyWK9_x#N(HpWyp2U9&}gfg=MgGG}Zyn+d%*6d<7#b@x7ze*ZV1 z+w}_|`H8;0R=G}NsvX^_=T}X1Y;-PJq8`(uF_L?S0vZfZRy^G8dm)-6C#)~fGU*me zeqinO>&N)pM1$n?{n_kk5fC*46V1K4FJ$#Y-^N&v&K8ilsq8r2ViT#!P%kL(U@mRn XUa`ywvxX#g00000NkvXXu0mjfhVjq{ literal 0 HcmV?d00001 diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/icons/obj16/atsign_dark@2x.png b/bundles/com.e1c.v8codestyle.bsl.ui/icons/obj16/atsign_dark@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..21e0350b6f3161e2080b0e1c4e055e678503e2d8 GIT binary patch literal 908 zcmV;719SX|P)@o+zQOZY7v#{mN##_nR*AWW{WQpJmm7yj{qPG#R;XO3bEBRY-GBdaK1>}hY>Aat|I^_ z!+BXW$cD*<29j82pmy8_g;JI&&gn$}NK|Mh54td}+8%?X2GdMaVA`V=PiwlK)k-?I z;<#3+?6vE~KO)O5(5*z2mV9-%$I_)4d<=>7Pcnp@m$8F>##FJSoP za@i9%rbr(^!aZ?Gy36IVuQZRFknu?-vo`HLcQXJwh>+2;DDH#54J7qh&Iza1_Xyuc z2-O;icD^5|gQAB}C#2*%>Mx>C0Z0LoL;(``+a-)w{WX*2g(a1sBlrpr4?^N1Ts}Qe isqFAT@x_0-fc^l6`r13#Wbn@b0000 offset) + { + return section; + } + } else if (object instanceof FieldDefinition) { FieldDefinition section = (FieldDefinition)object; diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/BslDocCommentView.java b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/BslDocCommentView.java index dbedc2ef..c10e683a 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/BslDocCommentView.java +++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/BslDocCommentView.java @@ -43,6 +43,7 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment.Return import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment.Section; import com._1c.g5.v8.dt.bsl.documentation.comment.BslMultiLineCommentDocumentationProvider; import com._1c.g5.v8.dt.bsl.documentation.comment.LinkPart; +import com._1c.g5.v8.dt.bsl.documentation.comment.TagPart; import com._1c.g5.v8.dt.bsl.documentation.comment.TextPart; import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection; import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection.FieldDefinition; @@ -181,6 +182,10 @@ public class BslDocCommentView { return MessageFormat.format(Messages.BslDocCommentView_Link, ((LinkPart)obj).getLinkText()); } + else if (obj instanceof TagPart tagPart) + { + return MessageFormat.format(Messages.BslDocCommentView_Tag, tagPart.getContent()); + } else if (obj instanceof ParametersSection) { return Messages.BslDocCommentView_Parameters; @@ -225,6 +230,10 @@ public class BslDocCommentView { return UiPlugin.getDefault().getImage(SharedImages.IMG_OBJ16_TEXT); } + else if (obj instanceof TagPart) + { + return UiPlugin.getDefault().getImage(SharedImages.IMG_OBJ16_TAG); + } else if (obj instanceof FieldDefinition) { return UiPlugin.getDefault().getImage(SharedImages.IMG_OBJ16_FIELD); diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/Messages.java b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/Messages.java index 23603966..b1d884bc 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/Messages.java +++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/Messages.java @@ -32,6 +32,7 @@ final class Messages public static String BslDocCommentView_Text; public static String BslDocCommentView_Type; public static String BslDocCommentView_Types; + public static String BslDocCommentView_Tag; static { // initialize resource bundle diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/messages.properties b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/messages.properties index 6d74947d..3f5188de 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/messages.properties +++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/messages.properties @@ -31,3 +31,5 @@ BslDocCommentView_Text = Text: {0} BslDocCommentView_Type = Type: {0} BslDocCommentView_Types = Types: + +BslDocCommentView_Tag = Tag: {0} diff --git a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/messages_ru.properties b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/messages_ru.properties index cf121ed5..c229627b 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/messages_ru.properties +++ b/bundles/com.e1c.v8codestyle.bsl.ui/src/com/e1c/v8codestyle/internal/bsl/ui/views/messages_ru.properties @@ -32,3 +32,5 @@ BslDocCommentView_Text = Текст: {0} BslDocCommentView_Type = Тип: {0} BslDocCommentView_Types = Типы: + +BslDocCommentView_Tag = Тег: {0} diff --git a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF index 8910cc30..ee3388a5 100644 --- a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF @@ -40,7 +40,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.lcore.util;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.mcore.util;version="[3.6.0,4.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.platform;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.platform.version;version="[2.13.0,3.0.0)", com._1c.g5.wiring;version="[2.0.0,3.0.0)", @@ -51,7 +51,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com.e1c.g5.v8.dt.bsl.check.qfix;version="[3.0.0,4.0.0)", com.e1c.g5.v8.dt.check;version="[2.0.0,3.0.0)", com.e1c.g5.v8.dt.check.components;version="[2.0.0,3.0.0)", - com.e1c.g5.v8.dt.check.qfix;version="[3.0.0,4.0.0)", + com.e1c.g5.v8.dt.check.qfix;version="[4.0.0,5.0.0)", com.e1c.g5.v8.dt.check.qfix.components;version="[1.0.0,2.0.0)", com.e1c.g5.v8.dt.check.settings;version="[4.0.0,5.0.0)", com.e1c.v8codestyle;version="[0.7.0,0.8.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/MissingTemporaryFileDeletionCheck.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/MissingTemporaryFileDeletionCheck.java index 65ecb9a0..db8cbcc1 100644 --- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/MissingTemporaryFileDeletionCheck.java +++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/MissingTemporaryFileDeletionCheck.java @@ -97,9 +97,8 @@ public class MissingTemporaryFileDeletionCheck return; } Expression tempFile = statement.getLeft(); - String tempFileName = getFullFeatureAccessName(tempFile); - - if (!monitor.isCanceled() && tempFileName != null && checkFileCloses(sfa, parameters, tempFileName)) + String tempFileName = getFullFeatureAccessName(tempFile, monitor); + if (tempFileName == null || checkFileCloses(sfa, parameters, tempFileName, monitor)) { return; } @@ -108,7 +107,8 @@ public class MissingTemporaryFileDeletionCheck } } - private boolean checkFileCloses(StaticFeatureAccess sfa, ICheckParameters parameters, String tempFileName) + private boolean checkFileCloses(StaticFeatureAccess sfa, ICheckParameters parameters, String tempFileName, + IProgressMonitor monitor) { List deleteFileMethods = getDeleteFileMethods(parameters); @@ -118,12 +118,16 @@ public class MissingTemporaryFileDeletionCheck boolean isTempFileOpened = false; for (FeatureAccess blockFa : EcoreUtil2.eAllOfType(block, FeatureAccess.class)) { - String featureName = getFullFeatureAccessName(blockFa); + if (monitor.isCanceled()) + { + return false; + } + String featureName = getFullFeatureAccessName(blockFa, monitor); if (featureName != null && (isTempFileMethod(featureName) || isTempFileOpened)) { isTempFileOpened = true; - if (deleteFileMethods.contains(featureName) && checkParameterInList(blockFa, tempFileName)) + if (deleteFileMethods.contains(featureName) && checkParameterInList(blockFa, tempFileName, monitor)) { return true; } @@ -146,28 +150,40 @@ public class MissingTemporaryFileDeletionCheck return METHOD_NAME.equalsIgnoreCase(methodName) || METHOD_NAME_RU.equalsIgnoreCase(methodName); } - private boolean checkParameterInList(FeatureAccess featureAccess, String parameterName) + private boolean checkParameterInList(FeatureAccess featureAccess, String parameterName, IProgressMonitor monitor) { Invocation deleteInvocation = BslUtil.getInvocation(featureAccess); + if (deleteInvocation == null) + { + return false; + } List deleteParameters = deleteInvocation.getParams(); for (Expression parameter : deleteParameters) { + if (monitor.isCanceled()) + { + return false; + } if (parameter instanceof FeatureAccess) { - String faParameterName = getFullFeatureAccessName(parameter); + String faParameterName = getFullFeatureAccessName(parameter, monitor); return faParameterName != null && faParameterName.equals(parameterName); } } return false; } - private String getFullFeatureAccessName(Expression tempFile) + private String getFullFeatureAccessName(Expression tempFile, IProgressMonitor monitor) { StringBuilder builder = new StringBuilder(); Expression expression = tempFile; while (expression instanceof DynamicFeatureAccess) { + if (monitor.isCanceled()) + { + return null; + } DynamicFeatureAccess dynamicFeatureAccess = (DynamicFeatureAccess)expression; builder.insert(0, dynamicFeatureAccess.getName()); builder.insert(0, DOT); @@ -182,5 +198,4 @@ public class MissingTemporaryFileDeletionCheck return null; } - } diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/comment/check/MultilineDescriptionEndsOnDotCheck.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/comment/check/MultilineDescriptionEndsOnDotCheck.java index 7473a46f..ed8b223a 100644 --- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/comment/check/MultilineDescriptionEndsOnDotCheck.java +++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/comment/check/MultilineDescriptionEndsOnDotCheck.java @@ -100,7 +100,7 @@ public class MultilineDescriptionEndsOnDotCheck .orElse(null); //@formatter:on - if (lastPart == null || startLine == lastPart.getLineNumber()) + if (lastPart == null || startLine == lastPart.getLineNumber() || isParentExampleSection(root, lastPart)) { return; } @@ -120,4 +120,10 @@ public class MultilineDescriptionEndsOnDotCheck lastPart.getLineNumber(), lastPart.getOffset(), lastPart.getText().length()); } + + private boolean isParentExampleSection(BslDocumentationComment root, TextPart lastPart) + { + return root.getExampleSection() != null + && root.getExampleSection().getDescription().getParts().contains(lastPart); + } } diff --git a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/TypedValueAddingToUntypedCollectionCheck.java b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/TypedValueAddingToUntypedCollectionCheck.java index 88e31767..5bb0809e 100644 --- a/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/TypedValueAddingToUntypedCollectionCheck.java +++ b/bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/strict/check/TypedValueAddingToUntypedCollectionCheck.java @@ -136,7 +136,7 @@ public class TypedValueAddingToUntypedCollectionCheck return; } - Collection actualTypes = getActualCollectionTypes(fa, expectedCollectionTypes); + Collection actualTypes = getActualCollectionTypes(fa, expectedCollectionTypes, monitor); if (!actualTypes.isEmpty() && isActualCollectionItemTypeEmpty(actualTypes)) { @@ -155,7 +155,7 @@ public class TypedValueAddingToUntypedCollectionCheck Invocation inv = BslUtil.getInvocation(fa); - if (!(inv.getMethodAccess() instanceof DynamicFeatureAccess)) + if (inv == null || !(inv.getMethodAccess() instanceof DynamicFeatureAccess)) { return expectedTypes; } @@ -188,14 +188,26 @@ public class TypedValueAddingToUntypedCollectionCheck return expectedTypes; } - private Collection getActualCollectionTypes(FeatureAccess fa, Collection expectedTypes) + private Collection getActualCollectionTypes(FeatureAccess fa, Collection expectedTypes, IProgressMonitor monitor) { Collection actualTypes = new ArrayList<>(); - Invocation inv = BslUtil.getInvocation(fa); + if (monitor.isCanceled()) + { + return actualTypes; + } + Invocation invocation = BslUtil.getInvocation(fa); + if (invocation == null) + { + return actualTypes; + } for (TypeItem type : expectedTypes) { - type = (TypeItem)EcoreUtil.resolve(type, inv); + if (monitor.isCanceled()) + { + break; + } + type = (TypeItem)EcoreUtil.resolve(type, invocation); if (type.getName().equals(IEObjectTypeNames.VALUE_LIST)) { diff --git a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF index 1ffaa5fe..97399c95 100644 --- a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF @@ -29,10 +29,10 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.metadata;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.metadata.dbview;version="[5.0.0,6.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.platform.version;version="[2.14.0,3.0.0)", com._1c.g5.v8.dt.ql.model;version="[5.0.0,6.0.0)", - com._1c.g5.v8.dt.ql.resource;version="[5.0.0,6.0.0)", + com._1c.g5.v8.dt.ql.resource;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.ql.typesystem;version="[6.0.0,7.0.0)", com._1c.g5.wiring;version="[2.2.0,3.0.0)", com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)", @@ -40,7 +40,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com.e1c.g5.v8.dt.check.components;version="[2.0.0,3.0.0)", com.e1c.g5.v8.dt.check.context;version="[2.0.0,3.0.0)", com.e1c.g5.v8.dt.check.ext;version="[1.0.0,2.0.0)", - com.e1c.g5.v8.dt.check.qfix;version="[3.0.0,4.0.0)", + com.e1c.g5.v8.dt.check.qfix;version="[4.0.0,5.0.0)", com.e1c.g5.v8.dt.check.qfix.components;version="[1.0.0,2.0.0)", com.e1c.g5.v8.dt.check.settings;version="[4.0.0,5.0.0)", com.e1c.v8codestyle.check;version="[0.7.0,0.8.0)", diff --git a/bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF index 5e16d4dd..dd146a37 100644 --- a/bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF @@ -22,9 +22,9 @@ Bundle-Localization: plugin Import-Package: com._1c.g5.v8.dt.common;version="[6.4.0,7.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.md.ui.shared;version="[2.3.200,3.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.metadata.mdclass.util;version="[5.0.0,6.0.0)", - com._1c.g5.v8.dt.ui.wizards;version="[8.0.0,9.0.0)", + com._1c.g5.v8.dt.ui.wizards;version="[9.0.0,10.0.0)", com._1c.g5.wiring;version="[2.2.0,3.0.0)", com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)", com.e1c.v8codestyle.md;version="[0.7.0,0.8.0)", diff --git a/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF index 2d4adfcf..5ea117fe 100644 --- a/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.mcore.util;version="[3.13.0,4.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.metadata.mdclass.util;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.platform;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.schedule.model;version="[2.0.0,3.0.0)", diff --git a/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF index 9f8387fe..4a96fe2b 100644 --- a/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.metadata.dbview;version="4.0.0", - com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.ql.model;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.ql.typesystem;version="5.0.0", com._1c.g5.wiring;version="[2.2.0,3.0.0)", diff --git a/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF index a5e5ac0a..b5c57337 100644 --- a/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF @@ -17,13 +17,13 @@ Bundle-Localization: plugin Import-Package: com._1c.g5.v8.bm.core;version="[9.0.0,10.0.0)", com._1c.g5.v8.bm.core.event;version="[3.0.0,4.0.0)", com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)", - com._1c.g5.v8.dt.bm.index.emf;version="[8.0.0,9.0.0)", + com._1c.g5.v8.dt.bm.index.emf;version="[9.0.0,10.0.0)", com._1c.g5.v8.dt.bm.index.rights;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.common;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", - com._1c.g5.v8.dt.md;version="[20.0.0,21.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.md;version="[21.0.0,22.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.platform.version;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.rights;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.rights.model;version="[4.0.0,5.0.0)", diff --git a/bundles/com.e1c.v8codestyle.ui/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.ui/META-INF/MANIFEST.MF index 55ada2c8..2ee679ba 100644 --- a/bundles/com.e1c.v8codestyle.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.ui/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Automatic-Module-Name: com.e1c.v8codestyle.ui Bundle-ActivationPolicy: lazy Import-Package: com._1c.g5.v8.dt.common;version="[6.4.0,7.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", - com._1c.g5.v8.dt.ui.wizards;version="[8.1.0,9.0.0)", + com._1c.g5.v8.dt.ui.wizards;version="[9.0.0,10.0.0)", com._1c.g5.wiring;version="[2.2.0,3.0.0)", com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)", com.e1c.v8codestyle;version="[0.7.0,0.8.0)" diff --git a/targets/default/default.target b/targets/default/default.target index ce8a14a6..5d689c27 100644 --- a/targets/default/default.target +++ b/targets/default/default.target @@ -13,15 +13,16 @@ - + - + + diff --git a/tests/com.e1c.v8codestyle.bsl.itests/resources/doc-comment-description-ends-on-dot.bsl b/tests/com.e1c.v8codestyle.bsl.itests/resources/doc-comment-description-ends-on-dot.bsl index a66434c9..e7fe6c01 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/resources/doc-comment-description-ends-on-dot.bsl +++ b/tests/com.e1c.v8codestyle.bsl.itests/resources/doc-comment-description-ends-on-dot.bsl @@ -10,3 +10,13 @@ EndProcedure Procedure Complaint() Export // empty EndProcedure + +// First line +// second line. +// Example: +// if true then +// NonComplaint(); +// EndIf; +Procedure Complaint() Export + // empty +EndProcedure diff --git a/tests/com.e1c.v8codestyle.bsl.ui.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.bsl.ui.itests/META-INF/MANIFEST.MF index 11a3a9be..4ec4d0a0 100644 --- a/tests/com.e1c.v8codestyle.bsl.ui.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.bsl.ui.itests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: fragment Import-Package: com._1c.g5.v8.dt.bsl.ui.editor;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)", - com._1c.g5.v8.dt.ui.util;version="[8.0.0,9.0.0)", + com._1c.g5.v8.dt.ui.util;version="[9.0.0,10.0.0)", org.junit;version="[4.13.0,5.0.0)" Require-Bundle: org.eclipse.ui.forms;bundle-version="[3.11.0,4.0.0)", org.eclipse.core.expressions;bundle-version="[3.8.0,4.0.0)" diff --git a/tests/com.e1c.v8codestyle.bsl.ui.itests/resources/doc-comment-view.bsl b/tests/com.e1c.v8codestyle.bsl.ui.itests/resources/doc-comment-view.bsl index e26787bf..f593fe61 100644 --- a/tests/com.e1c.v8codestyle.bsl.ui.itests/resources/doc-comment-view.bsl +++ b/tests/com.e1c.v8codestyle.bsl.ui.itests/resources/doc-comment-view.bsl @@ -4,13 +4,15 @@ // Parameters: // Parameters - Structure: // * Key1 - has not type for key +// @tag1 param description Procedure Test(Parameters) Export - // empty + // empty EndProcedure +// @tag2 param description // Returns: // Array of See Test Function Test2() Export - // empty - Return Undefined; + // empty + Return Undefined; EndFunction diff --git a/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/BslDocCommentViewTest.java b/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/BslDocCommentViewTest.java index 5fac9ed4..258cd9b1 100644 --- a/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/BslDocCommentViewTest.java +++ b/tests/com.e1c.v8codestyle.bsl.ui.itests/src/com/e1c/v8codestyle/bsl/ui/itests/BslDocCommentViewTest.java @@ -48,6 +48,7 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment; import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment.ParametersSection; import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment.ReturnSection; import com._1c.g5.v8.dt.bsl.documentation.comment.LinkPart; +import com._1c.g5.v8.dt.bsl.documentation.comment.TagPart; import com._1c.g5.v8.dt.bsl.documentation.comment.TextPart; import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection.FieldDefinition; import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection.TypeDefinition; @@ -179,35 +180,50 @@ public class BslDocCommentViewTest assertEquals(3, typePart.getLineNumber()); assertEquals("Structure", typePart.getTypeName()); - selectText(bslEditor, 169, 0, view); + selectText(bslEditor, 226, 0, view); first = getViewerSelection((BslDocCommentView)view); assertTrue(first instanceof ReturnSection); ReturnSection returnPart = (ReturnSection)first; - assertEquals(0, returnPart.getLineNumber()); + assertEquals(1, returnPart.getLineNumber()); - selectText(bslEditor, 187, 1, view); + selectText(bslEditor, 245, 1, view); first = getViewerSelection((BslDocCommentView)view); assertTrue(first instanceof LinkPart); LinkPart linkPart = (LinkPart)first; - assertEquals(1, linkPart.getLineNumber()); + assertEquals(2, linkPart.getLineNumber()); assertEquals("Test", linkPart.getLinkText()); assertEquals("See Test", linkPart.getInitialContent()); - selectText(bslEditor, 192, 1, view); + selectText(bslEditor, 250, 1, view); first = getViewerSelection((BslDocCommentView)view); assertTrue(first instanceof LinkPart); linkPart = (LinkPart)first; - assertEquals(1, linkPart.getLineNumber()); + assertEquals(2, linkPart.getLineNumber()); assertEquals("Test", linkPart.getLinkText()); assertEquals("See Test", linkPart.getInitialContent()); - selectText(bslEditor, 243, 1, view); + selectText(bslEditor, 283, 1, view); TreeViewer viewer = getViewer((BslDocCommentView)view); ITreeSelection selection = viewer.getStructuredSelection(); assertTrue(selection.isEmpty()); Object input = viewer.getInput(); assertTrue(input instanceof BslDocumentationComment); + selectText(bslEditor, 107, 1, view); + first = getViewerSelection((BslDocCommentView)view); + assertTrue(first instanceof TagPart); + TagPart tagPart = (TagPart)first; + assertEquals(5, tagPart.getLineNumber()); + assertEquals("tag1", tagPart.getTagName()); + assertEquals(1, tagPart.getParameters().size()); + + selectText(bslEditor, 195, 1, view); + first = getViewerSelection((BslDocCommentView)view); + assertTrue(first instanceof TagPart); + tagPart = (TagPart)first; + assertEquals(0, tagPart.getLineNumber()); + assertEquals("tag2", tagPart.getTagName()); + assertEquals(1, tagPart.getParameters().size()); } private Object getViewerSelection(BslDocCommentView view) throws Exception diff --git a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF index 65f22cd9..780a202e 100644 --- a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.form.naming;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", - com._1c.g5.v8.dt.metadata.mdclass;version="[10.0.0,11.0.0)", + com._1c.g5.v8.dt.metadata.mdclass;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)", com._1c.g5.v8.dt.validation.marker;version="[9.0.0,10.0.0)", com.e1c.g5.v8.dt.testing.check;version="[1.0.0,2.0.0)", diff --git a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF index 0af2145e..db1c6e19 100644 --- a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: fragment Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)", com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)", - com._1c.g5.v8.dt.dcs.util;version="[15.0.0,16.0.0)", + com._1c.g5.v8.dt.dcs.util;version="[16.0.0,17.0.0)", com._1c.g5.v8.dt.form.model;version="[12.0.0,13.0.0)", com._1c.g5.v8.dt.mcore;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.testing;version="[3.0.0,4.0.0)",