Merge pull request #404 from eclipse/sz_gh341

Problem with content assist and grammar fragments
eclipse · Sep 6, 2017 · 278a115 · 278a115
2 parents d8a45bc + 7be950d
commit 278a115
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/...se/xtext/ide/editor/contentassist/antlr/internal/AbstractInternalContentAssistParser.java b/...se/xtext/ide/editor/contentassist/antlr/internal/AbstractInternalContentAssistParser.java
@@ -593,6 +593,22 @@ public void announceEof(int lookAhead) {
 		delegate.announceEof(lookAhead);
 	}
 
+	@Override
+	public void reportError(RecognitionException e) {
+		if (strict) {
+			if ( state.errorRecovery ) {
+				return;
+			}
+			if (e.index != input.size()) {
+				// don't count errors at EOF in strict mode
+				state.syntaxErrors++; 	
+			}
+			state.errorRecovery = true;			
+		} else {
+			super.reportError(e);
+		}
+	}
+
 	@Override
 	public void announceConsume() {
 		if (marked <= 0)

diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.java b/org.eclipse.xtext/src/org/eclipse/xtext/GrammarUtil.java
@@ -299,8 +299,7 @@ public static boolean isAssignedEObjectRuleCall(EObject ele) {
 	public static boolean isDatatypeRuleCall(EObject grammarElement) {
 		if (grammarElement instanceof RuleCall) {
 			AbstractRule calledRule = ((RuleCall) grammarElement).getRule();
-			return calledRule != null && calledRule instanceof ParserRule
-					&& calledRule.getType() != null && calledRule.getType().getClassifier() instanceof EDataType;
+			return calledRule != null && isDatatypeRule(calledRule);
 		}
 		return false;
 	}