Fixing the CI/CD errors v2

Author: dorian-krefft-dt

src/main/grammar/dpl.bnf

@@ -139,20 +139,18 @@ command_matchers ::= L_BRACE command_matchers_content? R_BRACE {
     mixin="pl.thedeem.intellij.dpl.psi.elements.impl.CommandMatchersElementImpl"
 }
 
-command_matchers_content ::= parameters_matchers_list | members_list_matchers | expression_matchers_list {
-    pin=1
-    recoverWhile=recover_matchers_content
-}
-expression_matchers_list ::= expression_definition+ {
+command_matchers_content ::= parameters_matchers_list | members_list_matchers | expression_matchers_list
+expression_matchers_list ::= matcher_item+ {
     extends=command_matchers_content
 }
 parameters_matchers_list ::= matcher (COMMA matcher)* {
     extends=command_matchers_content
 }
-members_list_matchers ::= expression_definition COMMA expression_definition (COMMA expression_definition)* {
+members_list_matchers ::= matcher_item COMMA matcher_item (COMMA matcher_item)* {
     pin=2
     extends=command_matchers_content
 }
+private matcher_item ::= expression_definition
 matcher ::= matcher_name SET simple_expression {
     pin=2
     implements="pl.thedeem.intellij.dpl.psi.elements.MatcherElement"
@@ -270,7 +268,6 @@ variable ::= VARIABLE_NAME {
     mixin="pl.thedeem.intellij.dpl.psi.elements.impl.VariableElementImpl"
 }
 
-private recover_matchers_content ::= !(SET|COMMA|R_BRACE)
 private recover_configuration_content ::= !(SET|COMMA|R_PAREN)
 private recover_sequence_content ::= !(R_PAREN)
 private recover_alternative_content ::= !(OR|R_PAREN)

src/main/java/pl/thedeem/intellij/dpl/DPLIcon.java

@@ -7,7 +7,7 @@
 
 public interface DPLIcon {
     Icon DYNATRACE_LOGO = IconLoader.getIcon("/icons/dynatrace.png", DPLIcon.class);
-    Icon CONFIGURATION = AllIcons.General.Menu;
+    Icon CONFIGURATION = AllIcons.Actions.Edit;
     Icon QUANTIFIER = AllIcons.General.Note;
     Icon CONFIGURATION_PARAMETER = AllIcons.Nodes.Parameter;
     Icon COMMAND = AllIcons.Nodes.Class;
@@ -17,7 +17,7 @@ public interface DPLIcon {
     Icon LITERAL = AllIcons.Nodes.Word;
     Icon EXPRESSION = AllIcons.Nodes.Method;
     Icon NUMBER = AllIcons.Nodes.PropertyReadStatic;
-    Icon LOOKAROUND = AllIcons.General.RefreshAuto;
+    Icon LOOKAROUND = AllIcons.Actions.Redo;
     Icon NULL = AllIcons.Nodes.C_private;
     Icon MATCHERS = AllIcons.Json.Object;
     Icon KEY = AllIcons.Nodes.AbstractMethod;

src/main/java/pl/thedeem/intellij/dpl/psi/elements/ExpressionElement.java

@@ -18,5 +18,5 @@ public interface ExpressionElement extends PsiElement {
 
     @Nullable DPLFieldName getMemberName();
 
-    public boolean isMembersListExpression();
+    boolean isMembersListExpression();
 }

src/main/java/pl/thedeem/intellij/dpl/psi/elements/impl/ExpressionElementImpl.java

@@ -107,9 +107,6 @@ public ItemPresentation getPresentation() {
 
     @Override
     public boolean isMembersListExpression() {
-        if (getParent() instanceof DPLMembersListMatchers) {
-            return true;
-        }
         if (getParent() instanceof DPLCommandMatchersContent matchers) {
             DPLCommandExpression parentExpression = PsiTreeUtil.getParentOfType(matchers, DPLCommandExpression.class);
             if (parentExpression == null) {