Skip to content

Extract path config-based classpath computation #2847

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

Merged
DavyLandman merged 3 commits into from
Aug 18, 2026
+12 −4
Merged

Extract path config-based classpath computation #2847

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b6d09e
Unify path config-based classpath computations.
toinehartman Aug 17, 2026
68d9ded
Revert tutor classpath change.
toinehartman Aug 17, 2026
40364f8
Move function to evaluator factory.
toinehartman Aug 18, 2026
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
16 changes: 12 additions & 4 deletions src/org/rascalmpl/shell/ShellEvaluatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import java.io.PrintWriter;
import java.io.Reader;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;

import org.rascalmpl.debug.IRascalMonitor;
import org.rascalmpl.ideservices.IDEServices;
Expand Down Expand Up @@ -64,14 +66,11 @@ private static Evaluator getDefaultEvaluatorForPathConfig(ISourceLocation projec
evaluator.addRascalSearchPath((ISourceLocation) srcPath);
}

var isRascal = projectRoot != null && new RascalManifest().getProjectName(projectRoot).equals("rascal");

for (var lib : pcfg.getLibs()) {
evaluator.addRascalSearchPath((ISourceLocation) lib);
}

var libs = isRascal ? pcfg.getLibs() : pcfg.getLibsAndTarget();
evaluator.addClassLoader(new SourceLocationClassLoader(libs, ClassLoader.getSystemClassLoader()));
evaluator.addClassLoader(new SourceLocationClassLoader(getClasspath(pcfg), ClassLoader.getSystemClassLoader()));

return evaluator;
}
Expand Down Expand Up @@ -119,4 +118,13 @@ private static void registerProjectAndTargetResolver(Function<ISourceLocation,IS
reg.registerLogical(new IDETargetURIResolver(resolver));
}

public static List<ISourceLocation> getClasspath(PathConfig pcfg) {
var projectRoot = pcfg.getProjectRoot();
var isRascal = projectRoot != null && new RascalManifest().getProjectName(projectRoot).equals("rascal");
var libs = isRascal ? pcfg.getLibs() : pcfg.getLibsAndTarget();
return libs.stream()
.map(ISourceLocation.class::cast)
.collect(Collectors.toList());
}

}
Loading