Skip to content

Commit

Permalink
upgraded language server to netbeans 25
Browse files Browse the repository at this point in the history
  • Loading branch information
Achal1607 committed Feb 21, 2025
1 parent 46f024d commit 65bce92
Show file tree
Hide file tree
Showing 19 changed files with 12 additions and 6,479 deletions.
15 changes: 0 additions & 15 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,7 @@
<loadresource property="patch-files">
<string>
patches/6330.diff
patches/7491.diff
patches/7610.diff
patches/7641.diff
patches/7654.diff
patches/7670.diff
patches/7699.diff
patches/7709.diff
patches/7722.diff
patches/7724.diff
patches/7733.diff
patches/7750.diff
patches/7910.diff
patches/7921.diff
patches/7923.diff
patches/7926.diff
patches/8036-draft.diff
patches/8038-draft.diff
patches/mvn-sh.diff
Expand All @@ -69,7 +55,6 @@
patches/remove-db.diff
patches/nbjavac-not-required.diff
patches/l10n-licence.diff
patches/no-security-manager-allow.diff
patches/dev-dependency-licenses.diff
</string>
<filterchain>
Expand Down
2 changes: 1 addition & 1 deletion netbeans
Submodule netbeans updated 5298 files
14 changes: 6 additions & 8 deletions patches/6330.diff
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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
index 9ab389564c..9b7c044c81 100644
index bb8a4e8183..b9662fe6cd 100644
--- 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
@@ -25,7 +25,7 @@ import java.io.OutputStream;
Expand Down Expand Up @@ -86,11 +86,10 @@ index 9ab389564c..9b7c044c81 100644
} catch (IOException ex) {
if (isClosed(server)) {
break;
@@ -129,26 +152,54 @@ final class ConnectionSpec implements Closeable {
}
@@ -130,25 +153,53 @@ final class ConnectionSpec implements Closeable {
};
listeningThread.start();
- out.write((prefix + " listening at port " + localPort).getBytes());
out.write((prefix + " listening at port " + localPort + "\n").getBytes());
+ StringBuilder message = new StringBuilder();
+ message.append(prefix).append(" listening at port ").append(localPort);
+ if (hash) {
Expand Down Expand Up @@ -128,7 +127,6 @@ index 9ab389564c..9b7c044c81 100644
+ if (hashContent != null) {
+ for (char c : hashContent) {
+ byte b = (byte) in.read();
+
+ if (b != c) {
+ IOException toThrow = new IOException("Hash validation failed!");
+ try {
Expand All @@ -146,15 +144,15 @@ index 9ab389564c..9b7c044c81 100644
connectionObject.getRunningFuture().get();
} catch (IOException | InterruptedException | ExecutionException ex) {
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
index 1035cf9bc8..55c0488d03 100644
index f538c953f6..e008bcda0d 100644
--- 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
@@ -118,7 +118,7 @@ public class ConnectionSpecTest {
ByteArrayInputStream in = new ByteArrayInputStream(bytes);
ByteArrayOutputStream os = new ByteArrayOutputStream();
conn.prepare("Pipe server", in, os, new LspSession(), ConnectionSpecTest::setCopy, ConnectionSpecTest::copy);
- String reply = os.toString("UTF-8");
+ String reply = os.toString("UTF-8").replaceAll("\n$", "");
+ String reply = os.toString("UTF-8".replaceAll("\n$", ""));
String exp = "Pipe server listening at port ";
assertTrue(reply, reply.startsWith(exp));
int port = Integer.parseInt(reply.substring(exp.length()));
int port = Integer.parseInt(reply.substring(exp.length(), reply.indexOf('\n', exp.length())));
1,907 changes: 0 additions & 1,907 deletions patches/7491.diff

This file was deleted.

492 changes: 0 additions & 492 deletions patches/7641.diff

This file was deleted.

Loading

0 comments on commit 65bce92

Please sign in to comment.