Fix a project caching issue during debugger restarts

ballerina-platform · Dec 4, 2024 · 38a426c · 38a426c
1 parent 0d9e94d
commit 38a426c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/...es/debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/DebugProjectCache.java b/...es/debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/DebugProjectCache.java
@@ -52,20 +52,8 @@ public DebugProjectCache() {
     public Project getProject(Path filePath) {
         Map.Entry<ProjectKind, Path> projectKindAndRoot = computeProjectKindAndRoot(filePath);
         Path projectRoot = projectKindAndRoot.getValue();
-        if (!loadedProjects.containsKey(projectRoot)) {
-            addProject(loadProject(filePath.toAbsolutePath().toString()));
-        }
-        return loadedProjects.get(projectRoot);
-    }
 
-    /**
-     * Adds the given project instance into the cache.
-     *
-     * @param project project instance.
-     */
-    public void addProject(Project project) {
-        Path projectSourceRoot = project.sourceRoot().toAbsolutePath();
-        loadedProjects.put(projectSourceRoot, project);
+        return loadedProjects.computeIfAbsent(projectRoot, key -> loadProject(projectKindAndRoot));
     }
 
     /**
@@ -78,13 +66,10 @@ public void clear() {
     /**
      * Loads the target ballerina source project instance using the Project API, from the file path of the open/active
      * editor instance in the client(plugin) side.
-     *
-     * @param filePath file path of the open/active editor instance in the plugin side.
      */
-    private static Project loadProject(String filePath) {
-        Map.Entry<ProjectKind, Path> projectKindAndProjectRootPair = computeProjectKindAndRoot(Path.of(filePath));
-        ProjectKind projectKind = projectKindAndProjectRootPair.getKey();
-        Path projectRoot = projectKindAndProjectRootPair.getValue();
+    private static Project loadProject(Map.Entry<ProjectKind, Path> projectKindAndRoot) {
+        ProjectKind projectKind = projectKindAndRoot.getKey();
+        Path projectRoot = projectKindAndRoot.getValue();
         BuildOptions options = BuildOptions.builder().setOffline(true).build();
         if (projectKind == ProjectKind.BUILD_PROJECT) {
             return BuildProject.load(projectRoot, options);

diff --git a/...les/debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/ExecutionContext.java b/...les/debug-adapter-core/src/main/java/org/ballerinalang/debugadapter/ExecutionContext.java
@@ -144,17 +144,12 @@ public Project getSourceProject() {
     public void setSourceProject(Project sourceProject) {
         this.sourceProject = sourceProject;
         this.setSourceProjectRoot(sourceProject.sourceRoot().toAbsolutePath().toString());
-        updateProjectCache(sourceProject);
     }
 
     public DebugProjectCache getProjectCache() {
         return projectCache;
     }
 
-    public void updateProjectCache(Project project) {
-        this.projectCache.addProject(project);
-    }
-
     public String getSourceProjectRoot() {
         return sourceProjectRoot;
     }