Skip to content

Commit 65bce92

Browse files
committed
upgraded language server to netbeans 25
1 parent 46f024d commit 65bce92

19 files changed

+12
-6479
lines changed

build.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,7 @@
4545
<loadresource property="patch-files">
4646
<string>
4747
patches/6330.diff
48-
patches/7491.diff
4948
patches/7610.diff
50-
patches/7641.diff
51-
patches/7654.diff
52-
patches/7670.diff
53-
patches/7699.diff
54-
patches/7709.diff
55-
patches/7722.diff
56-
patches/7724.diff
57-
patches/7733.diff
58-
patches/7750.diff
59-
patches/7910.diff
60-
patches/7921.diff
61-
patches/7923.diff
62-
patches/7926.diff
6349
patches/8036-draft.diff
6450
patches/8038-draft.diff
6551
patches/mvn-sh.diff
@@ -69,7 +55,6 @@
6955
patches/remove-db.diff
7056
patches/nbjavac-not-required.diff
7157
patches/l10n-licence.diff
72-
patches/no-security-manager-allow.diff
7358
patches/dev-dependency-licenses.diff
7459
</string>
7560
<filterchain>

netbeans

Submodule netbeans updated 5298 files

patches/6330.diff

Lines changed: 6 additions & 8 deletions
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/ConnectionSpec.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ConnectionSpec.java
2-
index 9ab389564c..9b7c044c81 100644
2+
index bb8a4e8183..b9662fe6cd 100644
33
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ConnectionSpec.java
44
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ConnectionSpec.java
55
@@ -25,7 +25,7 @@ import java.io.OutputStream;
@@ -86,11 +86,10 @@ index 9ab389564c..9b7c044c81 100644
8686
} catch (IOException ex) {
8787
if (isClosed(server)) {
8888
break;
89-
@@ -129,26 +152,54 @@ final class ConnectionSpec implements Closeable {
90-
}
89+
@@ -130,25 +153,53 @@ final class ConnectionSpec implements Closeable {
9190
};
9291
listeningThread.start();
93-
- out.write((prefix + " listening at port " + localPort).getBytes());
92+
out.write((prefix + " listening at port " + localPort + "\n").getBytes());
9493
+ StringBuilder message = new StringBuilder();
9594
+ message.append(prefix).append(" listening at port ").append(localPort);
9695
+ if (hash) {
@@ -128,7 +127,6 @@ index 9ab389564c..9b7c044c81 100644
128127
+ if (hashContent != null) {
129128
+ for (char c : hashContent) {
130129
+ byte b = (byte) in.read();
131-
+
132130
+ if (b != c) {
133131
+ IOException toThrow = new IOException("Hash validation failed!");
134132
+ try {
@@ -146,15 +144,15 @@ index 9ab389564c..9b7c044c81 100644
146144
connectionObject.getRunningFuture().get();
147145
} catch (IOException | InterruptedException | ExecutionException ex) {
148146
diff --git a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/ConnectionSpecTest.java b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/ConnectionSpecTest.java
149-
index 1035cf9bc8..55c0488d03 100644
147+
index f538c953f6..e008bcda0d 100644
150148
--- a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/ConnectionSpecTest.java
151149
+++ b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/ConnectionSpecTest.java
152150
@@ -118,7 +118,7 @@ public class ConnectionSpecTest {
153151
ByteArrayInputStream in = new ByteArrayInputStream(bytes);
154152
ByteArrayOutputStream os = new ByteArrayOutputStream();
155153
conn.prepare("Pipe server", in, os, new LspSession(), ConnectionSpecTest::setCopy, ConnectionSpecTest::copy);
156154
- String reply = os.toString("UTF-8");
157-
+ String reply = os.toString("UTF-8").replaceAll("\n$", "");
155+
+ String reply = os.toString("UTF-8".replaceAll("\n$", ""));
158156
String exp = "Pipe server listening at port ";
159157
assertTrue(reply, reply.startsWith(exp));
160-
int port = Integer.parseInt(reply.substring(exp.length()));
158+
int port = Integer.parseInt(reply.substring(exp.length(), reply.indexOf('\n', exp.length())));

patches/7491.diff

Lines changed: 0 additions & 1907 deletions
This file was deleted.

patches/7641.diff

Lines changed: 0 additions & 492 deletions
This file was deleted.

0 commit comments

Comments
 (0)