Skip to content

Commit 1106a5a

Browse files
sid-srinisid-srini
authored
Merge pull request #473 from sid-srini/backport-nb28-fixes
Backporting useful NB28 patches
2 parents faf5a6a + 58d3a8c commit 1106a5a

File tree

12 files changed

+2346
-5
lines changed

12 files changed

+2346
-5
lines changed

‎build.xml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,24 @@
4949
patches/6330.diff
5050
patches/7610.diff
5151
patches/8038-draft.diff
52-
patches/8690.diff
53-
patches/8829.diff
54-
patches/8828.diff
5552
patches/7893-draft.diff
5653
patches/8460-draft.diff
57-
patches/8745-draft.diff
54+
patches/8662.diff
55+
patches/8664.diff
56+
patches/8690.diff
57+
patches/8694.diff
58+
patches/8745.diff
59+
patches/8748.diff
60+
patches/8760.diff
5861
patches/8770.diff
62+
patches/8762.diff
63+
patches/8769.diff
64+
patches/8797.diff
65+
patches/8816.diff
66+
patches/8821.diff
5967
patches/8827.diff
68+
patches/8828.diff
69+
patches/8829.diff
6070
patches/8856-draft.diff
6171
patches/disable-error-notification.diff
6272
patches/mvn-sh.diff

‎patches/8662.diff‎

Lines changed: 404 additions & 0 deletions
Large diffs are not rendered by default.

‎patches/8664.diff‎

Lines changed: 1049 additions & 0 deletions
Large diffs are not rendered by default.

‎patches/8694.diff‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/NbProtocolServer.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/NbProtocolServer.java
2+
index 6fe9ece2c0cb..82f5346568d1 100644
3+
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/NbProtocolServer.java
4+
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/NbProtocolServer.java
5+
@@ -81,7 +81,9 @@
6+
import org.netbeans.api.debugger.jpda.JPDADebugger;
7+
import org.netbeans.api.debugger.jpda.ObjectVariable;
8+
import org.netbeans.api.debugger.jpda.Variable;
9+
+import org.netbeans.api.project.Project;
10+
import org.netbeans.modules.debugger.jpda.truffle.vars.TruffleVariable;
11+
+import org.netbeans.modules.java.lsp.server.LspServerState;
12+
import org.netbeans.modules.java.lsp.server.LspSession;
13+
import org.netbeans.modules.java.lsp.server.URITranslator;
14+
import org.netbeans.modules.java.lsp.server.debugging.breakpoints.NbBreakpointsRequestHandler;
15+
@@ -165,6 +167,20 @@ public CompletableFuture<Capabilities> initialize(InitializeRequestArguments arg
16+
caught.setLabel("Caught Exceptions");
17+
caps.setExceptionBreakpointFilters(new ExceptionBreakpointsFilter[]{uncaught, caught});
18+
caps.setSupportsExceptionInfoRequest(true);
19+
+
20+
+ LspServerState lspServerState = context.getLspSession().getLookup().lookup(LspServerState.class);
21+
+ if (lspServerState != null) {
22+
+ CompletableFuture<Project[]> initDone = lspServerState.openedProjects();
23+
+ if (!initDone.isDone()) {
24+
+ LOGGER.log(Level.INFO, "Waiting on LS protocol server {0} to finish initialization", lspServerState);
25+
+ return lspServerState.openedProjects().thenApply(prjs -> {
26+
+ LOGGER.log(Level.FINE, "LS protocol server {0} initialized, DAP init complete", lspServerState);
27+
+ return caps;
28+
+ });
29+
+ } else {
30+
+ LOGGER.log(Level.FINE, "LS protocol server {0} ready", lspServerState);
31+
+ }
32+
+ }
33+
return CompletableFuture.completedFuture(caps);
34+
}
35+
36+
diff --git a/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java b/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
37+
index 81a7feb329f2..c1d60f9c4b71 100644
38+
--- a/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
39+
+++ b/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
40+
@@ -37,6 +37,7 @@
41+
import java.util.Map;
42+
import java.util.UUID;
43+
import java.util.concurrent.ExecutionException;
44+
+import java.util.concurrent.atomic.AtomicInteger;
45+
import java.util.function.Consumer;
46+
import java.util.logging.Level;
47+
import java.util.logging.Logger;
48+
@@ -128,6 +129,12 @@ public class MavenCommandLineExecutor extends AbstractMavenExecutor {
49+
private String processUUID;
50+
private Process preProcess;
51+
private String preProcessUUID;
52+
+
53+
+ /**
54+
+ * Diagnostics: stracktrace that shows what code requested the execution.
55+
+ */
56+
+ private final Throwable trace;
57+
+
58+
private static final SpecificationVersion VER18 = new SpecificationVersion("1.8"); //NOI18N
59+
private static final Logger LOGGER = Logger.getLogger(MavenCommandLineExecutor.class.getName());
60+
61+
@@ -191,6 +198,11 @@ public ExecutorTask execute(RunConfig config, InputOutput io, TabContext tc) {
62+
public MavenCommandLineExecutor(RunConfig conf, InputOutput io, TabContext tc) {
63+
super(conf, tc);
64+
this.io = io;
65+
+ if (LOGGER.isLoggable(Level.FINER)) {
66+
+ this.trace = new Throwable();
67+
+ } else {
68+
+ this.trace = null;
69+
+ }
70+
}
71+
72+
/**
73+
@@ -331,6 +343,8 @@ public void actionPerformed(ActionEvent e) {
74+
// ioput.getOut().println(key + ":" + env.get(key));
75+
// }
76+
ProcessBuilder builder = constructBuilder(clonedConfig, ioput);
77+
+ LOGGER.log(Level.FINER, "Executing process {0} from {1}", new Object[] { builder.command(), this });
78+
+ LOGGER.log(Level.FINER, "Origin:", this.trace);
79+
printCoSWarning(clonedConfig, ioput);
80+
processUUID = UUID.randomUUID().toString();
81+
builder.environment().put(KEY_UUID, processUUID);
82+
@@ -348,6 +362,7 @@ public void actionPerformed(ActionEvent e) {
83+
throw death;
84+
} finally {
85+
BuildExecutionSupport.registerFinishedItem(item);
86+
+ LOGGER.log(Level.FINER, "Execution of {0} terminated", this );
87+
88+
try { //defend against badly written extensions..
89+
out.buildFinished();

‎patches/8745-draft.diff‎ renamed to ‎patches/8745.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractJavaPlatformProviderOverride.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractJavaPlatformProviderOverride.java
2-
index df668954dd..054f85d0e5 100644
2+
index df668954dd94..054f85d0e59e 100644
33
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractJavaPlatformProviderOverride.java
44
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractJavaPlatformProviderOverride.java
55
@@ -39,6 +39,14 @@ public abstract class AbstractJavaPlatformProviderOverride implements JavaPlatfo

‎patches/8748.diff‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
diff --git a/platform/openide.util.lookup/src/META-INF/gradle/incremental.annotation.processors b/platform/openide.util.lookup/src/META-INF/gradle/incremental.annotation.processors
2+
new file mode 100644
3+
index 000000000000..918b4bbf6505
4+
--- /dev/null
5+
+++ b/platform/openide.util.lookup/src/META-INF/gradle/incremental.annotation.processors
6+
@@ -0,0 +1 @@
7+
+org.netbeans.modules.openide.util.ServiceProviderProcessor,aggregating
8+
\ No newline at end of file

‎patches/8760.diff‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/ide/editor.lib2/src/org/netbeans/spi/editor/highlighting/support/HighlightsContainers.java b/ide/editor.lib2/src/org/netbeans/spi/editor/highlighting/support/HighlightsContainers.java
2+
index 5447ab950347..56de41045d8d 100644
3+
--- a/ide/editor.lib2/src/org/netbeans/spi/editor/highlighting/support/HighlightsContainers.java
4+
+++ b/ide/editor.lib2/src/org/netbeans/spi/editor/highlighting/support/HighlightsContainers.java
5+
@@ -38,6 +38,9 @@ class InlineHintsSettingsAwareContainer extends AbstractHighlightsContainer impl
6+
7+
public InlineHintsSettingsAwareContainer() {
8+
String mimeType = DocumentUtilities.getMimeType(doc);
9+
+ if (mimeType == null) {
10+
+ mimeType = "";
11+
+ }
12+
prefs = MimeLookup.getLookup(mimeType).lookup(Preferences.class);
13+
prefs.addPreferenceChangeListener(WeakListeners.create(PreferenceChangeListener.class, this, prefs));
14+
inlineSettingChanged();

0 commit comments

Comments
 (0)