1c/v8-code-style
1
0
Fork 0
mirror of https://github.com/1C-Company/v8-code-style.git synced 2025-01-06 08:40:15 +02:00
Code Issues Releases Activity

Merge pull request #961 from 1C-Company/edt-2022-1

Browse Source 
Переход на EDT 2022.1
This commit is contained in:
Dmitriy Marmyshev 2022-06-02 16:58:36 +03:00 committed by GitHub
commit 9a30199be6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 127 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/com.e1c.v8codestyle.autosort.ui/META-INF/MANIFEST.MF
View File

@ -19,5 +19,5 @@ Import-Package: com._1c.g5.v8.dt.common;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.v8codestyle.autosort;version="[0.3.0,0.4.0)",
com.google.common.base;version="[27.0.0,28.0.0)",
com.google.inject;version="[1.3.0,2.0.0)"
com.google.common.base;version="[30.1.0,31.0.0)",
com.google.inject;version="[5.0.1,6.0.0)"

10
bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF
View File

@ -17,19 +17,19 @@ Bundle-Localization: plugin
Import-Package: com._1c.g5.v8.bm.common.collections;version="[3.0.0,4.0.0)",
com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)",
com._1c.g5.v8.bm.core.event;version="[2.0.0,3.0.0)",
com._1c.g5.v8.bm.integration;version="[9.0.0,10.0.0)",
com._1c.g5.v8.bm.integration;version="[10.0.0,11.0.0)",
com._1c.g5.v8.bm.integration.event;version="[1.0.0,2.0.0)",
com._1c.g5.v8.dt.core.bm.launch;version="[3.0.0,4.0.0)",
com._1c.g5.v8.dt.core.lifecycle;version="[7.0.0,8.0.0)",
com._1c.g5.v8.dt.core.lifecycle;version="[8.0.0,9.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.platform;version="[10.0.0,11.0.0)",
com._1c.g5.v8.dt.lifecycle;version="[3.0.0,4.0.0)",
com._1c.g5.v8.dt.metadata.mdclass;version="[8.0.0,9.0.0)",
com.e1c.v8codestyle;version="[0.3.0,0.4.0)",
com.google.common.base;version="[27.1.0,28.0.0)",
com.google.inject;version="[1.3.0,2.0.0)",
com.google.inject.binder;version="[1.3.0,2.0.0)"
com.google.common.base;version="[30.1.0,31.0.0)",
com.google.inject;version="[5.0.1,6.0.0)",
com.google.inject.binder;version="[5.0.1,6.0.0)"
Export-Package: com.e1c.v8codestyle.autosort;version="0.3.0";
uses:="org.eclipse.emf.ecore,
org.eclipse.core.runtime,

4
bundles/com.e1c.v8codestyle.bsl.ui/META-INF/MANIFEST.MF
View File

@ -46,10 +46,10 @@ Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[5.0.0,6.0
com._1c.g5.v8.dt.ui.wizards;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.bsl.check.qfix;version="[1.0.0,2.0.0)",
com.e1c.g5.v8.dt.bsl.check.qfix;version="[2.0.0,3.0.0)",
com.e1c.g5.v8.dt.check.qfix;version="[1.0.0,2.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="[2.0.0,3.0.0)",
com.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)",
com.e1c.v8codestyle.bsl;version="[0.3.0,0.4.0)",
com.e1c.v8codestyle.bsl.qfix.external;version="[0.3.0,0.4.0)",
com.e1c.v8codestyle.bsl.strict;version="[0.3.0,0.4.0)"

4
bundles/com.e1c.v8codestyle.bsl/META-INF/MANIFEST.MF
View File

@ -28,7 +28,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)",
com._1c.g5.v8.dt.bsl.model.resource.owner;version="[2.0.0,3.0.0)",
com._1c.g5.v8.dt.bsl.model.typesytem;version="[6.0.0,7.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.resource;version="[14.0.0,15.0.0)",
com._1c.g5.v8.dt.bsl.services;version="[6.0.0,7.0.0)",
com._1c.g5.v8.dt.bsl.typesystem;version="[9.0.0,10.0.0)",
com._1c.g5.v8.dt.bsl.typesystem.util;version="[9.0.0,10.0.0)",
@ -56,7 +56,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)",
com.e1c.g5.v8.dt.check.components;version="[2.0.0,3.0.0)",
com.e1c.g5.v8.dt.check.qfix;version="[1.0.0,2.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="[2.0.0,3.0.0)",
com.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)",
com.e1c.v8codestyle;version="[0.3.0,0.4.0)",
com.e1c.v8codestyle.check;version="[0.3.0,0.4.0)"
Export-Package: com.e1c.v8codestyle.bsl;version="0.3.0",

2
bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/FormModuleMissingPragmaCheck.java
View File

@ -56,7 +56,7 @@ public class FormModuleMissingPragmaCheck
builder.title(Messages.FormModuleMissingPragmaCheck_title)
.description(Messages.FormModuleMissingPragmaCheck_description)
.complexity(CheckComplexity.NORMAL)
.severity(IssueSeverity.MAJOR)
.severity(IssueSeverity.MINOR)
.issueType(IssueType.ERROR)
.extension(new StandardCheckExtension(getCheckId(), BslPlugin.PLUGIN_ID))
.module()

6
bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/check/ModuleEmptyMethodCheck.java
View File

@ -106,15 +106,17 @@ public final class ModuleEmptyMethodCheck
private boolean isMethodHasNoComment(Method method)
{
List<INode> nameNodes = NodeModelUtils.findNodesForFeature(method, McorePackage.Literals.NAMED_ELEMENT__NAME);
INode node = NodeModelUtils.findActualNodeFor(method);
if (node != null)
if (node != null && !nameNodes.isEmpty())
{
INode nameNode = nameNodes.get(0);
List<ILeafNode> allLeafNode = Lists.newArrayList(node.getLeafNodes());
for (int i = allLeafNode.size() - 1; i >= 0; --i)
{
ILeafNode leafNode = allLeafNode.get(i);
if (leafNode.getOffset() < node.getOffset())
if (leafNode.getOffset() < nameNode.getOffset())
{
break;
}

2
bundles/com.e1c.v8codestyle.bsl/src/com/e1c/v8codestyle/bsl/comment/check/DocCommentUseMinusCheck.java
View File

@ -72,7 +72,7 @@ public class DocCommentUseMinusCheck
builder.title(Messages.DocCommentUseMinusCheck_title)
.description(Messages.DocCommentUseMinusCheck_description)
.complexity(CheckComplexity.NORMAL)
.severity(IssueSeverity.MAJOR)
.severity(IssueSeverity.MINOR)
.issueType(IssueType.ERROR)
.extension(new CommonSenseCheckExtension(getCheckId(), BslPlugin.PLUGIN_ID))
.delegate(Description.class);

6
bundles/com.e1c.v8codestyle.form/META-INF/MANIFEST.MF
View File

@ -23,7 +23,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.5.0,8.0.0)",
com._1c.g5.wiring.binder;version="[1.1.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.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)",
com.e1c.v8codestyle.check;version="[0.3.0,0.4.0)",
com.google.common.base;version="[27.1.0,28.0.0)",
com.google.inject;version="[1.3.0,2.0.0)"
com.google.common.base;version="[30.1.0,31.0.0)",
com.google.inject;version="[5.0.1,6.0.0)"

4
bundles/com.e1c.v8codestyle.md.ui/META-INF/MANIFEST.MF
View File

@ -27,5 +27,5 @@ Import-Package: com._1c.g5.v8.dt.common;version="[6.4.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.v8codestyle.md;version="[0.3.0,0.4.0)",
com.google.common.base;version="[27.0.0,28.0.0)",
com.google.inject;version="[1.3.0,2.0.0)"
com.google.common.base;version="[30.1.0,31.0.0)",
com.google.inject;version="[5.0.1,6.0.0)"

6
bundles/com.e1c.v8codestyle.md/META-INF/MANIFEST.MF
View File

@ -25,8 +25,8 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.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="[2.0.0,3.0.0)",
com.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)",
com.e1c.v8codestyle.check;version="[0.3.0,0.4.0)",
com.google.common.base;version="[27.0.0,28.0.0)",
com.google.inject;version="[1.3.0,2.0.0)"
com.google.common.base;version="[30.1.0,31.0.0)",
com.google.inject;version="[5.0.1,6.0.0)"
Export-Package: com.e1c.v8codestyle.md;version="0.3.0"

15
bundles/com.e1c.v8codestyle.md/src/com/e1c/v8codestyle/md/check/MdListObjectPresentationCheck.java
View File

@ -24,6 +24,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.ecore.EStructuralFeature;
import com._1c.g5.v8.dt.common.StringUtils;
import com._1c.g5.v8.dt.core.platform.IExtensionProject;
import com._1c.g5.v8.dt.core.platform.IV8Project;
import com._1c.g5.v8.dt.core.platform.IV8ProjectManager;
import com._1c.g5.v8.dt.metadata.mdclass.BasicDbObject;
@ -119,6 +120,19 @@ public class MdListObjectPresentationCheck
IV8Project project = v8ProjectManager.getProject(mdObject);
Language language = project.getDefaultLanguage();
if (language == null)
{
if (!project.getLanguages().isEmpty())
{
language = project.getLanguages().iterator().next();
}
else if (project instanceof IExtensionProject && ((IExtensionProject)project).getParent() != null)
{
language = ((IExtensionProject)project).getParent().getDefaultLanguage();
}
}
if (monitor.isCanceled() || language == null)
{
return;
@ -148,7 +162,6 @@ public class MdListObjectPresentationCheck
Messages.MdListObjectPresentationCheck_Neither_Object_presentation_nor_List_presentation_is_not_filled;
resultAceptor.addIssue(message, feature);
}
}
}

22
bundles/com.e1c.v8codestyle.md/src/com/e1c/v8codestyle/md/check/MdStandardAttributeSynonymEmpty.java
View File

@ -30,9 +30,11 @@ import org.eclipse.emf.ecore.EStructuralFeature;
import com._1c.g5.v8.bm.core.IBmObject;
import com._1c.g5.v8.bm.core.event.BmSubEvent;
import com._1c.g5.v8.dt.common.StringUtils;
import com._1c.g5.v8.dt.core.platform.IExtensionProject;
import com._1c.g5.v8.dt.core.platform.IV8Project;
import com._1c.g5.v8.dt.core.platform.IV8ProjectManager;
import com._1c.g5.v8.dt.metadata.mdclass.Catalog;
import com._1c.g5.v8.dt.metadata.mdclass.Language;
import com._1c.g5.v8.dt.metadata.mdclass.ObjectBelonging;
import com._1c.g5.v8.dt.metadata.mdclass.StandardAttribute;
import com.e1c.g5.v8.dt.check.CheckComplexity;
@ -97,21 +99,33 @@ public class MdStandardAttributeSynonymEmpty
builder.topObject(CATALOG).containment(STANDARD_ATTRIBUTE).features(STANDARD_ATTRIBUTE__SYNONYM);
builder.topObject(CATALOG).checkTop().features(FEATURES.toArray(new EStructuralFeature[0]));
}
@Override
protected void check(Object object, ResultAcceptor resultAceptor, ICheckParameters parameters,
IProgressMonitor monitor)
{
EObject eObject = (EObject)object;
IV8Project project = v8ProjectManager.getProject(eObject);
String languageCode = project.getDefaultLanguage().getLanguageCode();
if (monitor.isCanceled())
Language language = project.getDefaultLanguage();
if (language == null)
{
if (!project.getLanguages().isEmpty())
{
language = project.getLanguages().iterator().next();
}
else if (project instanceof IExtensionProject && ((IExtensionProject)project).getParent() != null)
{
language = ((IExtensionProject)project).getParent().getDefaultLanguage();
}
}
if (monitor.isCanceled() || language == null)
{
return;
}
String languageCode = language.getLanguageCode();
if (object instanceof StandardAttribute)
{

2
bundles/com.e1c.v8codestyle.ql/META-INF/MANIFEST.MF
View File

@ -28,4 +28,4 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.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.e1c.v8codestyle.check;version="[0.3.0,0.4.0)",
com.google.inject;version="[1.3.0,2.0.0)"
com.google.inject;version="[5.0.1,6.0.0)"

8
bundles/com.e1c.v8codestyle.right/META-INF/MANIFEST.MF
View File

@ -15,11 +15,11 @@ Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)",
com._1c.g5.v8.bm.core.event;version="[2.1.0,3.0.0)",
com._1c.g5.v8.bm.integration;version="[9.0.0,10.0.0)",
com._1c.g5.v8.bm.integration;version="[10.0.0,11.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.mcore;version="[6.0.0,7.0.0)",
com._1c.g5.v8.dt.md;version="[16.0.0,17.0.0)",
com._1c.g5.v8.dt.md;version="[17.0.0,18.0.0)",
com._1c.g5.v8.dt.metadata.mdclass;version="[8.0.0,9.0.0)",
com._1c.g5.v8.dt.rights.model;version="[4.0.0,5.0.0)",
com._1c.g5.v8.dt.rights.model.util;version="[6.0.0,7.0.0)",
@ -29,6 +29,6 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.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="[2.0.0,3.0.0)",
com.e1c.g5.v8.dt.check.settings;version="[3.0.0,4.0.0)",
com.e1c.v8codestyle.check;version="[0.3.0,0.4.0)",
com.google.inject;version="[1.3.0,2.0.0)"
com.google.inject;version="[5.0.1,6.0.0)"

2
bundles/com.e1c.v8codestyle.ui/META-INF/MANIFEST.MF
View File

@ -23,4 +23,4 @@ Import-Package: com._1c.g5.v8.dt.common;version="[6.4.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.v8codestyle;version="[0.3.0,0.4.0)",
com.google.inject;version="[1.3.0,2.0.0)"
com.google.inject;version="[5.0.1,6.0.0)"

4
bundles/com.e1c.v8codestyle/META-INF/MANIFEST.MF
View File

@ -19,7 +19,7 @@ Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.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",
com.e1c.g5.v8.dt.check.settings;version="1.0.0",
com.google.inject;version="[1.3.0,2.0.0)",
com.google.inject.binder;version="[1.3.0,2.0.0)"
com.google.inject;version="[5.0.1,6.0.0)",
com.google.inject.binder;version="[5.0.1,6.0.0)"
Export-Package: com.e1c.v8codestyle;version="0.3.0",
com.e1c.v8codestyle.check;version="0.3.0"

31
targets/default/default.target
View File

@ -13,7 +13,7 @@
<!-- EDT -->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2021.3/"/>
<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2022.1/"/>
<unit id="com._1c.g5.aef.feature.feature.group" version="0.0.0"/>
<unit id="com._1c.g5.commons.feature.group" version="0.0.0"/>
<unit id="com._1c.g5.edt.license.feature.group" version="0.0.0"/>
@ -80,7 +80,6 @@
<unit id="org.eclipse.emf.validation.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.validation.ocl.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
<unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.core.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.extras.feature.feature.group" version="0.0.0"/>
@ -116,13 +115,37 @@
<!-- LIBS -->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.mockito" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/>
<unit id="org.apache.xalan" version="2.7.2.v20201124-1837"/>
<unit id="org.apache.xalan.source" version="2.7.2.v20201124-1837"/>
<unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.script.source" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec.source" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.ext.source" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.transcoder.source" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.transcoder" version="1.14.0.v20210324-0332"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
</location>
<!-- ORBIT Guava 30.1.0-->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
<unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
</location>
<!-- Eclipse -->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<repository id="eclipse_repository" location="https://download.eclipse.org/releases/2020-06/"/>
<unit id="org.eclipse.epp.mpc.core" version="0.0.0"/>
<unit id="org.eclipse.epp.mpc.ui" version="0.0.0"/>
<unit id="org.eclipse.epp.mpc.ui.css" version="0.0.0"/>
<unit id="org.eclipse.epp.mpc.help.ui" version="0.0.0"/>
<unit id="org.eclipse.equinox.ds" version="1.6.100.v20191001-1333"/>
<repository id="eclipse_repository" location="https://download.eclipse.org/releases/2022-03/"/>
</location>
</locations>

27
targets/develop/develop.target
View File

@ -13,7 +13,7 @@
<!-- EDT -->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2021.3/"/>
<repository id="dt_repository" location="https://edt.1c.ru/downloads/releases/ruby/2022.1/"/>
<unit id="com._1c.g5.aef.feature.feature.group" version="0.0.0"/>
<unit id="com._1c.g5.commons.feature.group" version="0.0.0"/>
<unit id="com._1c.g5.edt.license.feature.group" version="0.0.0"/>
@ -80,7 +80,6 @@
<unit id="org.eclipse.emf.validation.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.validation.ocl.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
<unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.core.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.extras.feature.feature.group" version="0.0.0"/>
@ -116,7 +115,19 @@
<!-- LIBS -->
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.mockito" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/>
<unit id="org.apache.xalan" version="2.7.2.v20201124-1837"/>
<unit id="org.apache.xalan.source" version="2.7.2.v20201124-1837"/>
<unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.script.source" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.codec.source" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.ext" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.ext.source" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.transcoder.source" version="1.14.0.v20210324-0332"/>
<unit id="org.apache.batik.transcoder" version="1.14.0.v20210324-0332"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
</location>
<!-- Eclipse -->
@ -124,7 +135,13 @@
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<!-- Plug-in Spy -->
<unit id="org.eclipse.pde.runtime" version="0.0.0"/>
<repository id="eclipse_repository" location="https://download.eclipse.org/releases/2020-06/"/>
<!-- Customized MPC -->
<unit id="org.eclipse.epp.mpc.core" version="0.0.0"/>
<unit id="org.eclipse.epp.mpc.ui" version="0.0.0"/>
<unit id="org.eclipse.epp.mpc.ui.css" version="0.0.0"/>
<unit id="org.eclipse.epp.mpc.help.ui" version="0.0.0"/>
<unit id="org.eclipse.equinox.ds" version="1.6.100.v20191001-1333"/>
<repository id="eclipse_repository" location="https://download.eclipse.org/releases/2022-03/"/>
</location>
<!-- XText Tools: https://github.com/OLibutzki/xtext.tools -->
@ -138,4 +155,4 @@
<environment>
<nl>en_US</nl>
</environment>
</target>
</target>

6
tests/com.e1c.v8codestyle.bsl.itests/resources/module-empty-method.bsl
View File

@ -6,3 +6,9 @@ EndProcedure
Procedure ModuleEmptyMethodCheck()
EndProcedure
&AtClient
//
Procedure Command1(Command)
EndProcedure

6
tests/com.e1c.v8codestyle.bsl.itests/src/com/e1c/v8codestyle/bsl/check/itests/ModuleEmptyMethodCheckTest.java
View File

@ -43,9 +43,11 @@ public class ModuleEmptyMethodCheckTest
updateModule(FOLDER_RESOURCE + "module-empty-method.bsl");
List<Marker> markers = getModuleMarkers();
assertEquals(1, markers.size());
assertEquals(2, markers.size());
Marker marker = markers.get(0);
assertEquals("6", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
}
marker = markers.get(1);
assertEquals("12", marker.getExtraInfo().get(IExtraInfoKeys.TEXT_EXTRA_INFO_LINE_KEY));
}
}

2
tests/com.e1c.v8codestyle.form.itests/META-INF/MANIFEST.MF
View File

@ -8,7 +8,7 @@ Fragment-Host: com.e1c.v8codestyle.form;bundle-version="[0.3.0,0.4.0)"
Automatic-Module-Name: com.e1c.v8codestyle.form.itests
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: fragment
Import-Package: com._1c.g5.v8.bm.integration;version="[9.1.0,10.0.0)",
Import-Package: com._1c.g5.v8.bm.integration;version="[10.0.0,11.0.0)",
com._1c.g5.v8.dt.core.platform;version="[10.3.0,11.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)",

2
tests/com.e1c.v8codestyle.md.itests/META-INF/MANIFEST.MF
View File

@ -8,7 +8,7 @@ Fragment-Host: com.e1c.v8codestyle.md;bundle-version="[0.3.0,0.4.0)"
Automatic-Module-Name: com.e1c.v8codestyle.md.itests
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: fragment
Import-Package: com._1c.g5.v8.bm.integration;version="[9.1.0,10.0.0)",
Import-Package: com._1c.g5.v8.bm.integration;version="[10.0.0,11.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)",

2
tests/com.e1c.v8codestyle.ql.itests/META-INF/MANIFEST.MF
View File

@ -8,7 +8,7 @@ Fragment-Host: com.e1c.v8codestyle.ql;bundle-version="[0.3.0,0.4.0)"
Automatic-Module-Name: com.e1c.v8codestyle.ql.itests
Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: fragment
Import-Package: com._1c.g5.v8.bm.integration;version="[9.1.0,10.0.0)",
Import-Package: com._1c.g5.v8.bm.integration;version="[10.0.0,11.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="[10.0.0,11.0.0)",