1c/v8-code-style
1
0
Fork 0
mirror of https://github.com/1C-Company/v8-code-style.git synced 2025-07-16 12:44:15 +02:00
Code Issues Releases Activity

#1021 Ошибка проверки md-standard-attribute-synonym-empty на проекте

Browse Source 
расширения
This commit is contained in:
Vadim Geraskin
2022-04-21 21:12:29 +07:00
parent 0043fb3aa2
commit 5296a49ae0
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 org.eclipse.emf.ecore.EStructuralFeature;
import com._1c.g5.v8.dt.common.StringUtils; 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.IV8Project;
import com._1c.g5.v8.dt.core.platform.IV8ProjectManager; import com._1c.g5.v8.dt.core.platform.IV8ProjectManager;
import com._1c.g5.v8.dt.metadata.mdclass.BasicDbObject; import com._1c.g5.v8.dt.metadata.mdclass.BasicDbObject;
@ -119,6 +120,19 @@ public class MdListObjectPresentationCheck
IV8Project project = v8ProjectManager.getProject(mdObject); IV8Project project = v8ProjectManager.getProject(mdObject);
Language language = project.getDefaultLanguage(); 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) if (monitor.isCanceled() || language == null)
{ {
return; return;
@ -148,7 +162,6 @@ public class MdListObjectPresentationCheck
Messages.MdListObjectPresentationCheck_Neither_Object_presentation_nor_List_presentation_is_not_filled; Messages.MdListObjectPresentationCheck_Neither_Object_presentation_nor_List_presentation_is_not_filled;
resultAceptor.addIssue(message, feature); 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.IBmObject;
import com._1c.g5.v8.bm.core.event.BmSubEvent; import com._1c.g5.v8.bm.core.event.BmSubEvent;
import com._1c.g5.v8.dt.common.StringUtils; 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.IV8Project;
import com._1c.g5.v8.dt.core.platform.IV8ProjectManager; 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.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.ObjectBelonging;
import com._1c.g5.v8.dt.metadata.mdclass.StandardAttribute; import com._1c.g5.v8.dt.metadata.mdclass.StandardAttribute;
import com.e1c.g5.v8.dt.check.CheckComplexity; 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).containment(STANDARD_ATTRIBUTE).features(STANDARD_ATTRIBUTE__SYNONYM);
builder.topObject(CATALOG).checkTop().features(FEATURES.toArray(new EStructuralFeature[0])); builder.topObject(CATALOG).checkTop().features(FEATURES.toArray(new EStructuralFeature[0]));
} }
@Override @Override
protected void check(Object object, ResultAcceptor resultAceptor, ICheckParameters parameters, protected void check(Object object, ResultAcceptor resultAceptor, ICheckParameters parameters,
IProgressMonitor monitor) IProgressMonitor monitor)
{ {
EObject eObject = (EObject)object; EObject eObject = (EObject)object;
IV8Project project = v8ProjectManager.getProject(eObject); IV8Project project = v8ProjectManager.getProject(eObject);
String languageCode = project.getDefaultLanguage().getLanguageCode(); Language language = project.getDefaultLanguage();
if (monitor.isCanceled())
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; return;
} }
String languageCode = language.getLanguageCode();
if (object instanceof StandardAttribute) if (object instanceof StandardAttribute)
{ {