Merge pull request #41873 from axewilledge/2201.8.x_origin

[2201.8.x] Update component fetch logic
ballerina-platform · Jan 9, 2024 · a955730 · a955730
2 parents e3c05d9 + fce3914
commit a955730
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/...a/org/ballerinalang/langserver/extensions/ballerina/packages/BallerinaPackageService.java b/...a/org/ballerinalang/langserver/extensions/ballerina/packages/BallerinaPackageService.java
@@ -98,15 +98,21 @@ public CompletableFuture<PackageComponentsResponse> components(PackageComponents
             try {
                 Arrays.stream(documentIdentifiers).iterator().forEachRemaining(documentIdentifier -> {
                     PathUtil.getPathFromURI(documentIdentifier.getUri()).ifPresent(path -> {
-                        Optional<Project> project = this.workspaceManager.project(path);
-                        project.ifPresent(value -> jsonPackages.add(getPackageComponents(value)));
+                        Project project = null;
+                        try {
+                            project = this.workspaceManager.loadProject(path);
+                            jsonPackages.add(getPackageComponents(project));
+                        } catch (Throwable e) {
+                            String msg = "Operation 'ballerinaPackage/components' load project failed!";
+                            this.clientLogger.logError(PackageContext.PACKAGE_COMPONENTS, msg, e, null);
+                        }
                     });
                 });
-                response.setProjectPackages(jsonPackages);
             } catch (Throwable e) {
                 String msg = "Operation 'ballerinaPackage/components' failed!";
                 this.clientLogger.logError(PackageContext.PACKAGE_COMPONENTS, msg, e, null, (Position) null);
             }
+            response.setProjectPackages(jsonPackages);
             return response;
         });
     }

diff --git a/...s/langserver-core/src/test/java/org/ballerinalang/langserver/packages/ComponentsTest.java b/...s/langserver-core/src/test/java/org/ballerinalang/langserver/packages/ComponentsTest.java
@@ -61,7 +61,6 @@ public void packageComponentsTestCase(String[] projects, String expected) throws
         List<String> filePaths = new ArrayList<>();
         for (String project : projects) {
             Path path = configsPath.resolve(project).resolve("main.bal").toAbsolutePath();
-            TestUtil.openDocument(serviceEndpoint, path);
             filePaths.add(path.toString());
         }
 
@@ -133,7 +132,8 @@ public Object[][] getDataProvider() {
                 {new String[]{"project", "project-functions", "project-services", "single-file"},
                         "multiple-packages_expected.json"},
                 {new String[]{"single-file"}, "single-file-package_expected.json"},
-                {new String[]{"project-other"}, "project-other_expected.json"}
+                {new String[]{"project-other"}, "project-other_expected.json"},
+                {new String[]{"non-exist"}, "project-exception_expected.json"}
         };
     }
 }
diff --git a/...es/langserver-core/src/test/resources/packages/components/project-exception_expected.json b/...es/langserver-core/src/test/resources/packages/components/project-exception_expected.json
@@ -0,0 +1,3 @@
+{
+  "result": []
+}