Merge branch 'main' into url-syntax

Author: jurgenvinju

.git-blame-ignore-revs

@@ -0,0 +1,12 @@
+# List of commits that shouldn't be included in `git blame`. 
+# Github and other tools already support it if it's this exact filename
+# But you have to teach your own git about this by running this command (in this repo)
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# indent fix for JSON
+31b1031ade5d84f9c60e30d17da3b55e78d291fb
+
+# fixing tabs & spaces mixed
+0d048e15683740b5c944be5333ec0680df825e47
+23ec4b622bbe503ef013be5a458e45ae6fd89b97
+200b0352084be9435c64aa60c550edd24a59131b

.gitattributes

@@ -0,0 +1 @@
+*.dot diff=-astextplain

.github/ISSUE_TEMPLATE/stable-release-manual-testing-template.md

@@ -51,7 +51,7 @@ First a "pre-release" of the supporting compiler/typechecker tools must be done,
 - [ ] jump-to-definition also works to library modules and inside library modules
 - [ ] clicking in outline jumps to editor to right position
 - [ ] syntax highlighting in editor works
-- [ ] add dependency on another project by editing `RASCAL.MF`: `Required-Libraries: |lib://otherProject|`, import a module and test the type-checker as well as the interpreter for correct resolution
+- [ ] add dependency on another project by editing `pom.xml` `<dependencies> tag, import a module and test the type-checker as well as the interpreter for correct resolution
 - [ ] `import demo::lang::Pico::Plugin; registerPico();` and test the editor of the example pico files (syntax highlighting, menu options)
 - [ ] `import demo::lang::Pico::Plugin; rascal>:edit  demo::lang::Pico::Plugin`
 - [ ] use util::IDEServices:

.github/workflows/build.yaml

@@ -8,28 +8,38 @@ on:
   pull_request:
     branches:
       - main
+      - 'feat/*'
 env:
-  MAVEN_OPTS: "-Xmx4G -Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+  MAVEN_OPTS: "-Xmx4G -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+  IS_OWN_PR: "${{ secrets.MAVEN_MIRROR_URL }}"
 
 jobs:
   test-linux:
     if: ${{ !(github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, '[maven-release-plugin]')) }}
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubicloud-standard-4
     steps: 
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+
+      - uses: s4u/maven-settings-action@v3.1.0
+        if: ${{ env.IS_OWN_PR != '' }}
+        with:
+          servers: '[{"id": "usethesource-gh", "username":"github", "password": "${{ secrets.MAVEN_MIRROR_PASSWORD }}"}]'
+          mirrors: '[{"id": "usethesource-gh", "name": "uts mirror", "mirrorOf": "usethesource", "url": "${{ secrets.MAVEN_MIRROR_URL }}"}]'
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: 'temurin'
           cache: 'maven'
-
+          overwrite-settings: false
       - name: Run Tests
         run: mvn -B -Drascal.compile.skip -Drascal.tutor.skip -Drascal.test.memory=14 test
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         continue-on-error: true # sometimes this one fails, that shouldn't stop a build
         with:
-          token: e8b4481a-d178-4148-a4ff-502906390512
+          fail_ci_if_error: false
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Publish Test Report on github action
         if: ${{ always() && github.event_name != 'pull_request' }} # to bad this doesn't work nicely with external pull requests
@@ -43,32 +53,42 @@ jobs:
     needs: [test-linux]
     permissions:
       contents: write
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubicloud-standard-4
+    environment: ${{ startsWith(github.ref, 'refs/tags/v') && 'deployment' || '' }} 
     steps:
       - uses: browser-actions/setup-chrome@latest
         with:
           chrome-version: 1047731 # v107
       - run: which chrome
-      - uses: nanasess/setup-chromedriver@v1
+      - uses: nanasess/setup-chromedriver@v2
         with:
           chromedriver-version: '107.0.5304.62'
       - run: which chromedriver
+
+      - uses: s4u/maven-settings-action@v3.1.0
+        if: ${{ env.IS_OWN_PR != '' }}
+        with:
+          servers: '[{"id": "usethesource-gh", "username":"github", "password": "${{ secrets.MAVEN_MIRROR_PASSWORD }}"}]'
+          mirrors: '[{"id": "usethesource-gh", "name": "uts mirror", "mirrorOf": "usethesource", "url": "${{ secrets.MAVEN_MIRROR_URL }}"}]'
 
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: 'temurin'
           cache: 'maven'
+          overwrite-settings: false
+
 
       - name: Compile & Bootstrap
         run: mvn -B compile -Dwebdriver.chrome.driver=/usr/local/bin/chromedriver -Dwebdriver.chrome.browser=`which chrome` 
         env:
-          MAVEN_OPTS: "-Xmx14G -Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+          MAVEN_OPTS: "-Xmx14G -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
 
       - name: Test if release # just to be extra sure for a release
         if: startsWith(github.ref, 'refs/tags/v')
-        run: mvn -Drascal.test.memory=10 -Drascal.compile.skip -Drascal.tutor.skip test 
+        run: mvn -Drascal.test.memory=14 -Drascal.compile.skip -Drascal.tutor.skip test 
 
       - name: Attach artifact 
         id: build-artifact
@@ -78,6 +98,7 @@ jobs:
             -Drascal.compile.skip
             -Drascal.tutor.skip
             -DskipTests
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
       - name: Making sure test have succeeded in the parallel jobs
         if: startsWith(github.ref, 'refs/tags/')
@@ -87,7 +108,6 @@ jobs:
           jobs: |
             tests (macos-latest)
             tests (windows-latest)
-            tests (buildjet-4vcpu-ubuntu-2204-arm)
           ttl: 15
 
       - name: Deploy
@@ -103,37 +123,60 @@ jobs:
           ssh-private-key: ${{ secrets.RELEASE_SSH_PRIVATE_KEY }}
 
       - name: Prepare Draft Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           draft: true
           files: ${{ steps.build-artifact.outputs.artifact-root-dir}}/**/*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
+#       - name: prepare-unshaded
+#         if: startsWith(github.ref, 'refs/tags/')
+#         run: sed -i 's#<artifactId>rascal</artifactId>#<artifactId>rascal-unshaded</artifactId>#' pom.xml
+# 
+#       - name: Deploy unshaded jar
+#         if: startsWith(github.ref, 'refs/tags/v')
+#         uses: usethesource/releases-maven-action@v1
+#         with:
+#           maven-username: ${{ secrets.RELEASE_MAVEN_USERNAME }}
+#           maven-password: ${{ secrets.RELEASE_MAVEN_PASSWORD }}
+#           maven-local-port: ${{ secrets.RELEASE_MAVEN_LOCAL_PORT }}
+#           ssh-hostname: ${{ secrets.RELEASE_SSH_SERVER }}
+#           ssh-known-host: ${{ secrets.RELEASE_SSH_KNOWN_HOSTS }}
+#           ssh-username: ${{ secrets.RELEASE_SSH_USERNAME }}
+#           ssh-private-key: ${{ secrets.RELEASE_SSH_PRIVATE_KEY }}
+#           maven-options: -Punshaded -Drascal.compile.skip -Drascal.tutor.skip -DskipTests
+# 
   tests:
     if: ${{ !(github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, '[maven-release-plugin]')) }}
     needs: [test-linux]
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [windows-latest, macos-latest, buildjet-4vcpu-ubuntu-2204-arm]
+        os: [windows-latest, macos-latest]
     env:
-      MAVEN_OPTS: "-Xmx1G -Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+      MAVEN_OPTS: "-Xmx512M -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
     steps: 
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+
+      - uses: s4u/maven-settings-action@v3.1.0
+        if: ${{ env.IS_OWN_PR != '' }}
+        with:
+          servers: '[{"id": "usethesource-gh", "username":"github", "password": "${{ secrets.MAVEN_MIRROR_PASSWORD }}"}]'
+          mirrors: '[{"id": "usethesource-gh", "name": "uts mirror", "mirrorOf": "usethesource", "url": "${{ secrets.MAVEN_MIRROR_URL }}"}]'
+      - uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: 'temurin'
           cache: 'maven'
+          overwrite-settings: false
 
       - name: Run Tests
         # single quotes to help windows deal with argument splitting
-        run: mvn -B '-Drascal.compile.skip' '-Drascal.tutor.skip' '-Drascal.test.memory=3' test
+        run: mvn -B '-Drascal.compile.skip' '-Drascal.tutor.skip' '-Drascal.test.memory=2' test
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         continue-on-error: true # sometimes this one fails, that shouldn't stop a build
         with:
           token: e8b4481a-d178-4148-a4ff-502906390512
@@ -145,3 +188,46 @@ jobs:
         with:
           check_name: "Test Report - ${{ runner.os }}"
 
+  compiler-tests:
+    if: ${{ !(github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, '[maven-release-plugin]')) }}
+    needs: [test-linux]
+    runs-on: ubicloud-standard-4
+    env:
+      MAVEN_OPTS: "-Xmx512M -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
+    steps: 
+      - uses: actions/checkout@v4
+
+      - uses: s4u/maven-settings-action@v3.1.0
+        if: ${{ env.IS_OWN_PR != '' }}
+        with:
+          servers: '[{"id": "usethesource-gh", "username":"github", "password": "${{ secrets.MAVEN_MIRROR_PASSWORD }}"}]'
+          mirrors: '[{"id": "usethesource-gh", "name": "uts mirror", "mirrorOf": "usethesource", "url": "${{ secrets.MAVEN_MIRROR_URL }}"}]'
+      - uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: 'temurin'
+          cache: 'maven'
+          overwrite-settings: false
+
+      - name: Retrieve dependencies for integration tests
+        run: bash src/org/rascalmpl/compiler/lang/rascalcore/check/tests/download-test-jars.sh
+
+      - name: Run Tests
+        run: mvn -B -Pcompiler-tests -Drascal.compile.skip -Drascal.tutor.skip -Drascal.test.memory=10 test
+
+      - uses: codecov/codecov-action@v4
+        continue-on-error: true # sometimes this one fails, that shouldn't stop a build
+        with:
+          fail_ci_if_error: false
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Publish Test Report on github action
+        if: ${{ always() && github.event_name != 'pull_request' }} # to bad this doesn't work nicely with external pull requests
+        continue-on-error: true # sometimes this one fails, that shouldn't stop a build
+        uses: scacap/action-surefire-report@v1
+        with:
+          check_name: "Compiler Test Report"
+
+
+

.gitignore

@@ -28,6 +28,7 @@ rascal-DEPENDENCIES.txt
 
 dependency-reduced-pom.xml
 .ipynb_checkpoints
+__pycache__
 .vscode/settings.json
 
 *.iml

.vscode/launch.json

@@ -4,6 +4,13 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "type": "java",
+            "name": "RascalCheck",
+            "request": "launch",
+            "mainClass": "org.rascalmpl.shell.RascalCheck",
+            "projectName": "rascal"
+        },
         {
             "type": "java",
             "name": "Launch DocRunner",
@@ -30,15 +37,16 @@
             "request": "launch",
             "mainClass": "org.rascalmpl.shell.RascalShell",
             "projectName": "rascal",
-            "vmArgs": "-Xss80m -Xmx2g -ea"
+            "vmArgs": "-Xss80m -Xmx2g -ea",
+            "console": "integratedTerminal"
         },
         {
             "type": "java",
             "name": "Launch RascalShell Tutor",
             "request": "launch",
             "mainClass": "org.rascalmpl.shell.RascalShell",
             "projectName": "rascal",
-            "cwd" : "${workspaceFolder}/../rascal-tutor",
+            "cwd": "${workspaceFolder}/../rascal-tutor",
             "vmArgs": "-Xss80m -Xmx2g -ea"
         },
         {
@@ -63,7 +71,7 @@
             "request": "attach",
             "projectName": "rascal-lsp",
             "hostName": "localhost",
-            "port": 9001
+            "port": 9871
         },
         {
             "type": "java",

AUTHORS.md

@@ -0,0 +1,67 @@
+The main authors of the Rascal project are:
+* Jurgen J. Vinju
+* Paul Klint
+* Tijs van der Storm
+* Davy Landman
+* Arnold Lankamp
+
+And this is a complete list of contributors ordered by the amount of commits:
+* Anastasia Izmaylova
+* Pieter Olivier
+* Mark Hills
+* Tijs van der Storm
+* Atze van der Ploeg
+* Rodin Aarssen
+* Bert Lisser
+* Ashim Shahi
+* Michael Steindorfer
+* Ali Afroozeh
+* Ferry Rietveld
+* Emilie Balland
+* Bert Lisser
+* Anya Helene Bagge
+* Mauricio Verano Merino
+* Jouke Stoel
+* Lina Maria Ochoa Venegas
+* Jasper Timmer
+* Bas Basten
+* Riemer van Rozen
+* Sung-Shik Jongmans
+* Wietse Venema
+* Vadim Zaytsev
+* Jeroen van den Bos
+* Pieter Olivier
+* Linus Wagner
+* Joppe Kroon
+* Pablo Inostroza Valdera
+* Thomas Degueule
+* Aiko Yamashita
+* Toine Hartman
+* Cindy Berghuizen
+* Michael Godfrey
+* Jeroen Peeters
+* Athanasios Anastasiou
+* Davy Meers
+* Kevin van der Vlist
+* Yoan-Alexander Grigorov
+* Romain Briand
+* Cleverton Hentz
+* Magiel Bruntink
+* Mike Bierlee
+* Pieter Hijma
+* Simon Baars
+* Tim Soethout
+* Waruzjan Shahbazian
+* Yi Dai
+* Arjo Bruijnes
+* Auke Roorda
+* Diego Marcílio
+* Jimi van der Woning
+* Jonathan Leitschuh
+* Markus Klinik
+* Mary Gouseti
+* Mathijs Schuts
+* Mats Stijlaart
+* Nick Lodewijks
+* Rodrigo Bonifácio
+* Todd Hooper

CODEOWNERS

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

CODE_OF_CONDUCT.md

@@ -36,11 +36,11 @@ We are committed to making participation in this community a harassment-free exp
 
 Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
 
-[Project Owners](/about/processes.html) have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Contributors who do not follow the Code of Conduct may be removed from the project team.
+[Project Owners](http://www.usethesource.io/about/processes.html) have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Contributors who do not follow the Code of Conduct may be removed from the project team.
 
 This code of conduct applies both within project spaces and in public spaces when an individual is representing the UseTheSource community or one of its projects.
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by [opening an issue](https://github.com/usethesource/usethesource.github.io/issues) or contacting one or more of the [Project Owners](/projects/).
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by [opening an issue](https://github.com/usethesource/usethesource.github.io/issues) or contacting one or more of the [Project Owners](http://www.usethesource.io/projects/).
 
 This Code of Conduct is adapted from the Contributor Covenant, version 1.1.0, available from <http://contributor-covenant.org/version/1/1/0/>
 

META-INF/RASCAL.MF

@@ -1,5 +1,2 @@
 Project-Name: rascal
-Source: src/org/rascalmpl/library,test/org/rascalmpl/benchmark,test//org/rascalmpl/test/data
-Courses: src/org/rascalmpl/courses
-
-
+Source: src/org/rascalmpl/library,src/org/rascalmpl/compiler,src/org/rascalmpl/library,src/org/rascalmpl/tutor,test/org/rascalmpl/benchmark,test/org/rascalmpl/test/data