1
0
mirror of https://github.com/1C-Company/v8-code-style.git synced 2025-09-16 09:36:26 +02:00

Переход на EDT 2025.1 (#1491)

* Поднятие версий 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 af7a666955.

* 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 <alexander.tretyakevich@xored.com>

* Исправлена версия зависимостей на 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 <babn@1c.ru>

* edt-2025-1: Поднятие версии QFix

* NPE "deleteInvocation" is null

* G5V8DT-26943 Исключить срабатывание проверки на секции Пример (#1493)

* Добавить сценарий в тестовый кейс
* Количество маркеров и их положение не изменяется

Co-authored-by: Nikolay Babin <babn@1c.ru>

* G5V8DT-26157 Глифы векторных картинок в новом интерфейсе

Поднятие версий

* G5V8DT-26157 Глифы векторных картинок в новом интерфейсе

Поднятие версий

* G5V8DT-26429 - Автозаполнение синонимов (псевдонимов полей) в
конструкторе запросов

Подъём версий

---------

Co-authored-by: Vadim Geraskin <vadim.geraskin@xored.com>
Co-authored-by: Alexander Tretyakevich <alexander.tretyakevich@xored.com>
Co-authored-by: Almaz Nasibullin <AlmazNasibullin@users.noreply.github.com>
Co-authored-by: Maxim Dzyuba <dzym@1c.ru>
Co-authored-by: MaksimDzyuba <77277424+MaksimDzyuba@users.noreply.github.com>
Co-authored-by: Dmitry Savenko <dsavenko@xored.com>
Co-authored-by: Nikita Kuznetsov <kuzn@1c.ru>
Co-authored-by: Alexander Tretyakevich <tretyakevich@gmail.com>
Co-authored-by: nikolay-martynov <nikolay-martynov@users.noreply.github.com>
Co-authored-by: ukolabrother <71124350+ukolabrother@users.noreply.github.com>
Co-authored-by: Nikolay Babin <babn@1c.ru>
Co-authored-by: Dmitry Belov <109139509+DmitryBelov-e1c@users.noreply.github.com>
This commit is contained in:
Almaz Nasibullin
2025-07-04 17:00:31 +03:00
committed by GitHub
parent 1f43436e0e
commit 126df85d4d
30 changed files with 138 additions and 51 deletions

View File

@@ -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)",

View File

@@ -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)",

View File

@@ -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)",

Binary file not shown.

After

Width:  |  Height:  |  Size: 512 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 939 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 481 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 908 B

View File

@@ -33,6 +33,7 @@ public final class SharedImages
public static final String IMG_OBJ16_TYPE_SECTION = UiPlugin.PLUGIN_ID + T_OBJ16 + "type_section.png"; //$NON-NLS-1$
public static final String IMG_OBJ16_PARAMETERS_SECTION = UiPlugin.PLUGIN_ID + T_OBJ16 + "parameters_section.png"; //$NON-NLS-1$
public static final String IMG_OBJ16_DESCRIPTION = UiPlugin.PLUGIN_ID + T_OBJ16 + "description.png"; //$NON-NLS-1$
public static final String IMG_OBJ16_TAG = UiPlugin.PLUGIN_ID + T_OBJ16 + "atsign.png"; //$NON-NLS-1$
private static final String ICONS_PATH = "/icons"; //$NON-NLS-1$
@@ -51,6 +52,7 @@ public final class SharedImages
reg.put(IMG_OBJ16_PARAMETERS_SECTION,
createImageDescriptorFromKey(DtThemeUtil.getIconPath(IMG_OBJ16_PARAMETERS_SECTION)));
reg.put(IMG_OBJ16_DESCRIPTION, createImageDescriptorFromKey(DtThemeUtil.getIconPath(IMG_OBJ16_DESCRIPTION)));
reg.put(IMG_OBJ16_TAG, createImageDescriptorFromKey(DtThemeUtil.getIconPath(IMG_OBJ16_TAG)));
}
private static ImageDescriptor createImageDescriptorFromKey(String key)

View File

@@ -42,6 +42,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;
@@ -293,6 +294,14 @@ public class BslDocCommentSelectionListener
return section;
}
}
else if (object instanceof TagPart section)
{
if (section.getLineNumber() == line && section.getOffset() < offset
&& section.getOffset() + section.getContent().length() > offset)
{
return section;
}
}
else if (object instanceof FieldDefinition)
{
FieldDefinition section = (FieldDefinition)object;

View File

@@ -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);

View File

@@ -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

View File

@@ -31,3 +31,5 @@ BslDocCommentView_Text = Text: {0}
BslDocCommentView_Type = Type: {0}
BslDocCommentView_Types = Types:
BslDocCommentView_Tag = Tag: {0}

View File

@@ -32,3 +32,5 @@ BslDocCommentView_Text = Текст: {0}
BslDocCommentView_Type = Тип: {0}
BslDocCommentView_Types = Типы:
BslDocCommentView_Tag = Тег: {0}

View File

@@ -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)",

View File

@@ -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<String> 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<Expression> 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;
}
}

View File

@@ -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);
}
}

View File

@@ -136,7 +136,7 @@ public class TypedValueAddingToUntypedCollectionCheck
return;
}
Collection<TypeItem> actualTypes = getActualCollectionTypes(fa, expectedCollectionTypes);
Collection<TypeItem> 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<TypeItem> getActualCollectionTypes(FeatureAccess fa, Collection<TypeItem> expectedTypes)
private Collection<TypeItem> getActualCollectionTypes(FeatureAccess fa, Collection<TypeItem> expectedTypes, IProgressMonitor monitor)
{
Collection<TypeItem> 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))
{

View File

@@ -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)",

View File

@@ -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)",

View File

@@ -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)",

View File

@@ -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)",

View File

@@ -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)",

View File

@@ -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)"

View File

@@ -13,15 +13,16 @@
<!-- EDT -->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2024.1/"/>
<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2025.1/"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.19.feature.feature.group" version="0.0.0"/>
<unit id="com._1c.g5.v8.dt.platform.support_v8.3.23.feature.feature.group" version="0.0.0"/>
</location>
<!-- EDT -->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2024.2/"/>
<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2025.1/"/>
<unit id="com._1c.g5.v8.dt.rcp" version="0.0.0"/>
<unit id="com._1c.g5.v8.dt.feature.feature.group" version="0.0.0"/>
<unit id="com._1c.g5.v8.dt.thirdparty.feature.group" version="0.0.0"/>
</location>

View File

@@ -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

View File

@@ -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)"

View File

@@ -4,10 +4,12 @@
// Parameters:
// Parameters - Structure:
// * Key1 - has not type for key
// @tag1 param description
Procedure Test(Parameters) Export
// empty
EndProcedure
// @tag2 param description
// Returns:
// Array of See Test
Function Test2() Export

View File

@@ -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

View File

@@ -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)",

View File

@@ -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)",