Merge remote-tracking branch 'origin/main' into fix/rename-refactoring/ignored-modules

Author: toinehartman

.github/workflows/build.yaml

@@ -132,6 +132,7 @@ jobs:
 
   build:
     needs: [ui-test, normal-tests]
+    environment: ${{ startsWith(github.ref, 'refs/tags/v') && 'deployments' || '' }}
     runs-on: buildjet-2vcpu-ubuntu-2204
     steps:
       - uses: actions/checkout@v4

.github/workflows/lint.yaml

@@ -13,6 +13,8 @@ on:
     branches:
       - '**'
 
+env:
+  MAVEN_OPTS: '-Xmx4G -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true  -Drascal.compile.skip -Drascal.tutor.skip -Drascal.package.skip'
 
 permissions:
   checks: write
@@ -39,11 +41,11 @@ jobs:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
-      - name: Build and analyze java
+      - name: Build, test and analyze java (also collect coverage data)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -f ./rascal-lsp/pom.xml -Pcoverage -B -Drascal.compile.skip -Drascal.tutor.skip verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=usethesource_rascal-language-servers
+        run: mvn -B -f ./rascal-lsp/pom.xml -Pcoverage verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=usethesource_rascal-language-servers 
 
   eslint:
     name: eslint
@@ -69,6 +71,7 @@ jobs:
           eslint_dir: ./rascal-vscode-extension
           eslint_args: "src"
           eslint_extensions: ts
+          continue_on_error: false
 
   checkstyle:
     name: checkstyle 
@@ -84,7 +87,7 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
       - name: Run checkstyle and print errors
-        run: mvn -B checkstyle:checkstyle  checkstyle:check
+        run: mvn -B checkstyle:checkstyle checkstyle:check
         working-directory: ./rascal-lsp
       - name: Report build results
         uses: gmazzo/publish-report-annotations@v1 # target latest major
@@ -137,10 +140,10 @@ jobs:
 
       - if: ${{ matrix.language == 'java' }}
         name: Build java 
-        run: mvn -B compile -Drascal.compile.skip -Drascal.tutor.skip -DskipTests
+        run: mvn -B compile
         working-directory: rascal-lsp/
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3
         with:
-          category: "/language:${{matrix.language}}"   
+          category: "/language:${{matrix.language}}"   

.github/workflows/rascal-lsp-release.yaml

@@ -8,6 +8,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    environment: deployments
     defaults:
       run:
         working-directory: ./rascal-lsp
@@ -34,12 +35,3 @@ jobs:
           ssh-username: ${{ secrets.RELEASE_SSH_USERNAME }}
           ssh-private-key: ${{ secrets.RELEASE_SSH_PRIVATE_KEY }}
           working-directory: ./rascal-lsp
-
-      - name: Report Failure
-        if: failure()
-        uses: act10ns/slack@v2
-        with:
-          status: ${{ job.status }}
-          steps: ${{ toJson(steps) }}
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.RASCAL_SLACK_WEBHOOK }}

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 rascal-vscode-extension/dist/rascal-lsp-*.jar
-rascal-vscode-extension/rascalmpl-0.0.1.vsix
+rascal-vscode-extension/*.vsix
 rascal-vscode-extension/.vscode-test/
-rascal-lsp/bin
+rascal-lsp/bin
+*.log

CODEOWNERS

@@ -0,0 +1 @@
+/.github/   @DavyLandman

README.md

@@ -7,7 +7,7 @@ languages defined in or implemented in Rascal.
 Currently we provide installers and client-specific features for VScode and 
 no others.
 
-This project is in beta stage; under development but used regularly by a group of early adopters.
+This project is no longer in beta stage; it is under development but used regularly by commercial, educational and academic users.
 The VScode extension can be found [here](https://marketplace.visualstudio.com/items?itemName=usethesource.rascalmpl).
 
 ### Origin story

build.sh

@@ -1,23 +1,34 @@
 #!/usr/bin/env bash
 
-set -euxo pipefail
+set -euo pipefail
 
 extra_flags=''
+lint=0
 
 clean="clean"
-while getopts 'fd' flag; do
+while getopts 'lfd' flag; do
   case "${flag}" in
     f) extra_flags='-Drascal.compile.skip -Drascal.tutor.skip -DskipTests' ;;
+    l) lint=1 ;;
     d) clean='' ;;
     *) printf "incorrect param, valid params:
     Use -f to skip rascal-compile and tests
-    Use -d to skip cleaning the target folder"
+    Use -d to skip cleaning the target folder
+    Use -l to skip linting
+
+"
         exit 1 ;;
   esac
 done
 
 rm -f rascal-lsp/target/*.jar
 
+if (( $lint == 1 )); then
+   (cd rascal-lsp && mvn -B checkstyle:checkstyle  checkstyle:check )
+fi
 (cd rascal-lsp && mvn $clean package -Drascal.monitor.batch $extra_flags )
+if (( $lint == 1 )); then
+   (cd rascal-vscode-extension && npm run lint )
+fi
 (cd rascal-vscode-extension && npm run lsp4j:package )
 

package-and-run.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+set -x
+
+./package.sh
+
+TMPDIR=$(mktemp --directory)
+# shellcheck disable=SC2012
+VSIX_LATEST=$(ls -t1 **/*.vsix | head -1)
+CODE_COMMAND="code --extensions-dir $TMPDIR/ext --user-data-dir $TMPDIR/data"
+
+mkdir -p "$TMPDIR"/{ext,data}
+
+$CODE_COMMAND --install-extension "$VSIX_LATEST" --force
+$CODE_COMMAND --new-window "${1:-}" # optionally pass a workspace/folder/file to open

rascal-lsp/pom.xml

@@ -34,9 +34,10 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <junit.version>4.13.2</junit.version>
-    <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
-    <log4j2.version>2.25.1</log4j2.version>
+    <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
+    <log4j2.version>2.25.2</log4j2.version>
     <lsp4j.version>0.24.0</lsp4j.version>
+    <mockito.version>5.20.0</mockito.version>
     <sonar.organization>usethesource</sonar.organization>
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>
   </properties>
@@ -63,7 +64,7 @@
     <dependency>
       <groupId>org.rascalmpl</groupId>
       <artifactId>rascal</artifactId>
-      <version>0.41.0-RC60</version>
+      <version>0.41.0-RC75</version>
     </dependency>
     <!-- Rascal tests require JUnit 4 -->
     <dependency>
@@ -108,6 +109,12 @@
       <artifactId>org.eclipse.lsp4j.debug</artifactId>
       <version>${lsp4j.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <resources>
@@ -131,7 +138,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.14.0</version>
+        <version>3.14.1</version>
         <configuration>
           <release>11</release>
           <showWarnings>true</showWarnings>
@@ -150,14 +157,23 @@
           <dependency>
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-junit47</artifactId>
-            <version>3.5.3</version>
+            <version>3.5.4</version>
           </dependency>
         </dependencies>
       </plugin>
       <plugin>
         <groupId>org.rascalmpl</groupId>
         <artifactId>rascal-maven-plugin</artifactId>
         <version>0.30.0-RC25</version>
+        <configuration>
+            <errorsAsWarnings>false</errorsAsWarnings>
+            <bin>${project.build.outputDirectory}</bin>
+            <srcs>
+                <src>${project.basedir}/src/main/rascal/library</src>
+            </srcs>
+            <sources>|http://github.com/usethesource/rascal-language-servers/blob/main/rascal-lsp|</sources>
+            <issues>|http://github.com/usethesource/rascal-language-servers/issues|</issues>
+        </configuration>
         <executions>
           <execution>
             <?m2e ignore?>
@@ -166,13 +182,6 @@
             <goals>
               <goal>compile</goal>
             </goals>
-            <configuration>
-                <errorsAsWarnings>false</errorsAsWarnings>
-                <bin>${project.build.outputDirectory}</bin>
-                <srcs>
-                    <src>${project.basedir}/src/main/rascal/library</src>
-                </srcs>
-            </configuration>
           </execution>
           <execution>
             <id>default-package</id>
@@ -187,25 +196,13 @@
             <goals>
               <goal>tutor</goal>
             </goals>
-            <configuration>
-              <bin>${project.build.outputDirectory}</bin>
-              <sources>|http://github.com/usethesource/rascal-language-servers/blob/main/rascal-lsp|</sources>
-              <issues>|http://github.com/usethesource/rascal-language-servers/issues|</issues>
-              <srcs>
-                <src>${project.basedir}/src/main/rascal</src>
-              </srcs>
-              <ignores>
-                  <ignore>${project.basedir}/src/main/rascal/lang/rascal</ignore>
-                  <ignore>${project.basedir}/src/main/rascal/framework</ignore>
-              </ignores>
-            </configuration>
           </execution>
         </executions>
       </plugin>
 
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.8.1</version>
+        <version>3.9.0</version>
         <executions>
           <execution>
             <?m2e ignore?>
@@ -234,7 +231,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
         <dependencies>
           <dependency> <!-- correctly shade multiple log4j2 depencneis -->
               <groupId>org.apache.logging.log4j</groupId>
@@ -336,7 +333,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.2</version>
         <executions>
           <execution>
             <id>enforce-maven</id>