Merge pull request #463 from eclipse/cd_issue453

Don't publish issues with severity ignore #453
This commit is contained in:
Christian Dietrich 2017-09-19 09:46:50 +02:00 committed by GitHub
commit 1cb02fbd35
2 changed files with 8 additions and 3 deletions

View file

@ -7,6 +7,7 @@
*******************************************************************************/
package org.eclipse.xtext.ide.server
import static org.eclipse.xtext.diagnostics.Severity.*
import com.google.common.collect.LinkedListMultimap
import com.google.common.collect.Multimap
import com.google.inject.Inject
@ -275,7 +276,7 @@ import org.eclipse.xtext.ide.server.commands.ExecutableCommandRegistry
private def void publishDiagnostics(URI uri, Iterable<? extends Issue> issues) {
val diagnostics = new PublishDiagnosticsParams => [
it.uri = toUriString(uri)
it.diagnostics = issues.map[toDiagnostic].toList
it.diagnostics = issues.filter[severity !== IGNORE].map[toDiagnostic].toList
]
client.publishDiagnostics(diagnostics)
}

View file

@ -430,10 +430,14 @@ public class LanguageServerImpl implements LanguageServer, WorkspaceService, Tex
PublishDiagnosticsParams _publishDiagnosticsParams = new PublishDiagnosticsParams();
final Procedure1<PublishDiagnosticsParams> _function = (PublishDiagnosticsParams it) -> {
it.setUri(this._uriExtensions.toUriString(uri));
final Function1<Issue, Diagnostic> _function_1 = (Issue it_1) -> {
final Function1<Issue, Boolean> _function_1 = (Issue it_1) -> {
Severity _severity = it_1.getSeverity();
return Boolean.valueOf((_severity != Severity.IGNORE));
};
final Function1<Issue, Diagnostic> _function_2 = (Issue it_1) -> {
return this.toDiagnostic(it_1);
};
it.setDiagnostics(IterableExtensions.<Diagnostic>toList(IterableExtensions.map(issues, _function_1)));
it.setDiagnostics(IterableExtensions.<Diagnostic>toList(IterableExtensions.map(IterableExtensions.filter(issues, _function_1), _function_2)));
};
final PublishDiagnosticsParams diagnostics = ObjectExtensions.<PublishDiagnosticsParams>operator_doubleArrow(_publishDiagnosticsParams, _function);
this.client.publishDiagnostics(diagnostics);