From 176a40b4b3b7abb9caf28f418a7386d66c5f32b0 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 1 Feb 2018 10:20:41 -0800 Subject: [PATCH] Fix compilation issue on recent lsp4e I also beleave the new api that's being overridden here has something to do with how the error ouput from LSP process might be shown to the user. --- .../boot/java/ls/DelegatingStreamConnectionProvider.java | 6 ++++-- .../boot/java/ls/SpringBootJavaLanguageServerViaSocket.java | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java index d0055824c..42560aa5e 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java @@ -55,7 +55,6 @@ public class DelegatingStreamConnectionProvider implements StreamConnectionProvi public DelegatingStreamConnectionProvider() { String port = System.getProperty("boot-java-ls-port"); - if (port != null) { this.provider = new SpringBootJavaLanguageServerViaSocket(Integer.parseInt(port)); } @@ -125,5 +124,8 @@ public class DelegatingStreamConnectionProvider implements StreamConnectionProvi settings.put("boot-java", bootJavaObj); this.languageServer.getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(settings)); } - + + public InputStream getErrorStream() { + return provider.getErrorStream(); + } } diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServerViaSocket.java b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServerViaSocket.java index 2c2c911a7..a4bc71e61 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServerViaSocket.java +++ b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServerViaSocket.java @@ -61,4 +61,9 @@ public class SpringBootJavaLanguageServerViaSocket implements StreamConnectionPr } } + public InputStream getErrorStream() { + // TODO Auto-generated method stub + return null; + } + }