Merge pull request apache#7518 from dbalek/dbalek/micronaut-bug-fixes

Micronaut: minor bugs fixed.
dbalek · Jun 25, 2024 · 5e8b62d · 5e8b62d
2 parents b52e02c + 34bfb0a
commit 5e8b62d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautEntity.java b/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautEntity.java
@@ -104,7 +104,7 @@ public static MicronautEntity create() {
 
     @NbBundle.Messages({
         "MSG_NoDbConn=No database connection found",
-        "MSG_NoDdSupport=No database support libraries found for {0}",
+        "MSG_NoDdSupport=No Micronaut Data support libraries found for {0}",
         "MSG_NoProject=No project found for {0}",
         "MSG_NoSourceGroup=No source group found for {0}",
         "MSG_SelectTables=Select Database Tables",

diff --git a/...va.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java b/...va.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java
@@ -1058,7 +1058,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
                         js.runWhenScanFinished(cc -> {
                             WORKER.post(() -> {
                                 try {
-                                    List<WorkspaceSymbol> symbols = new ArrayList<>();
+                                    Set<WorkspaceSymbol> symbols = new HashSet<>();
                                     SearchType searchType = getSearchType(queryFin, exactFin, false, null, null);
 
                                     // CSL Part
@@ -1218,7 +1218,7 @@ public void addResult(List<? extends Pair<ElementHandle<TypeElement>, FileObject
                                             symbols.add(symbol);
                                         }
                                     }
-                                    result.complete(Either.forRight(symbols));
+                                    result.complete(Either.forRight(new ArrayList<>(symbols)));
                                 } catch (Throwable t) {
                                     result.completeExceptionally(t);
                                 }

diff --git a/...va.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java b/...va.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/ServerTest.java
@@ -1944,11 +1944,12 @@ public CompletableFuture<ShowDocumentResult> showDocument(ShowDocumentParams par
             }
             return ws.getKind() + ":" + ws.getName() + ":" + ws.getContainerName() + ":" + (ws.getLocation().isLeft() ? toString(ws.getLocation().getLeft()) : toString(ws.getLocation().getRight()));
         }).collect(Collectors.toList());
-        assertEquals(Arrays.asList("Constructor:Test():Test:Test.java:0:7-0:7",
-                                   "Method:testMethod():Test:Test.java:2:4-2:38",
+        Collections.sort(actual);
+        assertEquals(Arrays.asList("Class:Test:null:?CLASS#Test",
+                                   "Class:TestNested:Test:?CLASS#Test$TestNested",
+                                   "Constructor:Test():Test:Test.java:0:7-0:7",
                                    "Constructor:TestNested():Test.TestNested:Test.java:1:18-1:18",
-                                   "Class:Test:null:?CLASS#Test",
-                                   "Class:TestNested:Test:?CLASS#Test$TestNested"),
+                                   "Method:testMethod():Test:Test.java:2:4-2:38"),
                      actual);
     }