sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 08:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=488458

Browse source 
Add warning for keywords containing spaces
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2016-02-25 13:33:15 +01:00
parent eb6c093769
commit b8281ec71f
3 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextConfigurableIssueCodes.java
View file

@ -33,6 +33,7 @@ public class XtextConfigurableIssueCodes extends ConfigurableIssueCodesProvider
public static final String INVALID_ACTION_USAGE = ISSUE_CODE_PREFIX + "InvalidActionUsage";
public static final String EMPTY_ENUM_LITERAL = ISSUE_CODE_PREFIX + "EmptyEnumLiteral";
public static final String EMPTY_KEYWORD = ISSUE_CODE_PREFIX + "EmptyKeyword";
public static final String SPACES_IN_KEYWORD = ISSUE_CODE_PREFIX + "SpacesInKeyword";
public static final String INVALID_HIDDEN_TOKEN = ISSUE_CODE_PREFIX + "InvalidHiddenToken";
public static final String INVALID_HIDDEN_TOKEN_FRAGMENT = ISSUE_CODE_PREFIX + "InvalidHiddenTokenFragment";
public static final String INVALID_PACKAGE_REFERENCE_INHERITED = ISSUE_CODE_PREFIX + "InvalidPackageReference.inherited";
@ -60,6 +61,7 @@ public class XtextConfigurableIssueCodes extends ConfigurableIssueCodesProvider
acceptor.accept(create(INVALID_ACTION_USAGE, SeverityConverter.SEVERITY_ERROR));
acceptor.accept(create(EMPTY_ENUM_LITERAL, SeverityConverter.SEVERITY_ERROR));
acceptor.accept(create(EMPTY_KEYWORD, SeverityConverter.SEVERITY_ERROR));
acceptor.accept(create(SPACES_IN_KEYWORD, SeverityConverter.SEVERITY_WARNING));
acceptor.accept(create(INVALID_HIDDEN_TOKEN, SeverityConverter.SEVERITY_ERROR));
acceptor.accept(create(INVALID_HIDDEN_TOKEN_FRAGMENT, SeverityConverter.SEVERITY_ERROR));
acceptor.accept(create(INVALID_PACKAGE_REFERENCE_INHERITED, SeverityConverter.SEVERITY_ERROR));

12
plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/XtextValidator.java
View file

@ -1076,6 +1076,18 @@ public class XtextValidator extends AbstractDeclarativeValidator {
}
}
@Check
public void checkKeywordNoSpaces(final Keyword keyword) {
if (keyword.getValue() != null && !(keyword.eContainer() instanceof EnumLiteralDeclaration)) {
if (keyword.getValue().contains(" ") || keyword.getValue().contains("\t")) {
addIssue("A keyword should non contain spaces.",
keyword,
null,
SPACES_IN_KEYWORD);
}
}
}
@Check
public void checkKeywordHidesTerminalRule(final Keyword keyword) {
if (keywordHidesTerminalInspector == null)

27
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextValidationTest.java
View file

@ -1842,6 +1842,33 @@ public class XtextValidationTest extends AbstractValidationMessageAcceptingTestC
messageAcceptor.validate();
}
@Test public void testKeywordWithSpaces() throws Exception {
String grammarAsText =
"grammar test with org.eclipse.xtext.common.Terminals\n" +
"generate test 'http://test'\n" +
"A: foo='a b c'; B: bar='x\ty';";
Grammar grammar = (Grammar) getModel(grammarAsText);
XtextValidator validator = get(XtextValidator.class);
ValidatingMessageAcceptor messageAcceptor = new ValidatingMessageAcceptor(null, false, true);
Assignment valueAssignment = (Assignment) grammar.getRules().get(0).getAlternatives();
Assignment valueAssignment2 = (Assignment) grammar.getRules().get(1).getAlternatives();
messageAcceptor.expectedContext(
valueAssignment.getTerminal()
);
configureValidator(validator, messageAcceptor, valueAssignment);
validator.checkKeywordNoSpaces((Keyword) valueAssignment.getTerminal());
messageAcceptor.validate();
messageAcceptor = new ValidatingMessageAcceptor(null, false, true);
messageAcceptor.expectedContext(
valueAssignment2.getTerminal()
);
configureValidator(validator, messageAcceptor, valueAssignment2);
validator.checkKeywordNoSpaces((Keyword) valueAssignment2.getTerminal());
messageAcceptor.validate();
}
public class ValidatingMessageAcceptor extends AbstractValidationMessageAcceptor {
private final Set<EObject> contexts;