Skip to content

Update to latest rascal #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Update to latest rascal #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
626c482
No longer using Require-Libraries in RASCAL.MF
rodinaarssen Sep 10, 2025
ab2e706
Bumped all dependencies
rodinaarssen Sep 10, 2025
60277a5
bird-ide now depends on typepal
rodinaarssen Sep 10, 2025
3b498c7
The LanguageServer now uses a better PathConfig and no longer depends…
rodinaarssen Sep 10, 2025
8294829
Changed visualization after upstream signature changes
rodinaarssen Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bird-core/META-INF/RASCAL.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Manifest-Version: 0.0.1
Project-Name: bird-core
Source: src/main/rascal
Require-Libraries: |lib://rascal-lsp|, |lib://typepal|

1 change: 0 additions & 1 deletion bird-ide/META-INF/RASCAL.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ Project-Name: bird-ide
Source: src/main/rascal
Main-Module: lang::bird::LanguageServer
Main-Function: birdLanguageContributor
Require-Libraries: |lib://bird-core|, |lib://typepal|, |lib://rascal-lsp|
4 changes: 4 additions & 0 deletions bird-ide/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
<artifactId>bird-core</artifactId>
<version>${bird.version}</version>
</dependency>
<dependency>
<groupId>org.rascalmpl</groupId>
<artifactId>typepal</artifactId>
</dependency>
</dependencies>
<build>
<resources>
Expand Down
10 changes: 3 additions & 7 deletions bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ lrel[loc, Command] birdLenses(start[Program] input) {

value birdExecutor(visualizeDependencies(loc decl, str name)) {
gg = buildGrammarGraph(decl);
showInteractiveContent(graph(gg, \layout=defaultDagreLayout()), viewColumn=2, title="<name> Grammar");
showInteractiveContent(graph(gg, cfg=cytoGraphConfig(\layout=defaultDagreLayout())), viewColumn=2, title="<name> Grammar");
return ("result": true);
}

Expand Down Expand Up @@ -158,17 +158,13 @@ default value birdExecutor(value v) {
throw "Missing case for <v>";
}


list[loc] libs = [
|jar+project://bird-core/target/lib/typepal.jar!/src|
];

void main() {
registerLanguage(
language(
pathConfig(srcs=[|project://bird-core/src/main/rascal|, |project://bird-ide/src/main/rascal|, *libs]),
getProjectPathConfig(|project://bird-ide|, mode=interpreter())[messages=[]],
"Bird",
{"bird"},
"lang::bird::LanguageServer",
"birdLanguageContributor"));
}

16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
<dependency>
<groupId>org.rascalmpl</groupId>
<artifactId>rascal</artifactId>
<version>0.40.17</version>
<version>0.41.0-RC59</version>
</dependency>
<dependency>
<groupId>org.rascalmpl</groupId>
<artifactId>rascal-lsp</artifactId>
<version>2.21.2</version>
<version>2.22.0-RC2</version>
<exclusions> <!-- we exclude dependencies we don't really need, or maybe want to have our own -->
<exclusion>
<groupId>org.rascalmpl</groupId>
Expand All @@ -47,7 +47,7 @@
<dependency>
<groupId>org.rascalmpl</groupId>
<artifactId>typepal</artifactId>
<version>0.15.1</version>
<version>0.15.2-RC3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.1</version>
<executions>
<execution>
<id>enforce-maven</id>
Expand All @@ -87,7 +87,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.8.0</version>
<version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -96,15 +96,15 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>3.14.0</version>
<configuration>
<release>11</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.3</version>
<configuration>
<argLine>
-ea
Expand All @@ -120,7 +120,7 @@
<plugin>
<groupId>org.rascalmpl</groupId>
<artifactId>rascal-maven-plugin</artifactId>
<version>0.28.11</version>
<version>0.30.0-RC29</version>
<configuration>
<bin>${project.build.outputDirectory}</bin>
<srcs>
Expand Down