From 22b550488b15f3e5c1f4ac83877898c6d849196d Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 19 Sep 2017 07:00:21 +0200 Subject: [PATCH] Don't publish issues with severity ignore #453 Signed-off-by: Christian Dietrich --- .../org/eclipse/xtext/ide/server/LanguageServerImpl.xtend | 3 ++- .../org/eclipse/xtext/ide/server/LanguageServerImpl.java | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend index 306ff221f..250023b5e 100644 --- a/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend +++ b/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/server/LanguageServerImpl.xtend @@ -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 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) } diff --git a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/LanguageServerImpl.java b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/LanguageServerImpl.java index 9cc853c94..99235053f 100644 --- a/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/LanguageServerImpl.java +++ b/org.eclipse.xtext.ide/xtend-gen/org/eclipse/xtext/ide/server/LanguageServerImpl.java @@ -430,10 +430,14 @@ public class LanguageServerImpl implements LanguageServer, WorkspaceService, Tex PublishDiagnosticsParams _publishDiagnosticsParams = new PublishDiagnosticsParams(); final Procedure1 _function = (PublishDiagnosticsParams it) -> { it.setUri(this._uriExtensions.toUriString(uri)); - final Function1 _function_1 = (Issue it_1) -> { + final Function1 _function_1 = (Issue it_1) -> { + Severity _severity = it_1.getSeverity(); + return Boolean.valueOf((_severity != Severity.IGNORE)); + }; + final Function1 _function_2 = (Issue it_1) -> { return this.toDiagnostic(it_1); }; - it.setDiagnostics(IterableExtensions.toList(IterableExtensions.map(issues, _function_1))); + it.setDiagnostics(IterableExtensions.toList(IterableExtensions.map(IterableExtensions.filter(issues, _function_1), _function_2))); }; final PublishDiagnosticsParams diagnostics = ObjectExtensions.operator_doubleArrow(_publishDiagnosticsParams, _function); this.client.publishDiagnostics(diagnostics);