Skip to content

Commit 7aa1b48

Browse files
authored
Merge pull request #2169 from usethesource/fix/rascal-core-update-new-pathconfig
Fix rascal-core using outdated fields & fix source path calculation for compiler mode
2 parents e04a9a7 + b58f606 commit 7aa1b48

File tree

5 files changed

+239
-229
lines changed

5 files changed

+239
-229
lines changed

src/org/rascalmpl/compiler/lang/rascalcore/check/Checker.rsc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ tuple[bool, ModuleStatus] libraryDependenciesAreCompatible(list[loc] candidates,
564564
data ModuleMessages = program(loc src, set[Message] messages);
565565
566566
list[ModuleMessages] check(list[loc] moduleLocs, RascalCompilerConfig compilerConfig){
567-
pcfg1 = compilerConfig.typepalPathConfig; pcfg1.classloaders = []; pcfg1.javaCompilerPath = [];
567+
pcfg1 = compilerConfig.typepalPathConfig;
568568
compilerConfig.typepalPathConfig = pcfg1;
569569
ms = rascalTModelForLocs(moduleLocs, compilerConfig, dummy_compile1);
570570
messagesNoModule = {};

src/org/rascalmpl/compiler/lang/rascalcore/check/TestConfigs.rsc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,7 @@ public PathConfig getVSCodePathConfig() {
337337
pathConfig(
338338
ignores=[],
339339
resources=|file:///Users/paulklint/git/rascal-language-servers/rascal-lsp/target/classes/|,
340-
javaCompilerPath=[],
341340
bin=|file:///Users/paulklint/git/rascal-language-servers/rascal-lsp/target/classes/|,
342-
classloaders=[],
343341
generatedSources=|file:///Users/paulklint/git/rascal-language-servers/rascal-lsp/generated-sources|,
344342
libs=[
345343
|jar+file:///Users/paulklint/.m2/repository/org/rascalmpl/rascal/0.41.0-RC10/rascal-0.41.0-RC10.jar!/|,

0 commit comments

Comments
 (0)