Rename roots class and functions for less verbosity.

Author: toinehartman

rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/model/PathConfigs.java

@@ -68,11 +68,11 @@ public class PathConfigs {
     private static final URIResolverRegistry reg = URIResolverRegistry.getInstance();
     private final Map<ISourceLocation, Pair<PathConfig, Instant>> currentPathConfigs = new ConcurrentHashMap<>();
     private final PathConfigUpdater updater = new PathConfigUpdater(currentPathConfigs);
-    private final ProjectRoots projectRoots = new ProjectRoots();
+    private final Projects projects = new Projects();
     private final LoadingCache<ISourceLocation, ISourceLocation> translatedRoots =
         Caffeine.newBuilder()
             .expireAfterAccess(Duration.ofMinutes(20))
-            .build(projectRoots::inferProjectRoot);
+            .build(projects::inferRoot);
 
     private final Executor executor;
     private final PathConfigDiagnostics diagnostics;
@@ -85,7 +85,7 @@ public PathConfigs(Executor executor, PathConfigDiagnostics diagnostics) {
     }
 
     public void expungePathConfig(ISourceLocation project) {
-        var projectRoot = projectRoots.inferProjectRoot(project);
+        var projectRoot = projects.inferRoot(project);
         try {
             updater.unregisterProject(project);
         } catch (IOException e) {

…scode/lsp/rascal/model/ProjectRoots.java …pl/vscode/lsp/rascal/model/Projects.javarascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/model/ProjectRoots.java renamed to rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/model/Projects.java rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/model/ProjectRoots.java renamed to rascal-lsp/src/main/java/org/rascalmpl/vscode/lsp/rascal/model/Projects.java

@@ -31,18 +31,18 @@
 
 import io.usethesource.vallang.ISourceLocation;
 
-public class ProjectRoots {
+public class Projects {
 
     /**
      * Infers the shallowest possible root of the project that `origin` is in.
      */
-    public ISourceLocation inferProjectRoot(ISourceLocation origin) {
-        var innerRoot = inferDeepestProjectRoot(origin);
-        var outerRoot = inferDeepestProjectRoot(URIUtil.getParentLocation(innerRoot));
+    public ISourceLocation inferRoot(ISourceLocation origin) {
+        var innerRoot = inferDeepestRoot(origin);
+        var outerRoot = inferDeepestRoot(URIUtil.getParentLocation(innerRoot));
 
         while (!innerRoot.equals(outerRoot) && isSameProject(innerRoot, outerRoot)) {
             innerRoot = outerRoot;
-            outerRoot = inferDeepestProjectRoot(URIUtil.getParentLocation(innerRoot));
+            outerRoot = inferDeepestRoot(URIUtil.getParentLocation(innerRoot));
         }
 
         return isSameProject(innerRoot, outerRoot)
@@ -59,7 +59,7 @@ private boolean isSameProject(ISourceLocation root1, ISourceLocation root2) {
     /**
      * Infers the longest project root-like path that `member` is in. Might return a sub-directory of `target/`.
      */
-    private ISourceLocation inferDeepestProjectRoot(ISourceLocation origin) {
+    private ISourceLocation inferDeepestRoot(ISourceLocation origin) {
         var manifest = new RascalManifest();
         var root = origin;
 

rascal-lsp/src/main/rascal/lsp/lang/rascal/lsp/IDECheckerWrapper.rsc

@@ -79,7 +79,7 @@ map[loc, set[Message]] checkFile(loc l, set[loc] workspaceFolders, start[Module]
     openFileHeader = openFile.top.header.name;
     checkForImports = [openFile];
     checkedForImports = {};
-    initialProject = inferProjectRoot(l);
+    initialProject = inferRoot(l);
 
     rel[loc, loc] dependencies = {};
 
@@ -88,7 +88,7 @@ map[loc, set[Message]] checkFile(loc l, set[loc] workspaceFolders, start[Module]
         while (tree <- checkForImports) {
             step2("Calculating imports for <tree.top.header.name>", 1);
             currentSrc = tree.src.top;
-            currentProject = inferProjectRoot(currentSrc);
+            currentProject = inferRoot(currentSrc);
             if (currentProject in workspaceFolders && currentProject.file notin {"rascal", "rascal-lsp"}) {
                 for (i <- tree.top.header.imports, i has \module) {
                     modName = "<i.\module>";
@@ -102,7 +102,7 @@ map[loc, set[Message]] checkFile(loc l, set[loc] workspaceFolders, start[Module]
                             if (mlpt.src.top notin checkedForImports) {
                                 checkForImports += mlpt;
                                 jobTodo("Building dependency graph");
-                                dependencies += <currentProject, inferProjectRoot(mlpt.src.top)>;
+                                dependencies += <currentProject, inferRoot(mlpt.src.top)>;
                             }
                         }
                     }
@@ -123,7 +123,7 @@ map[loc, set[Message]] checkFile(loc l, set[loc] workspaceFolders, start[Module]
     if (cyclicDependencies != {}) {
         return (l : {error("Cyclic dependencies detected between projects {<intercalate(", ", [*cyclicDependencies])>}. This is not supported. Fix your project setup.", l)});
     }
-    modulesPerProject = classify(checkedForImports, loc(loc l) {return inferProjectRoot(l);});
+    modulesPerProject = classify(checkedForImports, loc(loc l) {return inferRoot(l);});
     msgs = [];
 
     upstreamDependencies = {project | project <- reverse(order(dependencies)), project in modulesPerProject, project != initialProject};
@@ -196,7 +196,7 @@ set[loc] locateRascalModules(str fqn, PathConfig pcfg, PathConfig(loc file) getP
     // Check the source directories
     return {fileLoc | dir <- pcfg.srcs, fileLoc := dir + fileName, exists(fileLoc)}
     // And libraries available in the current workspace
-         + {fileLoc | lib <- pcfg.libs, inWorkspace(workspaceFolders, lib), dir <- getPathConfig(inferProjectRoot(lib)).srcs, fileLoc := dir + fileName, exists(fileLoc)};
+         + {fileLoc | lib <- pcfg.libs, inWorkspace(workspaceFolders, lib), dir <- getPathConfig(inferRoot(lib)).srcs, fileLoc := dir + fileName, exists(fileLoc)};
 }
 
 loc targetToProject(loc l) {
@@ -207,8 +207,8 @@ loc targetToProject(loc l) {
 }
 
 @synopsis{Infers the root of the project that `member` is in.}
-@javaClass{org.rascalmpl.vscode.lsp.rascal.model.ProjectRoots}
-java loc inferProjectRoot(loc member);
+@javaClass{org.rascalmpl.vscode.lsp.rascal.model.Projects}
+java loc inferRoot(loc member);
 
 map[loc, set[Message]] filterAndFix(list[ModuleMessages] messages, set[loc] workspaceFolders) {
     set[Message] empty = {};

rascal-lsp/src/test/java/org/rascalmpl/vscode/lsp/rascal/model/PathConfigsTest.java

@@ -43,11 +43,11 @@ public class PathConfigsTest {
     private static final IRascalValueFactory VF = IRascalValueFactory.getInstance();
     private static final URIResolverRegistry reg = URIResolverRegistry.getInstance();
 
-    private final ProjectRoots roots = new ProjectRoots();
+    private final Projects roots = new Projects();
 
     private void checkRoot(ISourceLocation project, String modulePath) throws URISyntaxException {
         var m = VF.sourceLocation(project.getScheme(), project.getAuthority(), project.getPath() + "/" + modulePath);
-        var root = roots.inferProjectRoot(m);
+        var root = roots.inferRoot(m);
         assertEquals(project, root);
     }