Merge pull request sebastianbenz#11 from riederm/fix_issue#9_syntaxHi…

…ghlightingFeatures fix [SyntaxHighlighting] Highlighting of Features is broken borisbrodski#9
ghaith · May 1, 2017 · 66c65eb · 66c65eb
2 parents 5b4474f + 282b883
commit 66c65eb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...ture.ui/src/org/jnario/feature/ui/highlighting/FeatureSemanticHighlightingCalculator.java b/...ture.ui/src/org/jnario/feature/ui/highlighting/FeatureSemanticHighlightingCalculator.java
@@ -20,11 +20,11 @@
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.xtext.TerminalRule;
+import org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightedPositionAcceptor;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.xbase.XAbstractFeatureCall;
 import org.eclipse.xtext.xbase.XExpression;
@@ -57,7 +57,6 @@ public class FeatureSemanticHighlightingCalculator extends JnarioHighlightingCal
 	public void provideHighlightingFor(XtextResource resource,
 			org.eclipse.xtext.ide.editor.syntaxcoloring.IHighlightedPositionAcceptor acceptor,
 			CancelIndicator cancelIndicator) {
-		// TODO Auto-generated method stub
 		super.provideHighlightingFor(resource, acceptor, cancelIndicator);
 	}
 
@@ -220,7 +219,8 @@ protected boolean noNodeModel(XtextResource resource) {
 				|| root(resource) == null;
 	}
 
-	protected void searchAndHighlightElements(XtextResource resource, IHighlightedPositionAcceptor acceptor) {
+	@Override
+	protected void searchAndHighlightElements(XtextResource resource, IHighlightedPositionAcceptor acceptor, CancelIndicator cancelIndicator) {
 		Implementation highlighter = new Implementation(acceptor);
 
 		TreeIterator<EObject> iterator = resource.getAllContents();