diff --git a/CHANGELOG.md b/CHANGELOG.md index 34d489aa..e58e672a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ ## 0.2.0 +Выпуск бета-версии для 1C:EDT 2021.3 + ### Новые фичи ### Новые проверки diff --git a/README.md b/README.md index 6c6b6355..7c3490ab 100644 --- a/README.md +++ b/README.md @@ -36,19 +36,20 @@ | Версия | P2-репозиторий | ZIP-архив репозитория | |--------|----------------|-----------------------| +| 0.2.0 для 1C:EDT 2021.3 | https://edt.1c.ru/downloads/releases/plugins/v8-code-style/edt-2021.3/0.2.0/repo/ | https://edt.1c.ru/downloads/releases/plugins/v8-code-style/edt-2021.3/0.2.0/repo.zip | | 0.1.0 для 1C:EDT 2021.2 | https://edt.1c.ru/downloads/releases/plugins/v8-code-style/edt-2021.2/0.1.0/repo/ | https://edt.1c.ru/downloads/releases/plugins/v8-code-style/edt-2021.2/0.1.0/repo.zip | Далее для установки нужно выполнить следующие действия: -- В среде разработки 1C:Enterprise Development Tools (EDT) выберите пункт меню Help – Install New Software (Справка – Установить новое ПО). -- В открывшемся окне мастера установки в строке Work with воспользуйтесь кнопкой Add… и укажите расположение репозитория. +- В среде разработки 1C:Enterprise Development Tools (EDT) выберите пункт меню `Help – Install New Software` (`Справка – Установить новое ПО`). +- В открывшемся окне мастера установки в строке `Work with` воспользуйтесь кнопкой `Add…` и укажите расположение репозитория. - Если установка производится непосредственно из репозитория, опубликованного на серверах фирмы 1С, то скопируйте указанный адрес репозитория -- Если установка производится из локальной папки, то воспользуйтесь кнопкой Local.. и далее по кнопке Local укажите папку, в которую распакован репозиторий. -- Отметьте компонент `1C:Code style V8` и нажмите кнопку Next> -- На следующем шаге система определит зависимости и сформирует окончательный список библиотек к установке, после этого нажмите кнопку Next> -- Прочитайте и примите условия лицензионного соглашения и нажмите кнопку Finish -- Дождитесь окончания установки и перезапустите среду 1C:Enterprise Development Tools. Установка завершена. +- Если установка производится из локальной папки, то воспользуйтесь кнопкой `Local..` и далее по кнопке `Local` укажите папку, в которую распакован репозиторий. +- Отметьте компонент `1C:Code style V8` и нажмите кнопку `Next>` +- На следующем шаге система определит зависимости и сформирует окончательный список библиотек к установке, после этого нажмите кнопку `Next>` +- Прочитайте и примите условия лицензионного соглашения и нажмите кнопку `Finish` +- Дождитесь окончания установки и перезапустите среду `1C:Enterprise Development Tools`. Установка завершена. ## Участие в проекте @@ -61,4 +62,4 @@ ## Лицензия -[Лицензирование расширений размещенных в данном проекте осуществляется на условиях свободной (открытой) лицензии Eclipse Public License - v 2.0 (полный текст лицензии - https://www.eclipse.org/legal/epl-2.0/)](docs/contributing/licensing.md) +[Лицензирование расширений размещенных в данном проекте осуществляется на условиях свободной (открытой) лицензии Eclipse Public License - v 2.0](docs/contributing/licensing.md) (полный текст лицензии - https://www.eclipse.org/legal/epl-2.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 da4204f9..45f8807a 100644 --- a/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.5.0,8.0.0)", com._1c.g5.v8.dt.bsl.comment;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.bsl.common;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.bsl.documentation.comment;version="[3.0.0,4.0.0)", - com._1c.g5.v8.dt.bsl.model;version="[4.0.0,5.0.0)", + com._1c.g5.v8.dt.bsl.model;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.bsl.ui.editor;version="[8.0.0,9.0.0)", com._1c.g5.v8.dt.bsl.util;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.common;version="[6.0.0,7.0.0)", diff --git a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF index 7835be80..1c7aa9e1 100644 --- a/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF @@ -19,7 +19,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.bsl.common;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.bsl.contextdef;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.bsl.documentation.comment;version="[3.0.0,4.0.0)", - com._1c.g5.v8.dt.bsl.model;version="[4.0.0,5.0.0)", + com._1c.g5.v8.dt.bsl.model;version="[5.0.0,6.0.0)", com._1c.g5.v8.dt.bsl.model.util;version="[4.0.0,5.0.0)", com._1c.g5.v8.dt.bsl.resource;version="[13.0.0,14.0.0)", com._1c.g5.v8.dt.bsl.typesystem;version="[9.0.0,10.0.0)", @@ -27,7 +27,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.bsl.util;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.common;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.core.platform;version="[10.0.0,11.0.0)", - com._1c.g5.v8.dt.form.model;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.form.model;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.lcore.util;version="[2.0.0,3.0.0)", com._1c.g5.v8.dt.mcore;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.mcore.util;version="[3.6.0,4.0.0)", @@ -37,8 +37,8 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)", com._1c.g5.wiring;version="[2.0.0,3.0.0)", com._1c.g5.wiring.binder;version="[1.0.0,2.0.0)", com.e1c.g5.v8.dt.bsl.check;version="[1.0.0,2.0.0)", - com.e1c.g5.v8.dt.check;version="[1.0.0,2.0.0)", - com.e1c.g5.v8.dt.check.components;version="[1.0.0,2.0.0)", - com.e1c.g5.v8.dt.check.settings;version="[1.0.0,2.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.settings;version="[2.0.0,3.0.0)" Export-Package: com.e1c.v8codestyle.bsl;version="0.2.0", com.e1c.v8codestyle.bsl.strict;version="0.2.0" diff --git a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF index 3412e6c8..d4f3d9d9 100644 --- a/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF @@ -15,14 +15,14 @@ Bundle-Localization: plugin Import-Package: com._1c.g5.v8.bm.core;version="[7.5.0,8.0.0)", com._1c.g5.v8.dt.common;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.core.platform;version="[10.4.0,11.0.0)", - com._1c.g5.v8.dt.form.model;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.form.model;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.form.service.datasourceinfo;version="[3.0.0,4.0.0)", com._1c.g5.v8.dt.mcore;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.metadata.mdclass;version="[8.0.0,9.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.check;version="[1.0.0,2.0.0)", - com.e1c.g5.v8.dt.check.components;version="[1.0.0,2.0.0)", - com.e1c.g5.v8.dt.check.settings;version="[1.0.0,2.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.settings;version="[2.0.0,3.0.0)", com.google.common.base;version="[27.1.0,28.0.0)", com.google.inject;version="[1.3.0,2.0.0)" diff --git a/bundles/com.e1c.v8codestyle.form/plugin.xml b/bundles/com.e1c.v8codestyle.form/plugin.xml index dd27de78..ae571d10 100644 --- a/bundles/com.e1c.v8codestyle.form/plugin.xml +++ b/bundles/com.e1c.v8codestyle.form/plugin.xml @@ -26,10 +26,6 @@ category="com.e1c.v8codestyle.form" class="com.e1c.v8codestyle.internal.form.ExecutableExtensionFactory:com.e1c.v8codestyle.form.check.InputFieldListChoiceMode"> - - diff --git a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/DataPathReferredObjectCheck.java b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/DataPathReferredObjectCheck.java deleted file mode 100644 index a1e78451..00000000 --- a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/DataPathReferredObjectCheck.java +++ /dev/null @@ -1,166 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2021, 1C-Soft LLC and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * 1C-Soft LLC - initial API and implementation - *******************************************************************************/ -package com.e1c.v8codestyle.form.check; - -import static com._1c.g5.v8.dt.form.model.FormPackage.Literals.ABSTRACT_DATA_PATH; -import static com._1c.g5.v8.dt.form.model.FormPackage.Literals.ABSTRACT_DATA_PATH__EXTRA_PATHS; -import static com._1c.g5.v8.dt.form.model.FormPackage.Literals.ABSTRACT_DATA_PATH__OBJECTS; -import static com._1c.g5.v8.dt.form.model.FormPackage.Literals.ABSTRACT_DATA_PATH__SEGMENTS; -import static com._1c.g5.v8.dt.form.model.FormPackage.Literals.FORM; - -import java.text.MessageFormat; -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EReference; - -import com._1c.g5.v8.dt.common.Functions; -import com._1c.g5.v8.dt.form.model.AbstractDataPath; -import com._1c.g5.v8.dt.form.model.DataPathReferredObject; -import com._1c.g5.v8.dt.form.model.Form; -import com._1c.g5.v8.dt.form.model.MultiLanguageDataPath; -import com._1c.g5.v8.dt.form.model.PropertyInfo; -import com._1c.g5.v8.dt.form.service.datasourceinfo.IDataSourceInfoAssociationService; -import com.e1c.g5.v8.dt.check.CheckComplexity; -import com.e1c.g5.v8.dt.check.ICheckParameters; -import com.e1c.g5.v8.dt.check.components.BasicCheck; -import com.e1c.g5.v8.dt.check.settings.IssueSeverity; -import com.e1c.g5.v8.dt.check.settings.IssueType; -import com.google.inject.Inject; - -/** - * Checks that each segment of {@link Form} item data-path has referred object. - * - * @author Dmitriy Marmyshev - */ -public class DataPathReferredObjectCheck - extends BasicCheck -{ - - private static final String CHECK_ID = "form-data-path"; //$NON-NLS-1$ - - private IDataSourceInfoAssociationService dataSourceInfoAssociationService; - - /** - * Instantiates a new instance of check of data path referred object check. - * - * @param dataSourceInfoAssociationService the data source info association service, cannot be {@code null}. - */ - @Inject - public DataPathReferredObjectCheck(IDataSourceInfoAssociationService dataSourceInfoAssociationService) - { - super(); - this.dataSourceInfoAssociationService = dataSourceInfoAssociationService; - } - - @Override - public String getCheckId() - { - return CHECK_ID; - } - - @Override - protected void configureCheck(CheckConfigurer builder) - { - builder.title(Messages.DataPathReferredObjectCheck_title) - .description(Messages.DataPathReferredObjectCheck_description) - .complexity(CheckComplexity.NORMAL) - .severity(IssueSeverity.MAJOR) - .issueType(IssueType.ERROR) - .topObject(FORM) - .containment(ABSTRACT_DATA_PATH) - .features(ABSTRACT_DATA_PATH__SEGMENTS, ABSTRACT_DATA_PATH__EXTRA_PATHS, ABSTRACT_DATA_PATH__OBJECTS); - } - - @Override - protected void check(Object object, ResultAcceptor resultAceptor, ICheckParameters parameters, - IProgressMonitor monitor) - { - if (object instanceof MultiLanguageDataPath) - { - return; - } - - AbstractDataPath dataPath = (AbstractDataPath)object; - - if (dataPath.getSegments().isEmpty()) - { - return; - } - - Set foundSegmentObjects = new HashSet<>(); - for (DataPathReferredObject refObject : dataPath.getObjects()) - { - if (monitor.isCanceled()) - { - return; - } - int segmentIndex = refObject.getSegmentIdx(); - if (segmentIndex > -1 && refObject.getObject() != null) - { - foundSegmentObjects.add(segmentIndex); - } - } - - if (monitor.isCanceled() || dataPath.getSegments().size() == foundSegmentObjects.size()) - { - return; - } - - Form form = (Form)dataPath.bmGetTopObject(); - PropertyInfo found = dataSourceInfoAssociationService.findPropertyInfo(form, dataPath); - if (found != null) - { - return; - } - - for (int i = 0; i < dataPath.getSegments().size(); i++) - { - if (monitor.isCanceled()) - { - return; - } - String segment = dataPath.getSegments().get(i); - if (!foundSegmentObjects.contains(i)) - { - String propertyName = getCotainingPropertyPresentation(dataPath); - String message = MessageFormat.format(Messages.DataPathReferredObjectCheck_message, propertyName, - String.join(".", dataPath.getSegments()), i + 1, segment); //$NON-NLS-1$ - - resultAceptor.addIssue(message, ABSTRACT_DATA_PATH__SEGMENTS); - return; - } - } - } - - private String getCotainingPropertyPresentation(AbstractDataPath dataPath) - { - EObject parent = dataPath; - if (dataPath.eContainer() instanceof MultiLanguageDataPath) - { - parent = dataPath.eContainer(); - } - EReference feature = parent.eContainmentFeature(); - - if (feature != null) - { - return Functions.featureToLabel().apply(feature); - } - else - { - return Messages.DataPathReferredObjectCheck_Data_path; - } - } -} diff --git a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/Messages.java b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/Messages.java index 7c80186e..35ef9907 100644 --- a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/Messages.java +++ b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/Messages.java @@ -22,10 +22,6 @@ final class Messages extends NLS { private static final String BUNDLE_NAME = "com.e1c.v8codestyle.form.check.messages"; //$NON-NLS-1$ - public static String DataPathReferredObjectCheck_Data_path; - public static String DataPathReferredObjectCheck_description; - public static String DataPathReferredObjectCheck_message; - public static String DataPathReferredObjectCheck_title; public static String InputFieldListChoiceMode_description; public static String InputFieldListChoiceMode_Form_input_field_the_list_choice_mode_not_set_with_filled_choice_list; public static String InputFieldListChoiceMode_title; diff --git a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/messages.properties b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/messages.properties index 1e45d88c..499dff07 100644 --- a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/messages.properties +++ b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/messages.properties @@ -12,13 +12,6 @@ # Contributors: # 1C-Soft LLC - initial API and implementation ############################################################################### -DataPathReferredObjectCheck_Data_path = Data path - -DataPathReferredObjectCheck_message=Property "{0}" has incorrect value "{1}": {2} segment "{3}" referred to unknown object - -DataPathReferredObjectCheck_description = Checks that each segment of Form item data-path referred to existing object - -DataPathReferredObjectCheck_title = Form object data path referred to existing object for each segment InputFieldListChoiceMode_Form_input_field_the_list_choice_mode_not_set_with_filled_choice_list = Form input field the "list choice mode" not set with filled choice list diff --git a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/messages_ru.properties b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/messages_ru.properties index 67ae6b33..2fe96955 100644 --- a/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/messages_ru.properties +++ b/bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/messages_ru.properties @@ -13,14 +13,6 @@ ############################################################################### #Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/) -DataPathReferredObjectCheck_Data_path = Путь к данным - -DataPathReferredObjectCheck_message = Свойство "{0}" имеет некоректное значение "{1}": {2} сегмент "{3}" ссылается на неизвестный объект - -DataPathReferredObjectCheck_description = Проверяет что каждый сегмент пути к данным элемента формы ссылается на существующий объект. - -DataPathReferredObjectCheck_title = Путь к данным объекта формы ссылается на существующий объект в каждом сегменте пути - InputFieldListChoiceMode_Form_input_field_the_list_choice_mode_not_set_with_filled_choice_list = У поля ввода формы с заполненным списком выбора отключено свойство "Режим выбора из списка" InputFieldListChoiceMode_description = Проверяет, что поле ввода содержит корректный режим ввыбора из списка, если список выбора заполнен diff --git a/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF index 5bf7fecc..f97ec487 100644 --- a/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF @@ -19,10 +19,10 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.metadata.mdclass.util;version="[5.0.0,6.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.check;version="[1.0.0,2.0.0)", - com.e1c.g5.v8.dt.check.components;version="[1.0.0,2.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.ext;version="[1.0.0,2.0.0)", - com.e1c.g5.v8.dt.check.settings;version="[1.0.0,2.0.0)", + com.e1c.g5.v8.dt.check.settings;version="[2.0.0,3.0.0)", com.google.common.base;version="[27.0.0,28.0.0)", com.google.inject;version="[1.3.0,2.0.0)" Export-Package: com.e1c.v8codestyle.md;version="0.2.0" diff --git a/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF index adab15c8..43f019cb 100644 --- a/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF @@ -22,8 +22,8 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.ql.typesystem;version="5.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.check;version="[1.0.0,2.0.0)", - com.e1c.g5.v8.dt.check.components;version="[1.0.0,2.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.settings;version="1.0.0", com.e1c.g5.v8.dt.ql.check;version="[1.0.0,2.0.0)", com.google.inject;version="[1.3.0,2.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 7813c58b..54ddce3b 100644 --- a/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF @@ -25,9 +25,9 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)", com._1c.g5.v8.dt.rights.model.util;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)", - com.e1c.g5.v8.dt.check;version="[1.0.0,2.0.0)", - com.e1c.g5.v8.dt.check.components;version="[1.0.0,2.0.0)", - com.e1c.g5.v8.dt.check.context;version="[1.0.0,2.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.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.settings;version="[1.0.0,2.0.0)", + com.e1c.g5.v8.dt.check.settings;version="[2.0.0,3.0.0)", com.google.inject;version="[1.3.0,2.0.0)" diff --git a/bundles/com.e1c.v8codestyle/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle/META-INF/MANIFEST.MF index 7d86f187..0013e612 100644 --- a/bundles/com.e1c.v8codestyle/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: com.e1c.v8codestyle Bundle-ActivationPolicy: lazy -Import-Package: com.e1c.g5.v8.dt.check;version="[1.0.0,2.0.0)", +Import-Package: com.e1c.g5.v8.dt.check;version="[2.0.0,3.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.google.inject;version="[1.3.0,2.0.0)" diff --git a/targets/default/default.target b/targets/default/default.target index 61debf5d..0dd9b71d 100644 --- a/targets/default/default.target +++ b/targets/default/default.target @@ -13,7 +13,7 @@ - + diff --git a/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF index 5bad96b3..af1c358c 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.bsl.itests/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Automatic-Module-Name: com.e1c.v8codestyle.md.itests Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: fragment Import-Package: com._1c.g5.v8.dt.core.platform;version="[10.0.0,11.0.0)", - com._1c.g5.v8.dt.form.model;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.form.model;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.validation.marker;version="[4.0.0,5.0.0)", + com._1c.g5.v8.dt.validation.marker;version="[5.0.0,6.0.0)", com.e1c.g5.v8.dt.testing.check;version="[1.0.0,2.0.0)", org.junit;version="[4.13.0,5.0.0)" diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureTopRegionCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureTopRegionCheckTest.java index 6f802b25..a05dc342 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureTopRegionCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleStructureTopRegionCheckTest.java @@ -62,13 +62,9 @@ public class ModuleStructureTopRegionCheckTest updateModule(FOLDER_RESOURCE + "module-structure-sub-region.bsl"); List markers = getModuleMarkers(); - assertEquals(2, markers.size()); + assertEquals(1, markers.size()); Marker marker = markers.get(0); assertEquals("14", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - // FIXME remove after marker duplication fix - marker = markers.get(1); - assertEquals("14", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } /** diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RegionEmptyCheckTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RegionEmptyCheckTest.java index 7b714f9c..93a11b35 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RegionEmptyCheckTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/RegionEmptyCheckTest.java @@ -48,13 +48,9 @@ public class RegionEmptyCheckTest updateModule(FOLDER_RESOURCE + "region-empty.bsl"); List markers = getModuleMarkers(); - assertEquals(2, markers.size()); + assertEquals(1, markers.size()); Marker marker = markers.get(0); assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - // FIXME remove after marker duplication fix - marker = markers.get(1); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } /** @@ -68,13 +64,9 @@ public class RegionEmptyCheckTest updateModule(FOLDER_RESOURCE + "region-empty-after.bsl"); List markers = getModuleMarkers(); - assertEquals(2, markers.size()); + assertEquals(1, markers.size()); Marker marker = markers.get(0); assertEquals("10", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - // FIXME remove after marker duplication fix - marker = markers.get(1); - assertEquals("10", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } /** @@ -88,13 +80,9 @@ public class RegionEmptyCheckTest updateModule(FOLDER_RESOURCE + "region-empty-before.bsl"); List markers = getModuleMarkers(); - assertEquals(2, markers.size()); + assertEquals(1, markers.size()); Marker marker = markers.get(0); assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - // FIXME remove after marker duplication fix - marker = markers.get(1); - assertEquals("2", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } /** @@ -108,13 +96,9 @@ public class RegionEmptyCheckTest updateModule(FOLDER_RESOURCE + "region-empty-sub-region.bsl"); List markers = getModuleMarkers(); - assertEquals(2, markers.size()); + assertEquals(1, markers.size()); Marker marker = markers.get(0); assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - // FIXME remove after marker duplication fix - marker = markers.get(1); - assertEquals("4", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } /** diff --git a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/strict/check/itests/CommonModuleStrictTypesTest.java b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/strict/check/itests/CommonModuleStrictTypesTest.java index 605b0b7d..aa11cfd1 100644 --- a/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/strict/check/itests/CommonModuleStrictTypesTest.java +++ b/tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/strict/check/itests/CommonModuleStrictTypesTest.java @@ -46,6 +46,16 @@ import com._1c.g5.v8.dt.metadata.mdclass.CommonModule; import com._1c.g5.v8.dt.validation.marker.IExtraInfoKeys; import com._1c.g5.v8.dt.validation.marker.Marker; import com.e1c.g5.v8.dt.testing.check.CheckTestBase; +import com.e1c.v8codestyle.bsl.strict.check.DocCommentFieldTypeCheck; +import com.e1c.v8codestyle.bsl.strict.check.DynamicFeatureAccessMethodNotFoundCheck; +import com.e1c.v8codestyle.bsl.strict.check.DynamicFeatureAccessTypeCheck; +import com.e1c.v8codestyle.bsl.strict.check.FunctionCtorReturnSectionCheck; +import com.e1c.v8codestyle.bsl.strict.check.FunctionReturnTypeCheck; +import com.e1c.v8codestyle.bsl.strict.check.InvocationParamIntersectionCheck; +import com.e1c.v8codestyle.bsl.strict.check.MethodParamTypeCheck; +import com.e1c.v8codestyle.bsl.strict.check.SimpleStatementTypeCheck; +import com.e1c.v8codestyle.bsl.strict.check.StructureCtorValueTypeCheck; +import com.e1c.v8codestyle.bsl.strict.check.VariableTypeCheck; /** * Tests of strict types system in BSL module. @@ -200,9 +210,7 @@ public class CommonModuleStrictTypesTest assertEquals(3, methods.size()); List markers = getMarters(checkId, module); - - // FIXME check-system duplicates issues - assertEquals(2, markers.size()); + assertEquals(1, markers.size()); String uriToProblem = EcoreUtil.getURI(methods.get(0)).toString(); @@ -210,10 +218,6 @@ public class CommonModuleStrictTypesTest assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); - marker = markers.get(1); - assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); - } /** @@ -233,20 +237,13 @@ public class CommonModuleStrictTypesTest assertEquals(2, methods.size()); List markers = getMarters(checkId, module); - - // FIXME check-system duplicates issues - assertEquals(2, markers.size()); + assertEquals(1, markers.size()); String uriToProblem = EcoreUtil.getURI(methods.get(0).getFormalParams().get(0)).toString(); Marker marker = markers.get(0); assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); - - marker = markers.get(1); - assertEquals("3", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); - } /** @@ -266,9 +263,7 @@ public class CommonModuleStrictTypesTest assertEquals(2, dynamicMethods.size()); List markers = getMarters(checkId, module); - - // FIXME check-system duplicates issues - assertEquals(2, markers.size()); + assertEquals(1, markers.size()); String uriToProblem = EcoreUtil.getURI(dynamicMethods.get(0)).toString(); @@ -276,10 +271,6 @@ public class CommonModuleStrictTypesTest assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); - marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); - } /** @@ -299,20 +290,13 @@ public class CommonModuleStrictTypesTest assertEquals(2, dynamicProperties.size()); List markers = getMarters(checkId, module); - - // FIXME check-system duplicates issues - assertEquals(2, markers.size()); + assertEquals(1, markers.size()); String uriToProblem = EcoreUtil.getURI(dynamicProperties.get(0)).toString(); Marker marker = markers.get(0); assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); - - marker = markers.get(0); - assertEquals("5", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); - } /** @@ -332,9 +316,7 @@ public class CommonModuleStrictTypesTest assertEquals(2, statements.size()); List markers = getMarters(checkId, module); - - // FIXME check-system duplicates issues - assertEquals(2, markers.size()); + assertEquals(1, markers.size()); String uriToProblem = EcoreUtil.getURI(statements.get(0)).toString(); @@ -342,10 +324,6 @@ public class CommonModuleStrictTypesTest assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); - marker = markers.get(0); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - assertEquals(uriToProblem, marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_URI_TO_PROBLEM_KEY)); - } /** @@ -364,16 +342,11 @@ public class CommonModuleStrictTypesTest Module module = updateAndGetModule(resourceName); List markers = getMarters(checkId, module); - - // FIXME check-system duplicates issues - assertEquals(2, markers.size()); + assertEquals(1, markers.size()); Marker marker = markers.get(0); assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - marker = markers.get(0); - assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY)); - } /** 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 5f97c2d6..36cf8e2f 100644 --- a/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Import-Package: com._1c.g5.v8.bm.integration;version="[9.1.0,10.0.0)", com._1c.g5.v8.dt.mcore;version="[6.3.0,7.0.0)", com._1c.g5.v8.dt.metadata.mdclass;version="[8.7.0,9.0.0)", com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)", - com._1c.g5.v8.dt.validation.marker;version="[4.0.0,5.0.0)", + com._1c.g5.v8.dt.validation.marker;version="[5.0.0,6.0.0)", com.e1c.g5.v8.dt.testing.check;version="[1.0.0,2.0.0)", org.junit;version="[4.13.0,5.0.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)" diff --git a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/check/itests/DataPathReferredObjectCheckTest.java b/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/check/itests/DataPathReferredObjectCheckTest.java deleted file mode 100644 index 05b0c50a..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/src/com/e1c/v8codestyle/form/check/itests/DataPathReferredObjectCheckTest.java +++ /dev/null @@ -1,230 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2021, 1C-Soft LLC and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * 1C-Soft LLC - initial API and implementation - *******************************************************************************/ -package com.e1c.v8codestyle.form.check.itests; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import org.eclipse.emf.common.util.TreeIterator; -import org.eclipse.emf.ecore.EObject; -import org.junit.Test; - -import com._1c.g5.v8.bm.core.IBmObject; -import com._1c.g5.v8.dt.core.platform.IDtProject; -import com._1c.g5.v8.dt.form.model.AbstractDataPath; -import com._1c.g5.v8.dt.form.model.Form; -import com._1c.g5.v8.dt.form.model.FormField; -import com._1c.g5.v8.dt.form.model.FormItem; -import com._1c.g5.v8.dt.form.model.Table; -import com._1c.g5.v8.dt.validation.marker.Marker; -import com.e1c.g5.v8.dt.testing.check.SingleProjectReadOnlyCheckTestBase; -import com.e1c.v8codestyle.form.check.DataPathReferredObjectCheck; - -/** - * Tests for {@link DataPathReferredObjectCheck} check. - * - * @author Dmitriy Marmyshev - */ -public class DataPathReferredObjectCheckTest - extends SingleProjectReadOnlyCheckTestBase -{ - - private static final String CHECK_ID = "form-data-path"; - - private static final String PROJECT_NAME = "FormDataPath"; - - private static final String FQN_FORM = "CommonForm.ListForm.Form"; - - private static final String FQN_FORM2 = "Catalog.Products.Form.ListForm.Form"; - - private static final String FQN_FORM3 = "Catalog.Products.Form.ItemForm.Form"; - - /** - * Test the dynamic list form with custom query finds data path to unknown field that not exist in query text - * - * @throws Exception the exception - */ - @Test - public void testDynamicListFormWithCustomQuery() throws Exception - { - IDtProject dtProject = dtProjectManager.getDtProject(PROJECT_NAME); - assertNotNull(dtProject); - - IBmObject object = getTopObjectByFqn(FQN_FORM, dtProject); - assertTrue(object instanceof Form); - Form form = (Form)object; - - FormItem item = getItemByName(form, "List"); - assertTrue(item instanceof Table); - - AbstractDataPath dataPath = ((Table)item).getDataPath(); - - Marker marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNull(marker); - - item = getItemByName(form, "ListField1"); - assertTrue(item instanceof FormField); - - dataPath = ((FormField)item).getDataPath(); - - marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNull(marker); - - item = getItemByName(form, "ListField2"); - assertTrue(item instanceof FormField); - - dataPath = ((FormField)item).getDataPath(); - - marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNotNull(marker); - } - - /** - * Test the dynamic list form with main table finds data path to unknown field that not exist in the object - * - * @throws Exception the exception - */ - @Test - public void testListFormWithMainTable() throws Exception - { - IDtProject dtProject = dtProjectManager.getDtProject(PROJECT_NAME); - assertNotNull(dtProject); - - IBmObject object = getTopObjectByFqn(FQN_FORM2, dtProject); - assertTrue(object instanceof Form); - Form form = (Form)object; - - FormItem item = getItemByName(form, "List"); - assertTrue(item instanceof Table); - - AbstractDataPath dataPath = ((Table)item).getDataPath(); - - Marker marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNull(marker); - - dataPath = ((Table)item).getRowPictureDataPath(); - - marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNull(marker); - - item = getItemByName(form, "Ref"); - assertTrue(item instanceof FormField); - - dataPath = ((FormField)item).getDataPath(); - - marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNull(marker); - - item = getItemByName(form, "Code"); - assertTrue(item instanceof FormField); - - dataPath = ((FormField)item).getDataPath(); - - marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNull(marker); - - item = getItemByName(form, "SKU"); - assertTrue(item instanceof FormField); - - dataPath = ((FormField)item).getDataPath(); - - marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNull(marker); - - item = getItemByName(form, "Unknown"); - assertTrue(item instanceof FormField); - - dataPath = ((FormField)item).getDataPath(); - - marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNotNull(marker); - - item = getItemByName(form, "Current"); - assertTrue(item instanceof FormField); - - dataPath = ((FormField)item).getDataPath(); - - marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNull(marker); - - item = getItemByName(form, "CurrentUnknown"); - assertTrue(item instanceof FormField); - - dataPath = ((FormField)item).getDataPath(); - - marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNotNull(marker); - } - - /** - * Test the object form finds data path to unknown field that not exist in the object - * - * @throws Exception the exception - */ - @Test - public void testItemForm() throws Exception - { - IDtProject dtProject = dtProjectManager.getDtProject(PROJECT_NAME); - assertNotNull(dtProject); - - IBmObject object = getTopObjectByFqn(FQN_FORM3, dtProject); - assertTrue(object instanceof Form); - Form form = (Form)object; - - FormItem item = getItemByName(form, "Code"); - assertTrue(item instanceof FormField); - - AbstractDataPath dataPath = ((FormField)item).getDataPath(); - - Marker marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNull(marker); - - item = getItemByName(form, "SKU"); - assertTrue(item instanceof FormField); - - dataPath = ((FormField)item).getDataPath(); - - marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNull(marker); - - item = getItemByName(form, "Unknown"); - assertTrue(item instanceof FormField); - - dataPath = ((FormField)item).getDataPath(); - - marker = getFirstMarker(CHECK_ID, dataPath, dtProject); - assertNotNull(marker); - } - - @Override - protected String getTestConfigurationName() - { - return PROJECT_NAME; - } - - private FormItem getItemByName(Form form, String name) - { - for (TreeIterator iterator = form.eAllContents(); iterator.hasNext();) - { - EObject child = iterator.next(); - if (child instanceof FormItem && name.equals(((FormItem)child).getName())) - { - return (FormItem)child; - } - } - return null; - - } - -} diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/.project b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/.project deleted file mode 100644 index a5a25e8f..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/.project +++ /dev/null @@ -1,18 +0,0 @@ - - - FormDataPath - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - - org.eclipse.xtext.ui.shared.xtextNature - com._1c.g5.v8.dt.core.V8ConfigurationNature - - diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/.settings/org.eclipse.core.resources.prefs b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c02..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/DT-INF/PROJECT.PMF b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/DT-INF/PROJECT.PMF deleted file mode 100644 index 6835f1cd..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/DT-INF/PROJECT.PMF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 -Runtime-Version: 8.3.19 diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Catalogs/Products/Forms/ItemForm/Form.form b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Catalogs/Products/Forms/ItemForm/Form.form deleted file mode 100644 index 6b3517c0..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Catalogs/Products/Forms/ItemForm/Form.form +++ /dev/null @@ -1,336 +0,0 @@ - - - - Code - 1 - true - true - - true - - - Object.Code - - - CodeExtendedTooltip - 3 - true - true - - true - - Label - true - true - - Left - - - - CodeContextMenu - 2 - true - true - - true - - true - - InputField - EnterOnInput - true - Left - true - - true - true - true - true - true - true - - - - Description - 4 - true - true - - true - - - Object.Description - - - DescriptionExtendedTooltip - 6 - true - true - - true - - Label - true - true - - Left - - - - DescriptionContextMenu - 5 - true - true - - true - - true - - InputField - EnterOnInput - true - Left - true - - true - true - true - true - true - true - - - - DeletionMark - 7 - true - true - - true - - - Object.DeletionMark - - - DeletionMarkExtendedTooltip - 9 - true - true - - true - - Label - true - true - - Left - - - - DeletionMarkContextMenu - 8 - true - true - - true - - true - - CheckBoxField - EnterOnInput - true - Left - true - - - - PredefinedDataName - 10 - true - true - - true - - - Object.PredefinedDataName - - - PredefinedDataNameExtendedTooltip - 12 - true - true - - true - - Label - true - true - - Left - - - - PredefinedDataNameContextMenu - 11 - true - true - - true - - true - - InputField - EnterOnInput - true - Left - true - - true - true - true - true - true - true - - - - SKU - 13 - true - true - - true - - - Object.SKU - - - SKUExtendedTooltip - 15 - true - true - - true - - Label - true - true - - Left - - - - SKUContextMenu - 14 - true - true - - true - - true - - InputField - EnterOnInput - true - Left - true - - true - true - true - true - true - true - - - - Unknown - 16 - true - true - - true - - - Object.Unknown - - - SKU1ExtendedTooltip - 18 - true - true - - true - - Label - true - true - - Left - - - - SKU1ContextMenu - 17 - true - true - - true - - true - - InputField - EnterOnInput - true - Left - true - - true - true - true - true - true - true - - - - FormCommandBar - -1 - true - true - - true - - Left - true - - LockOwnerWindow - true - true - Vertical - true - true - true - true - true - - Object - 1 - - CatalogObject.Products - - - true - - - true - -
true
- true - - - - - - - diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Catalogs/Products/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Catalogs/Products/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss deleted file mode 100644 index 1d88eb34..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Catalogs/Products/Forms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss +++ /dev/null @@ -1,17 +0,0 @@ - - - - Normal - ceabd454-8bad-48a7-bd9c-1e9c55a50661 - - - Normal - 53f67208-9bb4-412f-91b7-7a277245a530 - - - Normal - 35329f27-3c47-4b6a-a1b9-f9741131ca76 - - Normal - 5ec89258-8c67-4703-b99d-39704562a5f7 - diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Catalogs/Products/Forms/ListForm/Form.form b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Catalogs/Products/Forms/ListForm/Form.form deleted file mode 100644 index 3b886ad1..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Catalogs/Products/Forms/ListForm/Form.form +++ /dev/null @@ -1,669 +0,0 @@ - - - - ListSettingsComposerUserSettings - 1 - true - true - - true - - - <key>en</key> - <value>User settings group</value> - - false - - ListSettingsComposerUserSettingsExtendedTooltip - 2 - true - true - - true - - Label - true - true - - Left - - - UsualGroup - - Vertical - WeakSeparation - true - true - Auto - Auto - - - - List - 3 - true - true - - true - - - List - - true - None - - Ref - 16 - true - true - - - List.Ref - - true - - RefExtendedTooltip - 18 - true - true - - true - - Label - true - true - - Left - - - - RefContextMenu - 17 - true - true - - true - - true - - LabelField - Enter - true - Left - true - - true - true - - - - Code - 19 - true - true - - true - - - List.Code - - - CodeExtendedTooltip - 21 - true - true - - true - - Label - true - true - - Left - - - - CodeContextMenu - 20 - true - true - - true - - true - - LabelField - Enter - true - Left - true - - true - true - - - - Description - 22 - true - true - - true - - - List.Description - - - DescriptionExtendedTooltip - 24 - true - true - - true - - Label - true - true - - Left - - - - DescriptionContextMenu - 23 - true - true - - true - - true - - LabelField - Enter - true - Left - true - - true - true - - - - DeletionMark - 25 - true - true - - true - - - List.DeletionMark - - - DeletionMarkExtendedTooltip - 27 - true - true - - true - - Label - true - true - - Left - - - - DeletionMarkContextMenu - 26 - true - true - - true - - true - - LabelField - Enter - true - Left - true - - true - true - - - - SKU - 28 - true - true - - true - - - List.SKU - - - SKUExtendedTooltip - 30 - true - true - - true - - Label - true - true - - Left - - - - SKUContextMenu - 29 - true - true - - true - - true - - LabelField - Enter - true - Left - true - - true - true - - - - Unknown - 31 - true - true - - true - - - List.Unknown - - - SKU1ExtendedTooltip - 33 - true - true - - true - - Label - true - true - - Left - - - - SKU1ContextMenu - 32 - true - true - - true - - true - - LabelField - Enter - true - Left - true - - true - true - - - None - - ListCommandBar - 5 - true - true - - true - - Left - - - true - true - - true - - ListSearchString - 7 - - ListSearchStringExtendedTooltip - 9 - true - true - - true - - Label - true - true - - Left - - - - ListSearchStringContextMenu - 8 - true - true - - true - - true - - ListSearchString - - true - - - - true - true - - true - - ListViewStatus - 10 - - ListViewStatusExtendedTooltip - 12 - true - true - - true - - Label - true - true - - Left - - - - ListViewStatusContextMenu - 11 - true - true - - true - - true - - ViewStatusAddition - ListViewStatus - - true - - - - true - true - - true - - ListSearchControl - 13 - - ListSearchControlExtendedTooltip - 15 - true - true - - true - - Label - true - true - - Left - - - - ListSearchControlContextMenu - 14 - true - true - - true - - true - - SearchControlAddition - List - - true - - - - ListExtendedTooltip - 6 - true - true - - true - - Label - true - true - - Left - - - - ListContextMenu - 4 - true - true - - true - - true - - true - true - true - true - true - MultiRow -
true
- 1 - 1 - AutoUse - AutoUse - true - true - true - Auto - Auto - ExpandTopLevel - true - true - true - true - AsFileRef - - List.DefaultPicture - - - 60 - - 0001-01-01T00:00:00 - 0001-01-01T00:00:00 - - - true - ListSettingsComposerUserSettings - - - - Current - 34 - true - true - - true - - - Items.List.CurrentData.SKU - - - CurrentExtendedTooltip - 36 - true - true - - true - - Label - true - true - - Left - - - - CurrentContextMenu - 35 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - CurrentUnknown - 37 - - <key>en</key> - <value>Field1</value> - - true - true - - true - - - Items.List.CurrentData.Unknown - - - CurrentUnknownExtendedTooltip - 39 - true - true - - true - - Label - true - true - - Left - - - - CurrentUnknownContextMenu - 38 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - FormCommandBar - -1 - true - true - - true - - Left - true - - true - true - Vertical - true - true - true - true - true - - List - 1 - - DynamicList - - - true - - - true - - - List.Ref - -
true
- - Catalog.Products - true - true - true - true - - - - - - - - diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Catalogs/Products/Products.mdo b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Catalogs/Products/Products.mdo deleted file mode 100644 index b9809100..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Catalogs/Products/Products.mdo +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - Products - - en - Products - - true - Catalog.Products.StandardAttribute.Code - Catalog.Products.StandardAttribute.Description - DontUse - Use - Managed - Use - 2 - true - 9 - 25 - String - Variable - true - true - AsDescription - InDialog - BothWays - Catalog.Products.Form.ItemForm - Catalog.Products.Form.ListForm - - SKU - - en - SKU - - - String - - 10 - - - - - - Use - Use - - - ItemForm - - en - Item form - - PersonalComputer - MobileDevice - - - ListForm - - en - List form - - PersonalComputer - MobileDevice - - diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/CommonForms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/CommonForms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss deleted file mode 100644 index ff9b465c..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/CommonForms/ListForm/Attributes/List/ExtInfo/ListSettings.dcss +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/CommonForms/ListForm/Form.form b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/CommonForms/ListForm/Form.form deleted file mode 100644 index 3e0237d6..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/CommonForms/ListForm/Form.form +++ /dev/null @@ -1,358 +0,0 @@ - - - - List - 1 - true - true - - true - - - List - - None - - ListField1 - 14 - true - true - - true - - - List.Field1 - - - ListField1ExtendedTooltip - 16 - true - true - - true - - Label - true - true - - Left - - - - ListField1ContextMenu - 15 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - ListField2 - 17 - true - true - - true - - - List.Field2 - - - ListField2ExtendedTooltip - 19 - true - true - - true - - Label - true - true - - Left - - - - ListField2ContextMenu - 18 - true - true - - true - - true - - InputField - Enter - true - Left - true - - true - true - true - true - true - true - - - - ListCommandBar - 2 - true - true - - true - - Left - true - - - true - true - - true - - ListSearchString - 5 - - ListSearchStringExtendedTooltip - 7 - true - true - - true - - Label - true - true - - Left - - - - ListSearchStringContextMenu - 6 - true - true - - true - - true - - - true - - - - true - true - - true - - ListViewStatus - 11 - - ListViewStatusExtendedTooltip - 13 - true - true - - true - - Label - true - true - - Left - - - - ListViewStatusContextMenu - 12 - true - true - - true - - true - - ViewStatusAddition - - true - - - - true - true - - true - - ListSearchControl - 8 - - ListSearchControlExtendedTooltip - 10 - true - true - - true - - Label - true - true - - Left - - - - ListSearchControlContextMenu - 9 - true - true - - true - - true - - SearchControlAddition - - true - - - - ListExtendedTooltip - 4 - true - true - - true - - Label - true - true - - Left - - - - ListContextMenu - 3 - true - true - - true - - true - - HierarchicalList - true - true - true - true - true - MultiRow -
true
- 1 - 1 - AutoUse - AutoUse - true - true - Auto - Auto - true - true - AsFileRef - - 60 - - 0001-01-01T00:00:00 - 0001-01-01T00:00:00 - - - true - - - - FormCommandBar - -1 - true - true - - true - - Left - true - - true - true - Vertical - true - true - true - true - true - - List - - <key>en</key> - <value>List</value> - - 1 - - DynamicList - - - true - - - true - - - SELECT - 1 - true - true - true - true - - Field1 - Field1 - - <localValue> - <content> - <key>en</key> - <value>Field1</value> - </content> - </localValue> - - - - - - - - - - - - - - diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/CommonForms/ListForm/ListForm.mdo b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/CommonForms/ListForm/ListForm.mdo deleted file mode 100644 index 5b337b4b..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/CommonForms/ListForm/ListForm.mdo +++ /dev/null @@ -1,10 +0,0 @@ - - - ListForm - - en - List form - - PersonalComputer - MobileDevice - diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Configuration/CommandInterface.cmi b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Configuration/CommandInterface.cmi deleted file mode 100644 index 0cf6de8a..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Configuration/CommandInterface.cmi +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Configuration/Configuration.mdo b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Configuration/Configuration.mdo deleted file mode 100644 index 069efcc2..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Configuration/Configuration.mdo +++ /dev/null @@ -1,43 +0,0 @@ - - - FormDataPath - - en - Form data path - - - - - - - - - 8.3.19 - ManagedApplication - PersonalComputer - - - true - - - OSBackup - true - - - Language.English - Managed - NotAutoFree - DontUse - DontUse - 8.3.19 - - English - - en - English - - en - - CommonForm.ListForm - Catalog.Products - diff --git a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Configuration/MainSectionCommandInterface.cmi b/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Configuration/MainSectionCommandInterface.cmi deleted file mode 100644 index 0cf6de8a..00000000 --- a/tests/com.e1c.v8codestyle.form.itests/workspace/FormDataPath/src/Configuration/MainSectionCommandInterface.cmi +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF index 011a49a0..efa0519c 100644 --- a/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF @@ -12,6 +12,6 @@ Import-Package: com._1c.g5.v8.bm.integration;version="[9.1.0,10.0.0)", com._1c.g5.v8.dt.core.platform;version="[10.3.0,11.0.0)", com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)", com.e1c.g5.v8.dt.testing.check;version="[1.0.0,2.0.0)", - com._1c.g5.v8.dt.validation.marker;version="[4.0.0,5.0.0)", + com._1c.g5.v8.dt.validation.marker;version="[5.0.0,6.0.0)", org.junit;version="[4.13.0,5.0.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.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 8f4bc976..48507eb1 100644 --- a/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF @@ -11,10 +11,10 @@ Bundle-Localization: fragment Import-Package: com._1c.g5.v8.bm.integration;version="[9.1.0,10.0.0)", com._1c.g5.v8.dt.core.platform;version="[10.3.0,11.0.0)", com._1c.g5.v8.dt.dcs.util;version="[13.0.0,14.0.0)", - com._1c.g5.v8.dt.form.model;version="[9.0.0,10.0.0)", + com._1c.g5.v8.dt.form.model;version="[10.0.0,11.0.0)", com._1c.g5.v8.dt.mcore;version="[6.0.0,7.0.0)", com._1c.g5.v8.dt.testing;version="[3.0.0,4.0.0)", - com._1c.g5.v8.dt.validation.marker;version="[4.0.0,5.0.0)", + com._1c.g5.v8.dt.validation.marker;version="[5.0.0,6.0.0)", com.e1c.g5.v8.dt.testing.check;version="[1.0.0,2.0.0)", org.junit;version="[4.13.0,5.0.0)" Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.900,4.0.0)", diff --git a/tests/com.e1c.v8codestyle.right.itests/META-INF/MANIFEST.MF b/tests/com.e1c.v8codestyle.right.itests/META-INF/MANIFEST.MF index 03fc29b4..20b5fbc9 100644 --- a/tests/com.e1c.v8codestyle.right.itests/META-INF/MANIFEST.MF +++ b/tests/com.e1c.v8codestyle.right.itests/META-INF/MANIFEST.MF @@ -14,6 +14,6 @@ Import-Package: com._1c.g5.v8.dt.core.platform;version="[10.4.0,11.0.0)", com._1c.g5.v8.dt.platform.version;version="[2.13.0,3.0.0)", com._1c.g5.v8.dt.refactoring.core;version="[3.0.300,4.0.0)", com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)", - com._1c.g5.v8.dt.validation.marker;version="[4.0.0,5.0.0)", + com._1c.g5.v8.dt.validation.marker;version="[5.0.0,6.0.0)", com.e1c.g5.v8.dt.testing.check;version="[1.0.0,2.0.0)", org.junit;version="[4.13.0,5.0.0)"