Skip to content

Commit ced66b1

Browse files
Patch for changes for mainSource variable
Naming changes
1 parent 7c9c7a7 commit ced66b1

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

build.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
patches/7893-draft.diff
6060
patches/8442-draft.diff
6161
patches/8460-draft.diff
62+
patches/8470-draft.diff
6263
patches/disable-error-notification.diff
6364
patches/mvn-sh.diff
6465
patches/project-marker-jdk.diff

patches/8470-draft.diff

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
2+
index 01d92d5c82a3..49676ecae0a7 100644
3+
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
4+
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
5+
@@ -563,12 +563,7 @@ public void finished(boolean success) {
6+
protected static @CheckForNull Pair<ActionProvider, String> findTarget(Project prj, boolean preferProjActions, FileObject toRun, SingleMethod singleMethod, NestedClass nestedClass, boolean debug, boolean testRun, boolean testInParallel, ContainedProjectFilter projectFilter) {
7+
ClassPath sourceCP = ClassPath.getClassPath(toRun, ClassPath.SOURCE);
8+
FileObject fileRoot = sourceCP != null ? sourceCP.findOwnerRoot(toRun) : null;
9+
- boolean mainSource;
10+
- if (fileRoot != null) {
11+
- mainSource = UnitTestForSourceQuery.findUnitTests(fileRoot).length > 0;
12+
- } else {
13+
- mainSource = !testRun;
14+
- }
15+
+ boolean mainSource = !testRun;
16+
ActionProvider provider = null;
17+
String command = null;
18+
Collection<ActionProvider> actionProviders = findActionProviders(prj);

0 commit comments

Comments
 (0)