mirror of
https://github.com/1C-Company/v8-code-style.git
synced 2024-11-28 17:41:06 +02:00
Поднятие версий зависимостей
Дополнительная адаптация API
This commit is contained in:
Alexander Tretyakevich
parent
882180eda1
commit
a8b026b556
@ -14,16 +14,16 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Automatic-Module-Name: com.e1c.v8codestyle.autosort
|
||||
Bundle-ActivationPolicy: lazy
|
||||
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="[10.0.0,11.0.0)",
|
||||
com._1c.g5.v8.bm.integration.event;version="[1.0.0,2.0.0)",
|
||||
Import-Package: com._1c.g5.v8.bm.common.collections;version="[4.0.0,5.0.0)",
|
||||
com._1c.g5.v8.bm.core;version="[8.0.0,9.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.bm.integration.event;version="[2.0.0,3.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="[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.platform;version="[10.0.0,11.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.metadata.mdclass;version="[8.0.0,9.0.0)",
|
||||
com.e1c.v8codestyle;version="[0.5.0,0.6.0)",
|
||||
|
||||
@ -453,7 +453,7 @@ public class SortService
|
||||
return result;
|
||||
}
|
||||
|
||||
Iterable<EClass> eClassIterator = transaction.getTopObjectEClasses();
|
||||
Iterator<EClass> eClassIterator = transaction.getTopObjectEClasses();
|
||||
Map<EClass, List<EReference>> sortListRefs = getSubordinateListsToSort(eClassIterator, project);
|
||||
|
||||
appendSubordinateObjects(result, sortListRefs, transaction, m);
|
||||
@ -481,12 +481,13 @@ public class SortService
|
||||
}
|
||||
}
|
||||
|
||||
private Map<EClass, List<EReference>> getSubordinateListsToSort(Iterable<EClass> eClassIterator,
|
||||
private Map<EClass, List<EReference>> getSubordinateListsToSort(Iterator<EClass> eClassIterator,
|
||||
IProject project)
|
||||
{
|
||||
Map<EClass, List<EReference>> sortListRefs = new HashMap<>();
|
||||
for (EClass topObjectEClass : eClassIterator)
|
||||
while (eClassIterator.hasNext())
|
||||
{
|
||||
EClass topObjectEClass = eClassIterator.next();
|
||||
if (topObjectEClass.equals(CONFIGURATION) || !MD_OBJECT.isSuperTypeOf(topObjectEClass))
|
||||
{
|
||||
continue;
|
||||
|
||||
@ -20,33 +20,33 @@ Automatic-Module-Name: com.e1c.v8codestyle.bsl.ui
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Localization: plugin
|
||||
Import-Package: com._1c.g5.ides.ui.texteditor.xtext.embedded;version="[5.0.0,6.0.0)",
|
||||
com._1c.g5.v8.bm.core;version="[7.5.0,8.0.0)",
|
||||
com._1c.g5.v8.bm.core;version="[8.0.0,9.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.documentation.comment;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.services;version="[6.0.0,7.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.services;version="[7.0.0,8.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.ui;version="[9.0.0,10.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.ui.contentassist;version="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.ui.editor;version="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.ui.menu;version="[6.0.0,7.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.ui.quickfix;version="[4.1.0,5.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.util;version="[7.0.0,8.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.util;version="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.dt.common;version="[6.0.0,7.0.0)",
|
||||
com._1c.g5.v8.dt.core.filesystem;version="[5.0.0,6.0.0)",
|
||||
com._1c.g5.v8.dt.core.filesystem;version="[6.0.0,7.0.0)",
|
||||
com._1c.g5.v8.dt.core.model;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.core.platform;version="[11.0.0,12.0.0)",
|
||||
com._1c.g5.v8.dt.lcore.ui.editor;version="[2.3.0,3.0.0)",
|
||||
com._1c.g5.v8.dt.lcore.ui.texteditor;version="[1.1.0,2.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;version="[7.0.0,8.0.0)",
|
||||
com._1c.g5.v8.dt.metadata.mdclass;version="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.dt.theming.ui.util;version="[1.0.0,2.0.0)",
|
||||
com._1c.g5.v8.dt.ui.util;version="[6.0.0,7.0.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="[2.0.0,3.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="[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="[3.0.0,4.0.0)",
|
||||
|
||||
@ -17,33 +17,35 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Automatic-Module-Name: com.e1c.v8codestyle.bsl
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)",
|
||||
Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.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.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.documentation.comment;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.resource.owner;version="[2.0.0,3.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="[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)",
|
||||
com._1c.g5.v8.dt.bsl.util;version="[7.0.0,8.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.validation;version="[16.0.0,17.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.resource;version="[15.0.0,16.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.services;version="[7.0.0,8.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.typesystem;version="[10.0.0,11.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.typesystem.util;version="[10.0.0,11.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.util;version="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.dt.bsl.validation;version="[17.0.0,18.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.core.platform;version="[11.0.0,12.0.0)",
|
||||
com._1c.g5.v8.dt.form.model;version="[11.0.0,12.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;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="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.dt.platform;version="[6.0.0,7.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)",
|
||||
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.bsl.check.qfix;version="[1.0.0,3.0.0)",
|
||||
com.e1c.g5.dt.core.api.naming;version="1.0.0",
|
||||
com.e1c.g5.dt.core.api.platform;version="[1.1.0,2.0.0)",
|
||||
com.e1c.g5.v8.dt.bsl.check;version="[2.0.0,3.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="[1.0.0,2.0.0)",
|
||||
|
||||
@ -90,6 +90,11 @@ public class CommonModuleNamedSelfReferenceCheck
|
||||
return false;
|
||||
}
|
||||
CommonModule commonModule = (CommonModule)module.getOwner();
|
||||
if (commonModule == null)
|
||||
{
|
||||
// To support partially-inconsistent models
|
||||
return false;
|
||||
}
|
||||
return (commonModule.getReturnValuesReuse() == ReturnValuesReuse.DONT_USE)
|
||||
&& StringUtils.equals(commonModule.getName(), source.getName());
|
||||
}
|
||||
|
||||
@ -31,10 +31,14 @@ import com._1c.g5.v8.dt.bsl.model.FormalParam;
|
||||
import com._1c.g5.v8.dt.bsl.model.Function;
|
||||
import com._1c.g5.v8.dt.bsl.resource.TypesComputer;
|
||||
import com._1c.g5.v8.dt.common.StringUtils;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com._1c.g5.v8.dt.mcore.Method;
|
||||
import com._1c.g5.v8.dt.mcore.Parameter;
|
||||
import com._1c.g5.v8.dt.mcore.Property;
|
||||
import com._1c.g5.v8.dt.mcore.TypeItem;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.bsl.check.DocumentationCommentBasicDelegateCheck;
|
||||
|
||||
/**
|
||||
@ -45,6 +49,18 @@ import com.e1c.g5.v8.dt.bsl.check.DocumentationCommentBasicDelegateCheck;
|
||||
public abstract class AbstractDocCommentTypeCheck
|
||||
extends DocumentationCommentBasicDelegateCheck
|
||||
{
|
||||
/**
|
||||
* Constructs an instance
|
||||
*
|
||||
* @param resourceLookup
|
||||
* @param namingService
|
||||
* @param bmModelManager
|
||||
*/
|
||||
protected AbstractDocCommentTypeCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the link part from description only if the link is single element of the description.
|
||||
@ -144,22 +160,24 @@ public abstract class AbstractDocCommentTypeCheck
|
||||
* @param linkPart the link part, cannot be {@link null}.
|
||||
* @param scopeProvider the scope provider, cannot be {@link null}.
|
||||
* @param context the context, cannot be {@link null}.
|
||||
* @param typeComputationContext the type computation context, cannot be {@link null}.
|
||||
* @return the last object of link part
|
||||
*/
|
||||
protected Optional<EObject> getLinkPartLastObject(LinkPart linkPart, IScopeProvider scopeProvider, EObject context)
|
||||
protected Optional<EObject> getLinkPartLastObject(LinkPart linkPart, IScopeProvider scopeProvider, EObject context,
|
||||
BmOperationContext typeComputationContext)
|
||||
{
|
||||
// get object of last segment of the link to method/parameter,
|
||||
// without final brackets "(See ModuleName.MethodName.)", or witn ending dot "See ModuleName.MethodName."
|
||||
if (linkPart.getPartsWithOffset().size() > 1 && (linkPart.getInitialContent().startsWith("(") //$NON-NLS-1$
|
||||
|| (linkPart.getPartsWithOffset().get(linkPart.getPartsWithOffset().size() - 1)).getFirst().isEmpty()))
|
||||
{
|
||||
return Optional.ofNullable(
|
||||
linkPart.getActualObjectForPart(linkPart.getPartsWithOffset().size() - 2, scopeProvider, context));
|
||||
return Optional.ofNullable(linkPart.getActualObjectForPart(linkPart.getPartsWithOffset().size() - 2,
|
||||
scopeProvider, context, typeComputationContext));
|
||||
}
|
||||
else
|
||||
{
|
||||
return Optional.ofNullable(
|
||||
linkPart.getActualObjectForPart(linkPart.getPartsWithOffset().size() - 1, scopeProvider, context));
|
||||
return Optional.ofNullable(linkPart.getActualObjectForPart(linkPart.getPartsWithOffset().size() - 1,
|
||||
scopeProvider, context, typeComputationContext));
|
||||
}
|
||||
}
|
||||
|
||||
@ -172,11 +190,13 @@ public abstract class AbstractDocCommentTypeCheck
|
||||
* @param linkPart the link part, cannot be {@link null}.
|
||||
* @param scopeProvider the scope provider, cannot be {@link null}.
|
||||
* @param context the context, cannot be {@link null}.
|
||||
* @param typeComputationContext the type computation context, cannot be {@link null}.
|
||||
* @return true, if the object of link part is exist
|
||||
*/
|
||||
protected boolean isLinkPartObjectExist(LinkPart linkPart, IScopeProvider scopeProvider, EObject context)
|
||||
protected boolean isLinkPartObjectExist(LinkPart linkPart, IScopeProvider scopeProvider, EObject context,
|
||||
BmOperationContext typeComputationContext)
|
||||
{
|
||||
Optional<EObject> optional = getLinkPartLastObject(linkPart, scopeProvider, context);
|
||||
Optional<EObject> optional = getLinkPartLastObject(linkPart, scopeProvider, context, typeComputationContext);
|
||||
if (optional.isPresent())
|
||||
{
|
||||
EObject object = optional.get();
|
||||
|
||||
@ -23,7 +23,11 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection.LinkContainsTypeDefinition;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection.TypeDefinition;
|
||||
import com._1c.g5.v8.dt.common.StringUtils;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com._1c.g5.v8.dt.platform.IEObjectTypeNames;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.bsl.check.DocumentationCommentBasicDelegateCheck;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
@ -31,6 +35,7 @@ import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueType;
|
||||
import com.e1c.v8codestyle.check.StandardCheckExtension;
|
||||
import com.e1c.v8codestyle.internal.bsl.BslPlugin;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
/**
|
||||
* Check type definition that collection type (like array, map etc.) has type of contain item.
|
||||
@ -57,6 +62,20 @@ public class CollectionTypeDefinitionCheck
|
||||
"FixedCollection", "ФиксированнаяКоллекция")); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
//@formatter:on
|
||||
|
||||
/**
|
||||
* Constructs an instance
|
||||
*
|
||||
* @param resourceLookup
|
||||
* @param namingService
|
||||
* @param bmModelManager
|
||||
*/
|
||||
@Inject
|
||||
public CollectionTypeDefinitionCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCheckId()
|
||||
{
|
||||
@ -79,7 +98,8 @@ public class CollectionTypeDefinitionCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
if (object instanceof LinkContainsTypeDefinition)
|
||||
{
|
||||
|
||||
@ -22,6 +22,10 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment.Description;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.TextPart;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.bsl.check.DocumentationCommentBasicDelegateCheck;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
@ -29,6 +33,7 @@ import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueType;
|
||||
import com.e1c.v8codestyle.check.CommonSenseCheckExtension;
|
||||
import com.e1c.v8codestyle.internal.bsl.BslPlugin;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
/**
|
||||
* In Description of Documentation comment model should use only hyphen-minus symbol instead of usual hyphen
|
||||
@ -60,6 +65,13 @@ public class DocCommentUseMinusCheck
|
||||
|
||||
private static final int SHOW_PREV_SYMBOLS = 7;
|
||||
|
||||
@Inject
|
||||
public DocCommentUseMinusCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCheckId()
|
||||
{
|
||||
@ -80,7 +92,8 @@ public class DocCommentUseMinusCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
if (object.getParent() instanceof BslDocumentationComment)
|
||||
{
|
||||
|
||||
@ -26,7 +26,10 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.BslMultiLineCommentDocumentati
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.LinkPart;
|
||||
import com._1c.g5.v8.dt.bsl.model.Function;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
@ -59,14 +62,18 @@ public class ExportFunctionReturnSectionCheck
|
||||
* Instantiates a new check of export function return section.
|
||||
*
|
||||
* @param resourceLookup the resource lookup service, cannot be {@code null}.
|
||||
* @param namingService
|
||||
* @param bmModelManager
|
||||
* @param bslPreferences the BSL preferences service, cannot be {@code null}.
|
||||
* @param commentProvider the comment provider service, cannot be {@code null}.
|
||||
* @param scopeProvider the scope provider service, cannot be {@code null}.
|
||||
*/
|
||||
@Inject
|
||||
public ExportFunctionReturnSectionCheck(IResourceLookup resourceLookup, IBslPreferences bslPreferences,
|
||||
public ExportFunctionReturnSectionCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager, IBslPreferences bslPreferences,
|
||||
BslMultiLineCommentDocumentationProvider commentProvider, IScopeProvider scopeProvider)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
this.resourceLookup = resourceLookup;
|
||||
this.bslPreferences = bslPreferences;
|
||||
this.commentProvider = commentProvider;
|
||||
@ -93,7 +100,8 @@ public class ExportFunctionReturnSectionCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
if (!(root.getMethod() instanceof Function) || !root.getMethod().isExport())
|
||||
{
|
||||
@ -109,12 +117,11 @@ public class ExportFunctionReturnSectionCheck
|
||||
DocumentationCommentProperties props = bslPreferences.getDocumentCommentProperties(project);
|
||||
|
||||
docComment = BslCommentUtils.getLinkPartCommentContent(linkPart, scopeProvider, commentProvider,
|
||||
props.oldCommentFormat(), root.getMethod());
|
||||
props.oldCommentFormat(), root.getMethod(), typeComputationContext);
|
||||
}
|
||||
|
||||
if (docComment == null || docComment.getReturnSection() == null
|
||||
|| isTypeEmptyAndNoLink(docComment.getReturnSection().getReturnTypes(),
|
||||
docComment.getReturnSection().getDescription()))
|
||||
if (docComment == null || docComment.getReturnSection() == null || isTypeEmptyAndNoLink(
|
||||
docComment.getReturnSection().getReturnTypes(), docComment.getReturnSection().getDescription()))
|
||||
{
|
||||
resultAceptor.addIssue(Messages.ExportFunctionReturnSectionCheck_Export_function_return_section_required,
|
||||
root.getMethod(), NAMED_ELEMENT__NAME);
|
||||
|
||||
@ -24,6 +24,10 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.model.PreprocessorItem;
|
||||
import com._1c.g5.v8.dt.bsl.model.RegionPreprocessor;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
@ -31,6 +35,7 @@ import com.e1c.g5.v8.dt.check.settings.IssueType;
|
||||
import com.e1c.v8codestyle.bsl.ModuleStructureSection;
|
||||
import com.e1c.v8codestyle.check.StandardCheckExtension;
|
||||
import com.e1c.v8codestyle.internal.bsl.BslPlugin;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
/**
|
||||
* Check that comment for the export procedure (function) contains Description section
|
||||
@ -42,6 +47,13 @@ public class ExportProcedureCommentDescriptionCheck
|
||||
{
|
||||
private static final String CHECK_ID = "doc-comment-export-procedure-description-section"; //$NON-NLS-1$
|
||||
|
||||
@Inject
|
||||
public ExportProcedureCommentDescriptionCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCheckId()
|
||||
{
|
||||
@ -62,7 +74,8 @@ public class ExportProcedureCommentDescriptionCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
if (!root.getMethod().isExport())
|
||||
{
|
||||
|
||||
@ -20,6 +20,10 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection.FieldDefinition;
|
||||
import com._1c.g5.v8.dt.common.StringUtils;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.bsl.check.DocumentationCommentBasicDelegateCheck;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
@ -27,6 +31,7 @@ import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueType;
|
||||
import com.e1c.v8codestyle.check.CommonSenseCheckExtension;
|
||||
import com.e1c.v8codestyle.internal.bsl.BslPlugin;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
/**
|
||||
* Validates that field name in documentation comment is valid name (not starts with number or does not contains any
|
||||
@ -38,9 +43,15 @@ import com.e1c.v8codestyle.internal.bsl.BslPlugin;
|
||||
public class FieldDefinitionNameCheck
|
||||
extends DocumentationCommentBasicDelegateCheck
|
||||
{
|
||||
|
||||
private static final String CHECK_ID = "doc-comment-field-name"; //$NON-NLS-1$
|
||||
|
||||
@Inject
|
||||
public FieldDefinitionNameCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCheckId()
|
||||
{
|
||||
@ -61,7 +72,8 @@ public class FieldDefinitionNameCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
FieldDefinition fieldDef = (FieldDefinition)object;
|
||||
if (!StringUtils.isValidName(fieldDef.getName()))
|
||||
|
||||
@ -19,12 +19,17 @@ import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection.FieldDefinition;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueType;
|
||||
import com.e1c.v8codestyle.check.StandardCheckExtension;
|
||||
import com.e1c.v8codestyle.internal.bsl.BslPlugin;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
/**
|
||||
* Checks that field definition in documentation comment has type definition section.
|
||||
@ -36,6 +41,13 @@ public class FieldDefinitionTypeCheck
|
||||
{
|
||||
private static final String CHECK_ID = "doc-comment-field-type"; //$NON-NLS-1$
|
||||
|
||||
@Inject
|
||||
public FieldDefinitionTypeCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCheckId()
|
||||
{
|
||||
@ -56,7 +68,8 @@ public class FieldDefinitionTypeCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
FieldDefinition fieldDef = (FieldDefinition)object;
|
||||
if (isFieldTypeEmpty(fieldDef))
|
||||
|
||||
@ -28,7 +28,11 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection.FieldDefinition;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection.TypeDefinition;
|
||||
import com._1c.g5.v8.dt.common.StringUtils;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com._1c.g5.v8.dt.platform.IEObjectTypeNames;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
@ -80,8 +84,10 @@ public class FieldDefinitionTypeWithLinkRefCheck
|
||||
* @param scopeProvider the scope provider service, cannot be {@code null}.
|
||||
*/
|
||||
@Inject
|
||||
public FieldDefinitionTypeWithLinkRefCheck(IScopeProvider scopeProvider)
|
||||
public FieldDefinitionTypeWithLinkRefCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager, IScopeProvider scopeProvider)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
this.scopeProvider = scopeProvider;
|
||||
}
|
||||
|
||||
@ -107,7 +113,8 @@ public class FieldDefinitionTypeWithLinkRefCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
String parameterCollectionTypes = parameters.getString(PARAMETER_COLLECTION_TYPES);
|
||||
if (StringUtils.isBlank(parameterCollectionTypes))
|
||||
@ -120,7 +127,7 @@ public class FieldDefinitionTypeWithLinkRefCheck
|
||||
types.addAll(List.of(paramTypes));
|
||||
|
||||
FieldDefinition fieldDef = (FieldDefinition)object;
|
||||
if (isFieldTypeWithLinkRef(fieldDef, types, root.getMethod()))
|
||||
if (isFieldTypeWithLinkRef(fieldDef, types, root.getMethod(), typeComputationContext))
|
||||
{
|
||||
String message = MessageFormat.format(
|
||||
Messages.FieldDefinitionTypeWithLinkRefCheck_Field__F__use_declaration_of_complex_type_instead_of_link,
|
||||
@ -130,12 +137,13 @@ public class FieldDefinitionTypeWithLinkRefCheck
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isFieldTypeWithLinkRef(FieldDefinition fieldDef, Set<String> types, EObject context)
|
||||
private boolean isFieldTypeWithLinkRef(FieldDefinition fieldDef, Set<String> types, EObject context,
|
||||
BmOperationContext typeComputationContext)
|
||||
{
|
||||
if (fieldDef.getTypeSections().size() == 1 && isComplexType(fieldDef.getTypeSections().get(0), types))
|
||||
{
|
||||
LinkPart linkPart = getSingleLinkPartForField(fieldDef);
|
||||
return linkPart != null && isLinkPartObjectExist(linkPart, scopeProvider, context);
|
||||
return linkPart != null && isLinkPartObjectExist(linkPart, scopeProvider, context, typeComputationContext);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -28,9 +28,12 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.BslMultiLineCommentDocumentati
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.model.Function;
|
||||
import com._1c.g5.v8.dt.bsl.model.Method;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com._1c.g5.v8.dt.mcore.McorePackage;
|
||||
import com._1c.g5.v8.dt.mcore.TypeItem;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
@ -62,10 +65,11 @@ public class FunctionReturnSectionCheck
|
||||
private final IQualifiedNameConverter qualifiedNameConverter;
|
||||
|
||||
@Inject
|
||||
public FunctionReturnSectionCheck(IResourceLookup resourceLookup, IBslPreferences bslPreferences,
|
||||
IQualifiedNameConverter qualifiedNameConverter, IScopeProvider scopeProvider,
|
||||
BslMultiLineCommentDocumentationProvider commentProvider)
|
||||
public FunctionReturnSectionCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager, IBslPreferences bslPreferences, IQualifiedNameConverter qualifiedNameConverter,
|
||||
IScopeProvider scopeProvider, BslMultiLineCommentDocumentationProvider commentProvider)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
this.resourceLookup = resourceLookup;
|
||||
this.bslPreferences = bslPreferences;
|
||||
this.qualifiedNameConverter = qualifiedNameConverter;
|
||||
@ -93,7 +97,8 @@ public class FunctionReturnSectionCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
Method method = root.getMethod();
|
||||
if (!(method instanceof Function))
|
||||
@ -113,8 +118,9 @@ public class FunctionReturnSectionCheck
|
||||
|
||||
IScope typeScope = scopeProvider.getScope(method, McorePackage.Literals.TYPE_DESCRIPTION__TYPES);
|
||||
|
||||
Collection<TypeItem> computedReturnTypes = root.computeReturnTypes(typeScope, scopeProvider,
|
||||
qualifiedNameConverter, commentProvider, oldCommentFormat(root.getModule()), method);
|
||||
Collection<TypeItem> computedReturnTypes =
|
||||
root.computeReturnTypes(typeScope, scopeProvider, qualifiedNameConverter, commentProvider,
|
||||
oldCommentFormat(root.getModule()), method, typeComputationContext);
|
||||
|
||||
if (computedReturnTypes.isEmpty())
|
||||
{
|
||||
|
||||
@ -18,11 +18,16 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment.Description;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.TextPart;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.bsl.check.DocumentationCommentBasicDelegateCheck;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueType;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
/**
|
||||
* Check multi-line description of the documentation comment that last line ends on dot.
|
||||
@ -35,6 +40,13 @@ public class MultilineDescriptionEndsOnDotCheck
|
||||
|
||||
private static final String CHECK_ID = "doc-comment-description-ends-on-dot"; //$NON-NLS-1$
|
||||
|
||||
@Inject
|
||||
public MultilineDescriptionEndsOnDotCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCheckId()
|
||||
{
|
||||
@ -56,7 +68,8 @@ public class MultilineDescriptionEndsOnDotCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
Description description = (Description)object;
|
||||
|
||||
|
||||
@ -22,6 +22,10 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment.Descri
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.TextPart;
|
||||
import com._1c.g5.v8.dt.bsl.model.Procedure;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.bsl.check.DocumentationCommentBasicDelegateCheck;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
@ -29,6 +33,7 @@ import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueType;
|
||||
import com.e1c.v8codestyle.check.CommonSenseCheckExtension;
|
||||
import com.e1c.v8codestyle.internal.bsl.BslPlugin;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
/**
|
||||
* Validates any description in documentation comment that is multi-line and may contains File definition like:
|
||||
@ -52,6 +57,13 @@ public class MultilineDescriptionFieldSuggestionCheck
|
||||
private static final Pattern PATTERN_FIELD =
|
||||
Pattern.compile("^\\s*\\*+\\s*\\w+\\s*-", Pattern.UNICODE_CHARACTER_CLASS | Pattern.CASE_INSENSITIVE); //$NON-NLS-1$
|
||||
|
||||
@Inject
|
||||
public MultilineDescriptionFieldSuggestionCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCheckId()
|
||||
{
|
||||
@ -72,7 +84,8 @@ public class MultilineDescriptionFieldSuggestionCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
Description description = (Description)object;
|
||||
|
||||
|
||||
@ -25,6 +25,10 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.TextPart;
|
||||
import com._1c.g5.v8.dt.bsl.model.FormalParam;
|
||||
import com._1c.g5.v8.dt.common.StringUtils;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.bsl.check.DocumentationCommentBasicDelegateCheck;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
@ -32,6 +36,7 @@ import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueType;
|
||||
import com.e1c.v8codestyle.check.CommonSenseCheckExtension;
|
||||
import com.e1c.v8codestyle.internal.bsl.BslPlugin;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
/**
|
||||
* Validates method description in documentation comment that is multi-line and may contains parameter definition like:
|
||||
@ -49,6 +54,13 @@ public class MultilineDescriptionParameterSuggestionCheck
|
||||
|
||||
private static final String CHECK_ID = "doc-comment-parameter-in-description-suggestion"; //$NON-NLS-1$
|
||||
|
||||
@Inject
|
||||
public MultilineDescriptionParameterSuggestionCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCheckId()
|
||||
{
|
||||
@ -69,7 +81,8 @@ public class MultilineDescriptionParameterSuggestionCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
if (root.getMethod().getFormalParams().isEmpty() || !(object.getParent() instanceof BslDocumentationComment)
|
||||
|| root.getParametersSection() != null)
|
||||
|
||||
@ -34,7 +34,10 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection.FieldDefinition;
|
||||
import com._1c.g5.v8.dt.bsl.model.FormalParam;
|
||||
import com._1c.g5.v8.dt.bsl.model.Method;
|
||||
import com._1c.g5.v8.dt.common.StringUtils;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
@ -69,10 +72,11 @@ public class ParametersSectionCheck
|
||||
private final BslMultiLineCommentDocumentationProvider commentProvider;
|
||||
|
||||
@Inject
|
||||
public ParametersSectionCheck(IResourceLookup resourceLookup, IBslPreferences bslPreferences,
|
||||
IScopeProvider scopeProvider, BslMultiLineCommentDocumentationProvider commentProvider)
|
||||
public ParametersSectionCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager, IBslPreferences bslPreferences, IScopeProvider scopeProvider,
|
||||
BslMultiLineCommentDocumentationProvider commentProvider)
|
||||
{
|
||||
super();
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
this.resourceLookup = resourceLookup;
|
||||
this.bslPreferences = bslPreferences;
|
||||
this.scopeProvider = scopeProvider;
|
||||
@ -104,7 +108,8 @@ public class ParametersSectionCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
if (root.getMethod().getFormalParams().isEmpty())
|
||||
{
|
||||
@ -113,7 +118,7 @@ public class ParametersSectionCheck
|
||||
|
||||
if (object instanceof BslDocumentationComment)
|
||||
{
|
||||
check((BslDocumentationComment)object, resultAceptor, parameters, monitor);
|
||||
check((BslDocumentationComment)object, resultAceptor, parameters, typeComputationContext, monitor);
|
||||
}
|
||||
else if (object instanceof ParametersSection)
|
||||
{
|
||||
@ -136,7 +141,7 @@ public class ParametersSectionCheck
|
||||
}
|
||||
|
||||
private void check(BslDocumentationComment object, DocumentationCommentResultAcceptor resultAceptor,
|
||||
ICheckParameters parameters, IProgressMonitor monitor)
|
||||
ICheckParameters parameters, BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
if (object.getParametersSection() != null
|
||||
|| (!object.getMethod().isExport() && parameters.getBoolean(PARAMETER_PARMA_SECT_FOR_EXPORT)))
|
||||
@ -154,7 +159,7 @@ public class ParametersSectionCheck
|
||||
DocumentationCommentProperties props = bslPreferences.getDocumentCommentProperties(project);
|
||||
|
||||
docComment = BslCommentUtils.getLinkPartCommentContent(linkPart, scopeProvider, commentProvider,
|
||||
props.oldCommentFormat(), object.getMethod());
|
||||
props.oldCommentFormat(), object.getMethod(), typeComputationContext);
|
||||
}
|
||||
if (docComment == null)
|
||||
{
|
||||
|
||||
@ -18,6 +18,10 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment.ReturnSection;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.model.Procedure;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.bsl.check.DocumentationCommentBasicDelegateCheck;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
@ -25,6 +29,7 @@ import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueType;
|
||||
import com.e1c.v8codestyle.check.CommonSenseCheckExtension;
|
||||
import com.e1c.v8codestyle.internal.bsl.BslPlugin;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
/**
|
||||
* The check validate {@link ReturnSection} of documentation comment if the method is {@link Procedure} which should not
|
||||
@ -38,6 +43,13 @@ public class ProcedureReturnSectionCheck
|
||||
|
||||
private static final String CHECK_ID = "doc-comment-procedure-return-section"; //$NON-NLS-1$
|
||||
|
||||
@Inject
|
||||
public ProcedureReturnSectionCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCheckId()
|
||||
{
|
||||
@ -58,7 +70,8 @@ public class ProcedureReturnSectionCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
ReturnSection returnSection = (ReturnSection)object;
|
||||
|
||||
|
||||
@ -17,6 +17,10 @@ import org.eclipse.core.runtime.IProgressMonitor;
|
||||
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.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.bsl.check.DocumentationCommentBasicDelegateCheck;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
@ -24,6 +28,7 @@ import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueType;
|
||||
import com.e1c.v8codestyle.check.StandardCheckExtension;
|
||||
import com.e1c.v8codestyle.internal.bsl.BslPlugin;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
/**
|
||||
* Validates that method without parameters should not have parameter section.
|
||||
@ -36,6 +41,13 @@ public class RedundantParametersSectionCheck
|
||||
{
|
||||
private static final String CHECK_ID = "doc-comment-redundant-parameter-section"; //$NON-NLS-1$
|
||||
|
||||
@Inject
|
||||
public RedundantParametersSectionCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCheckId()
|
||||
{
|
||||
@ -56,7 +68,8 @@ public class RedundantParametersSectionCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
ParametersSection parameterSection = (ParametersSection)object;
|
||||
|
||||
|
||||
@ -20,6 +20,10 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.BslDocumentationComment.Descri
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.LinkPart;
|
||||
import com._1c.g5.v8.dt.common.StringUtils;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
@ -54,14 +58,11 @@ public class RefLinkPartCheck
|
||||
|
||||
private final IScopeProvider scopeProvider;
|
||||
|
||||
/**
|
||||
* Instantiates a new reference link part check.
|
||||
*
|
||||
* @param scopeProvider the scope provider service, cannot be {@code null}.
|
||||
*/
|
||||
@Inject
|
||||
public RefLinkPartCheck(IScopeProvider scopeProvider)
|
||||
public RefLinkPartCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager, IScopeProvider scopeProvider)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
this.scopeProvider = scopeProvider;
|
||||
}
|
||||
|
||||
@ -87,7 +88,8 @@ public class RefLinkPartCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
LinkPart linkPart = (LinkPart)object;
|
||||
|
||||
|
||||
@ -25,7 +25,11 @@ import com._1c.g5.v8.dt.bsl.documentation.comment.IDescriptionPart;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection.LinkContainsTypeDefinition;
|
||||
import com._1c.g5.v8.dt.bsl.documentation.comment.TypeSection.TypeDefinition;
|
||||
import com._1c.g5.v8.dt.common.StringUtils;
|
||||
import com._1c.g5.v8.dt.core.platform.IBmModelManager;
|
||||
import com._1c.g5.v8.dt.core.platform.IResourceLookup;
|
||||
import com._1c.g5.v8.dt.mcore.McorePackage;
|
||||
import com.e1c.g5.dt.core.api.naming.INamingService;
|
||||
import com.e1c.g5.dt.core.api.platform.BmOperationContext;
|
||||
import com.e1c.g5.v8.dt.check.CheckComplexity;
|
||||
import com.e1c.g5.v8.dt.check.ICheckParameters;
|
||||
import com.e1c.g5.v8.dt.check.settings.IssueSeverity;
|
||||
@ -50,8 +54,10 @@ public class TypeDefinitionCheck
|
||||
private final IQualifiedNameConverter qualifiedNameConverter;
|
||||
|
||||
@Inject
|
||||
public TypeDefinitionCheck(IQualifiedNameConverter qualifiedNameConverter, IScopeProvider scopeProvider)
|
||||
public TypeDefinitionCheck(IResourceLookup resourceLookup, INamingService namingService,
|
||||
IBmModelManager bmModelManager, IQualifiedNameConverter qualifiedNameConverter, IScopeProvider scopeProvider)
|
||||
{
|
||||
super(resourceLookup, namingService, bmModelManager);
|
||||
this.qualifiedNameConverter = qualifiedNameConverter;
|
||||
this.scopeProvider = scopeProvider;
|
||||
}
|
||||
@ -76,7 +82,8 @@ public class TypeDefinitionCheck
|
||||
|
||||
@Override
|
||||
protected void checkDocumentationCommentObject(IDescriptionPart object, BslDocumentationComment root,
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters, IProgressMonitor monitor)
|
||||
DocumentationCommentResultAcceptor resultAceptor, ICheckParameters parameters,
|
||||
BmOperationContext typeComputationContext, IProgressMonitor monitor)
|
||||
{
|
||||
if (object instanceof LinkContainsTypeDefinition)
|
||||
{
|
||||
|
||||
@ -14,17 +14,17 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Automatic-Module-Name: com.e1c.v8codestyle.form
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Localization: plugin
|
||||
Import-Package: com._1c.g5.v8.bm.core;version="[7.5.0,8.0.0)",
|
||||
com._1c.g5.v8.bm.core.event;version="[2.1.0,3.0.0)",
|
||||
Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.bm.core.event;version="[3.0.0,4.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.core.platform;version="[11.0.0,12.0.0)",
|
||||
com._1c.g5.v8.dt.dcs.model.core;version="[2.6.0,3.0.0)",
|
||||
com._1c.g5.v8.dt.dcs.model.schema;version="[2.2.0,3.0.0)",
|
||||
com._1c.g5.v8.dt.form.model;version="[11.0.0,12.0.0)",
|
||||
com._1c.g5.v8.dt.form.model.util;version="[7.2.0,8.0.0)",
|
||||
com._1c.g5.v8.dt.form.service;version="[6.1.0,7.0.0)",
|
||||
com._1c.g5.v8.dt.form.service;version="[7.0.0,8.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.mcore;version="[7.0.0,8.0.0)",
|
||||
com._1c.g5.v8.dt.metadata.dbview;version="[4.0.0,5.0.0)",
|
||||
com._1c.g5.v8.dt.metadata.mdclass;version="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.dt.platform.version;version="[2.14.0,3.0.0)",
|
||||
|
||||
@ -19,7 +19,7 @@ Automatic-Module-Name: com.e1c.v8codestyle.md.ui
|
||||
Bundle-ActivationPolicy: lazy
|
||||
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="[10.4.0,11.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="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.dt.metadata.mdclass.util;version="[5.0.0,6.0.0)",
|
||||
|
||||
@ -12,15 +12,15 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Automatic-Module-Name: com.e1c.v8codestyle.md
|
||||
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)",
|
||||
Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.bm.core.event;version="[3.0.0,4.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.3.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.mcore.util;version="[3.13.0,4.0.0)",
|
||||
com._1c.g5.v8.dt.metadata.mdclass;version="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.dt.metadata.mdclass.util;version="[5.0.0,6.0.0)",
|
||||
com._1c.g5.v8.dt.platform;version="[6.0.0,7.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)",
|
||||
com._1c.g5.wiring;version="[2.2.0,3.0.0)",
|
||||
com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)",
|
||||
|
||||
@ -13,10 +13,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Automatic-Module-Name: com.e1c.v8codestyle.ql
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Localization: plugin
|
||||
Import-Package: com._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)",
|
||||
Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.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.mcore;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.metadata.dbview;version="4.0.0",
|
||||
com._1c.g5.v8.dt.metadata.mdclass;version="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.dt.ql.model;version="[4.0.0,5.0.0)",
|
||||
|
||||
@ -13,20 +13,21 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Automatic-Module-Name: com.e1c.v8codestyle.right
|
||||
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="[10.0.0,11.0.0)",
|
||||
com._1c.g5.v8.dt.bm.index.emf;version="[7.0.0,8.0.0)",
|
||||
Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.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.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="[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="[17.0.0,18.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="[18.0.0,19.0.0)",
|
||||
com._1c.g5.v8.dt.metadata.mdclass;version="[8.0.0,9.0.0)",
|
||||
com._1c.g5.v8.dt.platform.version;version="[2.0.0,3.0.0)",
|
||||
com._1c.g5.v8.dt.rights;version="[6.1.0,7.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)",
|
||||
com._1c.g5.v8.dt.rights.ui.editors.controllers;version="[4.0.0,5.0.0)",
|
||||
com._1c.g5.v8.dt.rights.ui.editors.controllers;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="[2.0.0,3.0.0)",
|
||||
|
||||
@ -24,8 +24,8 @@ import com._1c.g5.v8.dt.core.platform.IConfigurationProvider;
|
||||
import com._1c.g5.v8.dt.metadata.mdclass.Configuration;
|
||||
import com._1c.g5.v8.dt.platform.version.IRuntimeVersionSupport;
|
||||
import com._1c.g5.v8.dt.platform.version.Version;
|
||||
import com._1c.g5.v8.dt.rights.IRightInfosService;
|
||||
import com._1c.g5.v8.dt.rights.model.Right;
|
||||
import com._1c.g5.v8.dt.rights.ui.editors.controllers.IRightInfosService;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
import com.google.inject.Singleton;
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
*******************************************************************************/
|
||||
package com.e1c.v8codestyle.internal.right;
|
||||
|
||||
import com._1c.g5.v8.dt.rights.ui.editors.controllers.IRightInfosService;
|
||||
import com._1c.g5.v8.dt.rights.IRightInfosService;
|
||||
import com.google.inject.AbstractModule;
|
||||
|
||||
/**
|
||||
@ -23,7 +23,7 @@ import com.google.inject.AbstractModule;
|
||||
public class ServiceModule
|
||||
extends AbstractModule
|
||||
{
|
||||
private static final String SERVICE_CLASS = "com._1c.g5.v8.dt.internal.rights.ui.editors.RightsInfoService"; //$NON-NLS-1$
|
||||
private static final String SERVICE_CLASS = "com._1c.g5.v8.dt.internal.rights.RightsInfoService"; //$NON-NLS-1$
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
|
||||
@ -18,7 +18,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
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="[10.0.0,11.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.wiring;version="[2.2.0,3.0.0)",
|
||||
com._1c.g5.wiring.binder;version="[1.1.0,2.0.0)",
|
||||
|
||||
@ -11,7 +11,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._1c.g5.v8.bm.core;version="[7.0.0,8.0.0)",
|
||||
Import-Package: com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)",
|
||||
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)",
|
||||
|
||||
@ -8,13 +8,13 @@ Fragment-Host: com.e1c.v8codestyle.bsl;bundle-version="[0.5.0,0.6.0)"
|
||||
Automatic-Module-Name: com.e1c.v8codestyle.md.itests
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Bundle-Localization: fragment
|
||||
Import-Package: com._1c.g5.v8.dt.core.naming;version="[6.0.0,7.0.0)",
|
||||
com._1c.g5.v8.dt.core.platform;version="[10.0.0,11.0.0)",
|
||||
Import-Package: com._1c.g5.v8.dt.core.naming;version="[7.0.0,8.0.0)",
|
||||
com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)",
|
||||
com._1c.g5.v8.dt.form.model;version="[11.0.0,12.0.0)",
|
||||
com._1c.g5.v8.dt.md.naming;version="[5.1.0,6.0.0)",
|
||||
com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)",
|
||||
com._1c.g5.v8.dt.ui.util;version="[6.0.0,7.0.0)",
|
||||
com._1c.g5.v8.dt.ui.validation;version="[5.0.0,6.0.0)",
|
||||
com._1c.g5.v8.dt.validation.marker;version="[5.0.0,6.0.0)",
|
||||
com._1c.g5.v8.dt.validation.marker;version="[6.0.0,7.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)"
|
||||
|
||||
@ -8,17 +8,17 @@ Fragment-Host: com.e1c.v8codestyle.form;bundle-version="[0.5.0,0.6.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="[10.0.0,11.0.0)",
|
||||
com._1c.g5.v8.dt.core.naming;version="[6.0.0,7.0.0)",
|
||||
Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)",
|
||||
com._1c.g5.v8.dt.core.naming;version="[7.0.0,8.0.0)",
|
||||
com._1c.g5.v8.dt.core.platform;version="[10.3.0,11.0.0)",
|
||||
com._1c.g5.v8.dt.form.model;version="[11.0.0,12.0.0)",
|
||||
com._1c.g5.v8.dt.form.naming;version="[5.0.0,6.0.0)",
|
||||
com._1c.g5.v8.dt.mcore;version="[6.3.0,7.0.0)",
|
||||
com._1c.g5.v8.dt.mcore;version="[7.0.0,8.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.ui.util;version="[6.0.0,7.0.0)",
|
||||
com._1c.g5.v8.dt.ui.validation;version="[5.0.0,6.0.0)",
|
||||
com._1c.g5.v8.dt.validation.marker;version="[5.0.0,6.0.0)",
|
||||
com._1c.g5.v8.dt.validation.marker;version="[6.0.0,7.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)"
|
||||
|
||||
@ -8,10 +8,10 @@ Fragment-Host: com.e1c.v8codestyle.md;bundle-version="[0.5.0,0.6.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="[10.0.0,11.0.0)",
|
||||
Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.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="[5.0.0,6.0.0)",
|
||||
com._1c.g5.v8.dt.validation.marker;version="[6.0.0,7.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)"
|
||||
|
||||
@ -8,13 +8,13 @@ Fragment-Host: com.e1c.v8codestyle.ql;bundle-version="[0.5.0,0.6.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="[10.0.0,11.0.0)",
|
||||
Import-Package: com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)",
|
||||
com._1c.g5.v8.dt.core.platform;version="[10.3.0,11.0.0)",
|
||||
com._1c.g5.v8.dt.dcs.util;version="[14.0.0,15.0.0)",
|
||||
com._1c.g5.v8.dt.form.model;version="[11.0.0,12.0.0)",
|
||||
com._1c.g5.v8.dt.mcore;version="[6.0.0,7.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)",
|
||||
com._1c.g5.v8.dt.validation.marker;version="[5.0.0,6.0.0)",
|
||||
com._1c.g5.v8.dt.validation.marker;version="[6.0.0,7.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)",
|
||||
|
||||
@ -8,12 +8,12 @@ Fragment-Host: com.e1c.v8codestyle.right;bundle-version="[0.5.0,0.6.0)"
|
||||
Automatic-Module-Name: com.e1c.v8codestyle.right.itests
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Bundle-Localization: fragment
|
||||
Import-Package: com._1c.g5.v8.dt.core.platform;version="[10.4.0,11.0.0)",
|
||||
Import-Package: com._1c.g5.v8.dt.core.platform;version="[11.0.0,12.0.0)",
|
||||
com._1c.g5.v8.dt.md.refactoring.core;version="[1.0.0,2.0.0)",
|
||||
com._1c.g5.v8.dt.platform;version="[6.0.0,7.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.v8.dt.refactoring.core;version="[3.0.300,4.0.0)",
|
||||
com._1c.g5.v8.dt.refactoring.core;version="[4.0.0,5.0.0)",
|
||||
com._1c.g5.v8.dt.testing;version="[3.1.0,4.0.0)",
|
||||
com._1c.g5.v8.dt.validation.marker;version="[5.0.0,6.0.0)",
|
||||
com._1c.g5.v8.dt.validation.marker;version="[6.0.0,7.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)"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user