diff --git a/bird-core/META-INF/RASCAL.MF b/bird-core/META-INF/RASCAL.MF index 82cd6a5..15416ff 100644 --- a/bird-core/META-INF/RASCAL.MF +++ b/bird-core/META-INF/RASCAL.MF @@ -1,5 +1,4 @@ Manifest-Version: 0.0.1 Project-Name: bird-core Source: src/main/rascal -Require-Libraries: |lib://rascal-lsp|, |lib://typepal| diff --git a/bird-ide/META-INF/RASCAL.MF b/bird-ide/META-INF/RASCAL.MF index ee8852a..f67ed2d 100644 --- a/bird-ide/META-INF/RASCAL.MF +++ b/bird-ide/META-INF/RASCAL.MF @@ -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| diff --git a/bird-ide/pom.xml b/bird-ide/pom.xml index 410526c..05e5139 100644 --- a/bird-ide/pom.xml +++ b/bird-ide/pom.xml @@ -22,6 +22,10 @@ bird-core ${bird.version} + + org.rascalmpl + typepal + diff --git a/bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc b/bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc index 9a13a1d..d02ae7d 100644 --- a/bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc +++ b/bird-ide/src/main/rascal/lang/bird/LanguageServer.rsc @@ -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=" Grammar"); + showInteractiveContent(graph(gg, cfg=cytoGraphConfig(\layout=defaultDagreLayout())), viewColumn=2, title=" Grammar"); return ("result": true); } @@ -158,17 +158,13 @@ default value birdExecutor(value v) { throw "Missing case for "; } - -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")); } + diff --git a/pom.xml b/pom.xml index 2f0b312..d50cc35 100644 --- a/pom.xml +++ b/pom.xml @@ -27,12 +27,12 @@ org.rascalmpl rascal - 0.40.17 + 0.41.0-RC59 org.rascalmpl rascal-lsp - 2.21.2 + 2.22.0-RC2 org.rascalmpl @@ -47,7 +47,7 @@ org.rascalmpl typepal - 0.15.1 + 0.15.2-RC3 junit @@ -63,7 +63,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.5.0 + 3.6.1 enforce-maven @@ -87,7 +87,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.8.0 + 3.8.1 org.apache.maven.plugins @@ -96,7 +96,7 @@ maven-compiler-plugin - 3.13.0 + 3.14.0 11 @@ -104,7 +104,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.0 + 3.5.3 -ea @@ -120,7 +120,7 @@ org.rascalmpl rascal-maven-plugin - 0.28.11 + 0.30.0-RC29 ${project.build.outputDirectory}