Merge branch 'feat/error-recovery' into recovery/empty-error-disambig…

…uation-fix

pom.xml

@@ -29,6 +29,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <lucence-version>7.5.0</lucence-version>
+        <maven-version>3.9.8</maven-version>
         <exec.mainClass>org.rascalmpl.shell.RascalShell</exec.mainClass>
         <rascal.test.memory>2</rascal.test.memory>
         <maven.compiler.release>11</maven.compiler.release>
@@ -318,10 +319,15 @@
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>org/rascalmpl/uri/resolvers.config</resource>
-                                    <resource>io/usethesource/vallang/type/types.config </resource>
                                 </transformer>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>io/usethesource/vallang/type/types.config</resource>
+                                </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/sisu/javax.inject.Named</resource> <!-- Needed for dependency injection in MavenCli -->
                                 </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/> <!-- Needed for dependency injection in MavenCli -->
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
                                     <addHeader>false</addHeader>
                                 </transformer>
@@ -516,5 +522,30 @@
             <artifactId>icu4j</artifactId>
             <version>74.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-embedder</artifactId>
+            <version>${maven-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <version>3.7.1</version>
+        </dependency>
+        <dependency> <!-- needed for maven-embedder-->
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+            <version>1.7.36</version>
+        </dependency>
+        <dependency> <!-- needed for maven-embedder-->
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-compat</artifactId>
+            <version>${maven-version}</version>
+        </dependency>
+        <dependency> <!-- needed for maven-embedder-->
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>${maven-version}</version>
+        </dependency>
     </dependencies>
 </project>

src/org/rascalmpl/ast/Assignable.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Assignable extends AbstractAST {
   public Assignable(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Assignment.java

@@ -59,6 +59,7 @@ protected void addForLineNumber(int $line, java.util.List<AbstractAST> $result)
       if (getLocation().getBeginLine() == $line) {
         $result.add(this);
       }
+      ISourceLocation $l;
 
     }
 

src/org/rascalmpl/ast/Backslash.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Backslash extends AbstractAST {
   public Backslash(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Body.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Body extends AbstractAST {
   public Body(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/BooleanLiteral.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class BooleanLiteral extends AbstractAST {
   public BooleanLiteral(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Case.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Case extends AbstractAST {
   public Case(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/CaseInsensitiveStringConstant.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class CaseInsensitiveStringConstant extends AbstractAST {
   public CaseInsensitiveStringConstant(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Catch.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Catch extends AbstractAST {
   public Catch(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Char.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Char extends AbstractAST {
   public Char(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Class.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Class extends AbstractAST {
   public Class(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Command.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Command extends AbstractAST {
   public Command(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Commands.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Commands extends AbstractAST {
   public Commands(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Comment.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Comment extends AbstractAST {
   public Comment(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Comprehension.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Comprehension extends AbstractAST {
   public Comprehension(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Concrete.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Concrete extends AbstractAST {
   public Concrete(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/ConcreteHole.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class ConcreteHole extends AbstractAST {
   public ConcreteHole(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/ConcretePart.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class ConcretePart extends AbstractAST {
   public ConcretePart(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/DataTypeSelector.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class DataTypeSelector extends AbstractAST {
   public DataTypeSelector(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/DateAndTime.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class DateAndTime extends AbstractAST {
   public DateAndTime(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/DatePart.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class DatePart extends AbstractAST {
   public DatePart(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/DateTimeLiteral.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class DateTimeLiteral extends AbstractAST {
   public DateTimeLiteral(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/DecimalIntegerLiteral.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class DecimalIntegerLiteral extends AbstractAST {
   public DecimalIntegerLiteral(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Declaration.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Declaration extends AbstractAST {
   public Declaration(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Declarator.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Declarator extends AbstractAST {
   public Declarator(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Field.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Field extends AbstractAST {
   public Field(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Formals.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Formals extends AbstractAST {
   public Formals(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/FunctionBody.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class FunctionBody extends AbstractAST {
   public FunctionBody(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/FunctionDeclaration.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class FunctionDeclaration extends AbstractAST {
   public FunctionDeclaration(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/FunctionModifiers.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class FunctionModifiers extends AbstractAST {
   public FunctionModifiers(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/FunctionType.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class FunctionType extends AbstractAST {
   public FunctionType(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Header.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Header extends AbstractAST {
   public Header(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/HexIntegerLiteral.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class HexIntegerLiteral extends AbstractAST {
   public HexIntegerLiteral(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Import.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Import extends AbstractAST {
   public Import(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/ImportedModule.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class ImportedModule extends AbstractAST {
   public ImportedModule(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/IntegerLiteral.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class IntegerLiteral extends AbstractAST {
   public IntegerLiteral(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/JustDate.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class JustDate extends AbstractAST {
   public JustDate(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/JustTime.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class JustTime extends AbstractAST {
   public JustTime(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/KeywordArgument_Expression.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class KeywordArgument_Expression extends AbstractAST {
   public KeywordArgument_Expression(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/KeywordFormal.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class KeywordFormal extends AbstractAST {
   public KeywordFormal(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/LAYOUT.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class LAYOUT extends AbstractAST {
   public LAYOUT(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/Literal.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class Literal extends AbstractAST {
   public Literal(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);

src/org/rascalmpl/ast/LocalVariableDeclaration.java

@@ -19,6 +19,7 @@
 import io.usethesource.vallang.IConstructor;
 import io.usethesource.vallang.ISourceLocation;
 
+@SuppressWarnings(value = {"unused"})
 public abstract class LocalVariableDeclaration extends AbstractAST {
   public LocalVariableDeclaration(ISourceLocation src, IConstructor node) {
     super(src /* we forget node on purpose */);