Add parameter error recovery

Author: waleedyaseen

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

@@ -991,12 +991,13 @@ public static boolean ParExpression(PsiBuilder b, int l) {
   public static boolean Parameter(PsiBuilder b, int l) {
     if (!recursion_guard_(b, l, "Parameter")) return false;
     if (!nextTokenIs(b, "<parameter>", ARRAY_TYPE_LITERAL, TYPE_LITERAL)) return false;
-    boolean r;
+    boolean r, p;
     Marker m = enter_section_(b, l, _NONE_, PARAMETER, "<parameter>");
     r = Parameter_0(b, l + 1);
+    p = r; // pin = 1
     r = r && LocalVariableExpression(b, l + 1);
-    exit_section_(b, l, m, r, false, null);
-    return r;
+    exit_section_(b, l, m, r, p, null);
+    return r || p;
   }
 
   // TypeName | ARRAY_TYPE_LITERAL
@@ -1062,6 +1063,26 @@ private static boolean ParameterList_1_0_1_0(PsiBuilder b, int l) {
     return r;
   }
 
+  /* ********************************************************** */
+  // !(COMMA | RPAREN)
+  static boolean Parameter_Recover(PsiBuilder b, int l) {
+    if (!recursion_guard_(b, l, "Parameter_Recover")) return false;
+    boolean r;
+    Marker m = enter_section_(b, l, _NOT_);
+    r = !Parameter_Recover_0(b, l + 1);
+    exit_section_(b, l, m, r, false, null);
+    return r;
+  }
+
+  // COMMA | RPAREN
+  private static boolean Parameter_Recover_0(PsiBuilder b, int l) {
+    if (!recursion_guard_(b, l, "Parameter_Recover_0")) return false;
+    boolean r;
+    r = consumeToken(b, COMMA);
+    if (!r) r = consumeToken(b, RPAREN);
+    return r;
+  }
+
   /* ********************************************************** */
   // ('(' LogicalOrWrapper ')') | Expression
   public static boolean RelationalValueExpression(PsiBuilder b, int l) {

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

@@ -9,7 +9,7 @@
 
 public interface RsParameter extends PsiElement, StubBasedPsiElement<RsParameterStub> {
 
-  @NotNull
+  @Nullable
   RsLocalVariableExpression getLocalVariableExpression();
 
   @Nullable

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

@@ -39,9 +39,9 @@ public void accept(@NotNull PsiElementVisitor visitor) {
   }
 
   @Override
-  @NotNull
+  @Nullable
   public RsLocalVariableExpression getLocalVariableExpression() {
-    return notNullChild(PsiTreeUtil.getStubChildOfType(this, RsLocalVariableExpression.class));
+    return PsiTreeUtil.getStubChildOfType(this, RsLocalVariableExpression.class);
   }
 
   @Override

src/main/grammars/RuneScript.bnf

@@ -80,8 +80,12 @@ ParameterList ::= '(' (Parameter (',' Parameter)*)? ')' {
 Parameter ::= (TypeName | ARRAY_TYPE_LITERAL) LocalVariableExpression {
     stubClass="io.runescript.plugin.lang.stubs.RsParameterStub"
     elementTypeFactory = "io.runescript.plugin.lang.stubs.StubElementTypeFactory.create"
+    pin=1
+    recoverWhile=Parameter_Recover
 }
 
+private Parameter_Recover ::= !(COMMA | RPAREN)
+
 ReturnList ::= '(' (TypeName (',' TypeName)*)? ')' {
     stubClass="io.runescript.plugin.lang.stubs.RsReturnListStub"
     elementTypeFactory = "io.runescript.plugin.lang.stubs.StubElementTypeFactory.create"

src/main/kotlin/io/runescript/plugin/ide/codeInsight/RsGosubParameterInfoProvider.kt

@@ -132,7 +132,7 @@ data class CallInfo(
 
         fun of(parameters: List<RsParameter>) = CallInfo(parameters.map {
             val typeName = it.arrayTypeLiteral?.text ?: it.typeName?.text ?: "unknown"
-            val parameterName = it.localVariableExpression.name!!
+            val parameterName = it.localVariableExpression?.name ?: return@map CallParameterInfo(typeName, "<unknown-parameter>")
             CallParameterInfo(typeName, parameterName)
         })
     }

src/main/kotlin/io/runescript/plugin/ide/codeInsight/RsInlayParameterHintsProvider.kt

@@ -80,7 +80,7 @@ class RsInlayParameterHintsProvider : InlayParameterHintsProvider {
             is RsGosubExpression, is RsCommandExpression -> {
                 val reference = element.reference?.resolve() ?: return null
                 reference as RsScript
-                reference.parameterList?.parameterList?.map { it.localVariableExpression.name!! }
+                reference.parameterList?.parameterList?.map { it.localVariableExpression?.name ?: "<unknown-parameter>" }
             }
 
             else -> return null

src/main/kotlin/io/runescript/plugin/ide/doc/RsDocReference.kt

@@ -49,7 +49,7 @@ class RsDocReference(element: RsDocName) : PsiPolyVariantReferenceBase<RsDocName
                 return owner
                     ?.parameterList
                     ?.parameterList
-                    ?.map { it.localVariableExpression }
+                    ?.mapNotNull { it.localVariableExpression }
                     ?.filter { it.nameLiteral.text == elementName }
                     ?.toTypedArray()
                     ?: emptyArray()

src/main/kotlin/io/runescript/plugin/ide/doc/RsDocumentationProvider.kt

@@ -107,7 +107,7 @@ class RsDocumentationProvider : AbstractDocumentationProvider() {
             }
             appendKeyword((it.typeName ?: it.arrayTypeLiteral)!!.text)
             appendHighlighted(
-                " ${it.localVariableExpression.text}",
+                " ${it.localVariableExpression?.text ?: "<unknown-parameter>" }",
                 RsSyntaxHighlighterColors.LOCAL_VARIABLE
             )
         }
@@ -143,7 +143,7 @@ class RsDocumentationProvider : AbstractDocumentationProvider() {
     override fun getDocumentationElementForLink(
         psiManager: PsiManager,
         link: String,
-        context: PsiElement
+        context: PsiElement,
     ): PsiElement? {
         val parts = link.split("/")
         if (parts.size < 2) {

src/main/kotlin/io/runescript/plugin/ide/inspections/RuneScriptDuplicateLocalVariableInspection.kt

@@ -21,14 +21,14 @@ class RuneScriptDuplicateLocalVariableInspection : LocalInspectionTool() {
         return object : RsVisitor() {
 
             override fun visitParameter(o: RsParameter) {
-                val name = o.localVariableExpression.name ?: return
+                val name = o.localVariableExpression?.name ?: return
                 var prev = o.prevSibling
                 while (prev != null) {
                     if (prev is RsParameter) {
-                        val prevName = prev.localVariableExpression.name
+                        val prevName = prev.localVariableExpression?.name
                         if (name == prevName) {
                             holder.registerProblem(
-                                o.localVariableExpression,
+                                o.localVariableExpression!!,
                                 RsBundle.message("inspection.error.duplicate.parameter", name),
                                 ProblemHighlightType.GENERIC_ERROR
                             )

src/main/kotlin/io/runescript/plugin/lang/psi/mixin/RsParameterListMixin.kt

@@ -18,7 +18,8 @@ abstract class RsParameterListMixin : StubBasedPsiElementBase<RsParameterListStu
 
     override fun processDeclarations(processor: PsiScopeProcessor, state: ResolveState, lastParent: PsiElement?, place: PsiElement): Boolean {
         parameterList.forEach {
-            if (lastParent != it && !processor.execute(it.localVariableExpression, state)) {
+            val expr = it.localVariableExpression
+            if (lastParent != it && expr != null && !processor.execute(expr, state)) {
                 return false
             }
         }