Skip to content

[JVSC #199] Backport NetBeans 24 patch 7610 #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 14, 2024
Merged

[JVSC #199] Backport NetBeans 24 patch 7610 #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbb03db
[JVSC #199] Backport NetBeans 24 patch 7610
sid-srini Aug 13, 2024
3de4956
Update build.xml with ascending numeric order of PR patches
sid-srini Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
patches/7491-preliminary.diff
patches/7548_source-1.8.diff
patches/7583_source-1.8.diff
patches/7610.diff
patches/7621.diff
patches/mvn-sh.diff
patches/generate-dependencies.diff
Expand Down
130 changes: 130 additions & 0 deletions patches/7610.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/singlesourcefile/SingleFileOptionsQueryImpl.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/singlesourcefile/SingleFileOptionsQueryImpl.java
index da4898786f11..2e0e5a3aa4e6 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/singlesourcefile/SingleFileOptionsQueryImpl.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/singlesourcefile/SingleFileOptionsQueryImpl.java
@@ -20,10 +20,11 @@

import java.io.File;
import java.net.URI;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.Set;
import java.util.WeakHashMap;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -54,19 +55,37 @@ public Result optionsFor(FileObject file) {
if (workspaceFolder != null) {
return getResult(workspace, workspaceFolder);
} else {
- Set<Workspace> workspaces;
+ List<Workspace> workspaces;

synchronized (this) {
- workspaces = workspace2Settings.keySet();
+ workspaces = new ArrayList<>(workspace2Settings.keySet());
}

+ int count = 0;
for (Workspace w : workspaces) {
+ if (w == null)
+ continue; // Since a WeakHashMap is in use, it is possible to receive a null value.
FileObject folder = findWorkspaceFolder(w, file);
if (folder != null) {
return getResult(w, folder);
}
+ if (count++ == 0 && workspace == null)
+ workspace = w;
}

+ if (count == 1) {
+ // Since this is a single source file, associate it with the single open workspace,
+ // even when it is not a descendant of one of the root folders.
+ FileObject folder;
+ if (file.isFolder()) {
+ folder = file;
+ } else {
+ folder = file.getParent();
+ if (folder == null)
+ folder = file;
+ }
+ return getResult(workspace, folder);
+ }
return null;
}
}
diff --git a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/singlesourcefile/SingleFileOptionsQueryImplTest.java b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/singlesourcefile/SingleFileOptionsQueryImplTest.java
index 4c6d3c812f3a..a61ea98d7a24 100644
--- a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/singlesourcefile/SingleFileOptionsQueryImplTest.java
+++ b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/singlesourcefile/SingleFileOptionsQueryImplTest.java
@@ -19,6 +19,7 @@
package org.netbeans.modules.java.lsp.server.singlesourcefile;

import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.netbeans.junit.NbTestCase;
@@ -58,6 +59,17 @@ public void testFindWorkspaceFolder() throws Exception {
assertEquals(workspace2, SingleFileOptionsQueryImpl.findWorkspaceFolder(workspace, source2));
assertEquals(workspace2, SingleFileOptionsQueryImpl.findWorkspaceFolder(workspace, source2.getParent()));
assertEquals(workspace2, SingleFileOptionsQueryImpl.findWorkspaceFolder(workspace, source2.getParent().getParent()));
+
+ FileObject singleSourceDir = FileUtil.createFolder(wd, "standalone");
+ FileObject singleSourceFile = FileUtil.createData(singleSourceDir, "Test.java");
+
+ assertNull(SingleFileOptionsQueryImpl.findWorkspaceFolder(workspace, singleSourceFile));
+ assertNull(SingleFileOptionsQueryImpl.findWorkspaceFolder(workspace, singleSourceDir));
+
+ Workspace emptyWorkspace = new WorkspaceImpl(Collections.emptyList());
+
+ assertNull(SingleFileOptionsQueryImpl.findWorkspaceFolder(emptyWorkspace, singleSourceFile));
+ assertNull(SingleFileOptionsQueryImpl.findWorkspaceFolder(emptyWorkspace, singleSourceDir));
}

public void testWorkspaceOptions() throws Exception {
@@ -84,6 +96,17 @@ public void testWorkspaceOptions() throws Exception {
assertEquals("-Dtest=test", query.optionsFor(source2.getParent()).getOptions());
assertEquals(workspace2.toURI(), query.optionsFor(source2.getParent()).getWorkDirectory());

+ assertNotNull(query.optionsFor(source3));
+ assertEquals("-Dtest=test", query.optionsFor(source3).getOptions());
+ assertEquals(source3.getParent().toURI(), query.optionsFor(source3).getWorkDirectory());
+
+ assertNotNull(query.optionsFor(source3.getParent()));
+ assertEquals("-Dtest=test", query.optionsFor(source3.getParent()).getOptions());
+ assertEquals(source3.getParent().toURI(), query.optionsFor(source3.getParent()).getWorkDirectory());
+
+ assertEquals(query.optionsFor(source3), query.optionsFor(source3.getParent()));
+ assertNull(query.optionsFor(wd));
+
AtomicInteger changeCount = new AtomicInteger();

query.optionsFor(source1).addChangeListener(evt -> changeCount.incrementAndGet());
@@ -149,6 +172,24 @@ public void testWorkspaceOptions() throws Exception {
assertEquals("-Dtest=test2", query.optionsFor(source2.getParent()).getOptions());
assertEquals(workspace2.toURI(), query.optionsFor(source2.getParent()).getWorkDirectory());

+ assertNotNull(query.optionsFor(source3));
+ assertEquals("-Dtest=test2", query.optionsFor(source3).getOptions());
+ assertEquals(source3.getParent().toURI(), query.optionsFor(source3).getWorkDirectory());
+ assertNotNull(query.optionsFor(source3.getParent()));
+ assertEquals("-Dtest=test2", query.optionsFor(source3.getParent()).getOptions());
+ assertEquals(source3.getParent().toURI(), query.optionsFor(source3.getParent()).getWorkDirectory());
+ assertEquals(query.optionsFor(source3), query.optionsFor(source3.getParent()));
+
+ // with multiple open workspaces:
+ Workspace emptyWorkspace = new WorkspaceImpl(Collections.emptyList());
+ query.setConfiguration(emptyWorkspace, "-Dtest=empty", null);
+
+ assertEquals("-Dtest=test2", query.optionsFor(source1).getOptions());
+ assertEquals(workspace1.toURI(), query.optionsFor(source1).getWorkDirectory());
+
+ assertEquals("-Dtest=test2", query.optionsFor(source2).getOptions());
+ assertEquals(workspace2.toURI(), query.optionsFor(source2).getWorkDirectory());
+
assertNull(query.optionsFor(source3));
assertNull(query.optionsFor(source3.getParent()));
}