diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF index 49778e4df..761ce95cc 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF @@ -21,7 +21,8 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0", org.eclipse.jdt.ui, org.apache.commons.lang3, org.eclipse.ui.genericeditor, - org.eclipse.ui.editors + org.eclipse.ui.editors, + org.springsource.ide.eclipse.commons.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Export-Package: org.springframework.tooling.ls.eclipse.commons, diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java index 221d14c6f..a1f537914 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java @@ -21,8 +21,9 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.lsp4e.server.ProcessStreamConnectionProvider; import org.springframework.tooling.ls.eclipse.commons.console.ConsoleUtil.Console; -import org.springframework.tooling.ls.eclipse.commons.preferences.LanguageServerConsolePreferenceConstants.ServerInfo; import org.springframework.tooling.ls.eclipse.commons.console.LanguageServerConsoles; +import org.springframework.tooling.ls.eclipse.commons.preferences.LanguageServerConsolePreferenceConstants.ServerInfo; +import org.springsource.ide.eclipse.commons.core.util.IOUtil; import com.google.common.base.Charsets; import com.google.common.base.Supplier; @@ -46,6 +47,23 @@ public class STS4LanguageServerProcessStreamConnector extends ProcessStreamConne Console console = consoles.get(); if (console!=null) { forwardTo(getLanguageServerLog(), console.out); + } else { + + Job job = new Job("Consume LS error stream") { + + @Override + protected IStatus run(IProgressMonitor monitor) { + try { + IOUtil.consume(getLanguageServerLog()); + } catch (IOException e) { + // ignore + } + return Status.OK_STATUS; + } + + }; + job.setSystem(true); + job.schedule(); } } }