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

Исправление ложного срабатывания

Browse Source
This commit is contained in:
Dmitriy Marmyshev 2022-08-03 23:42:10 +03:00
parent 158aa1981c
commit 8b64491889
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bundles/com.e1c.v8codestyle.form/src/com/e1c/v8codestyle/form/check/DynamicListItemTitleCheck.java
View File

@ -40,11 +40,13 @@ import com._1c.g5.v8.dt.form.model.DataPathReferredObject;
import com._1c.g5.v8.dt.form.model.DynamicListExtInfo;
import com._1c.g5.v8.dt.form.model.Form;
import com._1c.g5.v8.dt.form.model.FormAttribute;
import com._1c.g5.v8.dt.form.model.FormElementTitleLocation;
import com._1c.g5.v8.dt.form.model.FormField;
import com._1c.g5.v8.dt.form.model.FormItem;
import com._1c.g5.v8.dt.form.model.FormItemContainer;
import com._1c.g5.v8.dt.form.model.PropertyInfo;
import com._1c.g5.v8.dt.form.service.datasourceinfo.IDataSourceInfoAssociationService;
import com._1c.g5.v8.dt.mcore.DuallyNamedElement;
import com._1c.g5.v8.dt.mcore.NamedElement;
import com.e1c.g5.v8.dt.check.CheckComplexity;
import com.e1c.g5.v8.dt.check.ICheckDefinition;
@ -113,7 +115,8 @@ public class DynamicListItemTitleCheck
{
FormField field = (FormField)object;
AbstractDataPath dataPath = field.getDataPath();
if (dataPath == null || dataPath.getSegments().size() != 2 || dataPath.getObjects().size() != 2)
if (field.getTitleLocation() == FormElementTitleLocation.NONE || dataPath == null
|| dataPath.getSegments().size() != 2 || dataPath.getObjects().size() != 2)
{
return;
}
@ -178,7 +181,9 @@ public class DynamicListItemTitleCheck
private boolean isSourceUnknownOrSegmentNotEquals(String segment, EObject source)
{
return source == null
|| source instanceof NamedElement && !segment.equalsIgnoreCase(((NamedElement)source).getName());
|| !(source instanceof NamedElement && segment.equalsIgnoreCase(((NamedElement)source).getName())
|| source instanceof DuallyNamedElement
&& segment.equalsIgnoreCase(((DuallyNamedElement)source).getNameRu()));
}
private boolean isDcsFieldTitleIsEmpty(DynamicListExtInfo custormQuery, String segment, String languageCode)

2
tests/com.e1c.v8codestyle.form.itests/workspace/FormDynamicListItemTitle/src/Catalogs/Products/Forms/ListForm/Form.form
View File

@ -730,7 +730,7 @@
Products.DeletionMark,
"" AS Code,
Products.SKU,
Products.Description,
Products.Description AS Description,
Products.Description + "" + Products.SKU AS SkuDescription,
Products.Predefined AS MyPredefined,
Products.PredefinedDataName AS MyPredefined2