Fixed ImpEx unique value inspection to support multi-line \ separator

CHANGELOG.md

@@ -25,6 +25,7 @@
 ### Fixes
 - Fixed preview of the inlay hint for Dynamic attributes [#668](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/668)
 - Enable custom action toolbars only for SAP Commerce projects [#669](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/669)
+- Fixed `ImpEx` unique value inspection to support multi-line ` \ ` separator [#681](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/681)
 
 ### Other
 - Added VCS issue navigation for IntelliJ [#665](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/665)

gen/com/intellij/idea/plugin/hybris/impex/ImpexParser.java

@@ -1603,7 +1603,7 @@ static boolean value_dec(PsiBuilder b, int l) {
   }
 
   /* ********************************************************** */
-  // FIELD_VALUE_SEPARATOR MULTILINE_SEPARATOR? value?
+  // FIELD_VALUE_SEPARATOR value? MULTILINE_SEPARATOR?
   public static boolean value_group(PsiBuilder b, int l) {
     if (!recursion_guard_(b, l, "value_group")) return false;
     if (!nextTokenIs(b, FIELD_VALUE_SEPARATOR)) return false;
@@ -1617,17 +1617,17 @@ public static boolean value_group(PsiBuilder b, int l) {
     return r || p;
   }
 
-  // MULTILINE_SEPARATOR?
+  // value?
   private static boolean value_group_1(PsiBuilder b, int l) {
     if (!recursion_guard_(b, l, "value_group_1")) return false;
-    consumeToken(b, MULTILINE_SEPARATOR);
+    value(b, l + 1);
     return true;
   }
 
-  // value?
+  // MULTILINE_SEPARATOR?
   private static boolean value_group_2(PsiBuilder b, int l) {
     if (!recursion_guard_(b, l, "value_group_2")) return false;
-    value(b, l + 1);
+    consumeToken(b, MULTILINE_SEPARATOR);
     return true;
   }
 

src/com/intellij/idea/plugin/hybris/codeInspection/rule/impex/ImpexNoUniqueValueInspection.kt

@@ -23,8 +23,8 @@ import com.intellij.codeInspection.LocalInspectionTool
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.idea.plugin.hybris.impex.inspection.analyzer.*
 import com.intellij.idea.plugin.hybris.impex.psi.ImpexHeaderLine
+import com.intellij.idea.plugin.hybris.impex.psi.ImpexValueGroup
 import com.intellij.idea.plugin.hybris.impex.utils.ImpexPsiUtils
-import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiElementVisitor
 import com.intellij.psi.PsiFile
 import com.intellij.psi.util.PsiTreeUtil
@@ -51,12 +51,13 @@ private class NoUniqueValueVisitor(private val problemsHolder: ProblemsHolder) :
 
                     val keyAttrsGroupedByName = fullParametersList.filter { keyAttrPredicate(it) }.groupBy { it.anyHeaderParameterName.text }
 
-                    val dataMap = mutableMapOf<String, List<PsiElement>>()
-                    keyAttrsGroupedByName.forEach { (name, attrs) ->
-                        dataMap[name] = attrs
-                            .flatMap { ImpexPsiUtils.getColumnForHeader(it) }
-                            .map { it.lastChild }
-                    }
+                    val dataMap =keyAttrsGroupedByName.entries
+                        .associate { (name, attrs) ->
+                            name to attrs
+                                .flatMap { ImpexPsiUtils.getColumnForHeader(it) }
+                                .filterIsInstance<ImpexValueGroup>()
+                                .mapNotNull { it.value }
+                        }
 
                     if (distinctCommonAttrsNames.isEmpty()) {
                         val attrsNames = fullParametersList

src/com/intellij/idea/plugin/hybris/impex/Impex.bnf

@@ -220,7 +220,7 @@ value_line ::= (sub_type_name value_group*) | (value_group+) {
     methods=[getHeaderLine getValueGroup]
 }
 
-value_group ::= FIELD_VALUE_SEPARATOR MULTILINE_SEPARATOR? value?
+value_group ::= FIELD_VALUE_SEPARATOR value? MULTILINE_SEPARATOR?
 {
     pin=1
     methods=[getFullHeaderParameter getColumnNumber getValueLine computeValue]

src/com/intellij/idea/plugin/hybris/impex/inspection/analyzer/ImpexModificationValueAnalyzer.kt

@@ -23,7 +23,7 @@ fun keyAttrPredicate(param: ImpexFullHeaderParameter) = param.modifiersList
 
 fun intersection(a: ByteArray, b: ByteArray) = a.filterIndexed { index, i -> b[index] != 0.toByte() && b[index] == i }.isNotEmpty()
 
-fun createDataTable(dataMap: MutableMap<String, List<PsiElement>>, distinctCommonAttrsNames: List<String>, notKeyAttrsList: List<ImpexFullHeaderParameter>): DataTable {
+fun createDataTable(dataMap: Map<String, List<PsiElement>>, distinctCommonAttrsNames: List<String>, notKeyAttrsList: List<ImpexFullHeaderParameter>): DataTable {
     val countKeyAttrs = dataMap.entries.size
     val countRows = dataMap.values.first().size
 
@@ -32,7 +32,7 @@ fun createDataTable(dataMap: MutableMap<String, List<PsiElement>>, distinctCommo
     return DataTable(keyRows, distinctCommonAttrsNames, notKeyAttrsList)
 }
 
-fun createRows(countRows: Int, countKeyAttrs: Int, dataMap: MutableMap<String, List<PsiElement>>): MutableList<Key> {
+fun createRows(countRows: Int, countKeyAttrs: Int, dataMap: Map<String, List<PsiElement>>): MutableList<Key> {
     val keyRows = mutableListOf<Key>()
     for (i in 0 until countRows) {
         val k = mutableListOf<PsiElement>()