Fix regular expressions not being allowed in hook transmits list

Author: waleedyaseen

CHANGELOG.md

@@ -1,6 +1,9 @@
 # intellij-runescript Changelog
 
 ## [Unreleased]
+### Fixed
+- Fix regular expressions not being allowed in hook transmits list.
+
 ### Changed
 - Inspections that require symbols will no longer run on files outside the project.
 - Update the file extension for commands from ".op" to ".cs2".

src/main/gen/io/runescript/plugin/lang/parser/RsParser.java

@@ -706,7 +706,7 @@ public static boolean HookRoot(PsiBuilder b, int l) {
   }
 
   /* ********************************************************** */
-  // LBRACE (DynamicExpression (',' DynamicExpression)*)? RBRACE
+  // LBRACE ExpressionList? RBRACE
   public static boolean HookTransmitList(PsiBuilder b, int l) {
     if (!recursion_guard_(b, l, "HookTransmitList")) return false;
     if (!nextTokenIs(b, LBRACE)) return false;
@@ -719,46 +719,13 @@ public static boolean HookTransmitList(PsiBuilder b, int l) {
     return r;
   }
 
-  // (DynamicExpression (',' DynamicExpression)*)?
+  // ExpressionList?
   private static boolean HookTransmitList_1(PsiBuilder b, int l) {
     if (!recursion_guard_(b, l, "HookTransmitList_1")) return false;
-    HookTransmitList_1_0(b, l + 1);
-    return true;
-  }
-
-  // DynamicExpression (',' DynamicExpression)*
-  private static boolean HookTransmitList_1_0(PsiBuilder b, int l) {
-    if (!recursion_guard_(b, l, "HookTransmitList_1_0")) return false;
-    boolean r;
-    Marker m = enter_section_(b);
-    r = DynamicExpression(b, l + 1);
-    r = r && HookTransmitList_1_0_1(b, l + 1);
-    exit_section_(b, m, null, r);
-    return r;
-  }
-
-  // (',' DynamicExpression)*
-  private static boolean HookTransmitList_1_0_1(PsiBuilder b, int l) {
-    if (!recursion_guard_(b, l, "HookTransmitList_1_0_1")) return false;
-    while (true) {
-      int c = current_position_(b);
-      if (!HookTransmitList_1_0_1_0(b, l + 1)) break;
-      if (!empty_element_parsed_guard_(b, "HookTransmitList_1_0_1", c)) break;
-    }
+    ExpressionList(b, l + 1);
     return true;
   }
 
-  // ',' DynamicExpression
-  private static boolean HookTransmitList_1_0_1_0(PsiBuilder b, int l) {
-    if (!recursion_guard_(b, l, "HookTransmitList_1_0_1_0")) return false;
-    boolean r;
-    Marker m = enter_section_(b);
-    r = consumeToken(b, COMMA);
-    r = r && DynamicExpression(b, l + 1);
-    exit_section_(b, m, null, r);
-    return r;
-  }
-
   /* ********************************************************** */
   // IF '(' LogicalOrWrapper ')' Statement (ELSE Statement)?
   public static boolean IfStatement(PsiBuilder b, int l) {

src/main/gen/io/runescript/plugin/lang/psi/RsHookTransmitList.java

@@ -8,7 +8,7 @@
 public interface RsHookTransmitList extends PsiElement {
 
   @NotNull
-  List<RsDynamicExpression> getDynamicExpressionList();
+  List<RsExpression> getExpressionList();
 
   @NotNull
   PsiElement getLbrace();

src/main/gen/io/runescript/plugin/lang/psi/impl/RsHookTransmitListImpl.java

@@ -29,8 +29,8 @@ public void accept(@NotNull PsiElementVisitor visitor) {
 
   @Override
   @NotNull
-  public List<RsDynamicExpression> getDynamicExpressionList() {
-    return PsiTreeUtil.getChildrenOfTypeAsList(this, RsDynamicExpression.class);
+  public List<RsExpression> getExpressionList() {
+    return PsiTreeUtil.getChildrenOfTypeAsList(this, RsExpression.class);
   }
 
   @Override

src/main/grammars/RuneScript.bnf

@@ -278,4 +278,4 @@ HookFragment ::= NameLiteral (ArgumentList HookTransmitList?)? {
     mixin="io.runescript.plugin.lang.psi.mixin.RsHookFragmentMixin"
     implements="io.runescript.plugin.lang.psi.RsNamedElement"
 }
-HookTransmitList ::= LBRACE (DynamicExpression (',' DynamicExpression)*)? RBRACE
+HookTransmitList ::= LBRACE ExpressionList? RBRACE

src/main/kotlin/io/runescript/plugin/ide/codeInsight/controlFlow/RsControlFlowBuilder.kt

@@ -97,7 +97,7 @@ class RsControlFlowBuilder : ControlFlowBuilder() {
         }
 
         override fun visitHookTransmitList(o: RsHookTransmitList) {
-            o.dynamicExpressionList.forEach { it.accept(this) }
+            o.expressionList.forEach { it.accept(this) }
         }
 
         override fun visitCommandExpression(o: RsCommandExpression) {

src/main/kotlin/io/runescript/plugin/lang/psi/type/inference/RsTypeInferenceVisitor.kt

@@ -214,7 +214,7 @@ class RsTypeInferenceVisitor(private val myInferenceData: RsTypeInference) : RsV
                 if (expectedType == null) {
                     hookTransmitList.error("${reference.name} does not allow transmit list.")
                 }
-                hookTransmitList.dynamicExpressionList.forEach {
+                hookTransmitList.expressionList.forEach {
                     it.typeHint = expectedType ?: RsErrorType
                     it.accept(this)
                 }