From 99d3b94a32184709e24dc6f733c54364bc08f626 Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Tue, 7 Jul 2015 15:44:31 +0200 Subject: [PATCH] Suppress more (intentional) warnings in xtext test grammars --- .../org/eclipse/xtext/xtext/ValidEntryRuleInspector.java | 7 +++++++ .../xtext/lexer/BacktrackingLexerTestLanguage.xtext | 2 ++ .../xtext/parsetree/reconstr/Bug302128TestLanguage.xtext | 1 + .../parsetree/reconstr/SimpleReconstrTestLanguage.xtext | 2 +- .../unassignedtext/UnassignedTextTestLanguage.xtext | 4 ++++ .../xtext/serializer/AssignmentFinderTestLanguage.xtext | 2 ++ .../xtext/serializer/GenericSemanticSequencerTest.java | 1 + .../validation/ConcreteSyntaxValidationTestLanguage.xtext | 4 ++-- 8 files changed, 20 insertions(+), 3 deletions(-) diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ValidEntryRuleInspector.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ValidEntryRuleInspector.java index 37b742a71..fa2b3195e 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ValidEntryRuleInspector.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/ValidEntryRuleInspector.java @@ -27,9 +27,16 @@ import org.eclipse.xtext.validation.ValidationMessageAcceptor; */ public class ValidEntryRuleInspector extends XtextRuleInspector, ParserRule>{ + public static final String ISSUE_CODE = "ValidEntryRuleInspector.noInstantiation"; + public ValidEntryRuleInspector(ValidationMessageAcceptor acceptor) { super(acceptor); } + + @Override + protected String getIssueCode() { + return ISSUE_CODE; + } @Override protected boolean canInspect(ParserRule rule) { diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.xtext b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.xtext index 857cfc22b..3bf0e25df 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.xtext +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/lexer/BacktrackingLexerTestLanguage.xtext @@ -6,6 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * *******************************************************************************/ + +/* SuppressWarnings[InvalidTerminalruleName] */ grammar org.eclipse.xtext.lexer.BacktrackingLexerTestLanguage hidden(WS, SL_COMMENT) generate backtrackingTestLanguage "http://www.eclipse.org/2008/tmf/xtext/BacktrackingLexerTest" import "http://www.eclipse.org/emf/2002/Ecore" as ecore diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtext b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtext index 610374b29..ffd8001fb 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtext +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtext @@ -17,5 +17,6 @@ Element: name=Variable (value=Value)?; Variable: ID (('.'|'-') ID)*; +/* SuppressWarnings[InvalidTerminalruleName] */ terminal Value: ('='|'+='|'-=') -> '\n'; terminal SL_COMMENT: '#' !('\n'|'\r')* ('\r'? '\n')?; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xtext b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xtext index 7315a6e61..71829cc3e 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xtext +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTestLanguage.xtext @@ -70,7 +70,7 @@ Loop4: LoopBug285452: '#12' (interface?="interface"|"class") name=ID; -/* SuppressWarnings[potentialOverride] */ +/* SuppressWarnings[noInstantiation, potentialOverride] */ DuplicateBug284491: '#13' (static?='static' | final?='final' | transient?='transient')*; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.xtext b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.xtext index 29fed3d42..299f630ef 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.xtext +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/unassignedtext/UnassignedTextTestLanguage.xtext @@ -18,6 +18,7 @@ Model: CaseInsensitiveKeywordRule: CaseInsensitiveKeyword val=INT; +/* SuppressWarnings[InvalidTerminalruleName] */ terminal CaseInsensitiveKeyword: ('k'|'K')('e'|'E')('y'|'Y')('w'|'W')('o'|'O')('r'|'R')('d'|'D'); @@ -25,6 +26,7 @@ terminal CaseInsensitiveKeyword: PluralRule: 'contents:' count=INT Plural; +/* SuppressWarnings[InvalidTerminalruleName] */ terminal Plural: 'item' | 'items'; @@ -32,9 +34,11 @@ terminal Plural: MultiRule: 'multi' val=INT Multi Multi Multi; +/* SuppressWarnings[InvalidTerminalruleName] */ terminal Multi: 'a' 'b'? 'c'+ 'd'* ('e' | 'f') (('g'|'h') | 'i'+) Multi2 '0'..'9' '0'..'9'+; +/* SuppressWarnings[InvalidTerminalruleName] */ terminal Multi2: 'j'; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.xtext b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.xtext index 868c473eb..4f008b62f 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.xtext +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/AssignmentFinderTestLanguage.xtext @@ -26,7 +26,9 @@ Model: KeywordVal: kw="kw1" | kw="kw2"; TerminalVal: term=Terminal1 | term=Terminal2 | term="%foo"; +/* SuppressWarnings[InvalidTerminalruleName] */ terminal Terminal1: '%' ('A'..'Z')*; +/* SuppressWarnings[InvalidTerminalruleName] */ terminal Terminal2: '%' ('a'..'z')*; EnumVal: en=Enum1 | en=Enum2; diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenericSemanticSequencerTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenericSemanticSequencerTest.java index ca223370d..13a55b28a 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenericSemanticSequencerTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/serializer/GenericSemanticSequencerTest.java @@ -14,6 +14,7 @@ import org.junit.Test; /** * @author Moritz Eysholdt - Initial contribution and API */ +@SuppressWarnings("deprecation") public class GenericSemanticSequencerTest extends AbstractSemanticSequencerTest { @Override diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.xtext b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.xtext index 01e02c7da..78a9aa8e3 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.xtext +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/validation/ConcreteSyntaxValidationTestLanguage.xtext @@ -65,7 +65,7 @@ Combination1: Combination2: "#14" val1=ID (("kw1" val2=ID) | (val3+=ID val4+=ID)*); -/* SuppressWarnings[potentialOverride] */ +/* SuppressWarnings[noInstantiation, potentialOverride] */ Combination3: "#15" (val1=ID | val2=INT | val3=STRING)*; @@ -108,7 +108,7 @@ TransientSerializeables1: enum TransientSerializeables1Enum: lit1 | lit2; -/* SuppressWarnings[potentialOverride] */ +/* SuppressWarnings[noInstantiation, potentialOverride] */ StaticSimplification: "#26" ("kw1"|{EmptyAlternativeSub}|val1=ID) ("kw2"|val2=ID) ("kw3" ("kw4" (val3=ID)+)?);