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

Merge pull request #386 from eclipse/msp/cancelHighlighting

Browse source 
[ide] Added cancel indicator to new semantic highlighting API
This commit is contained in:
Miro Spönemann 2015-07-16 15:29:41 +02:00
commit e39d8029e1
3 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/DefaultSemanticHighlightingCalculator.java
View file

@ -13,7 +13,6 @@ import org.eclipse.emf.common.util.TreeIterator;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.xtext.EcoreUtil2;
import org.eclipse.xtext.ide.editor.syntaxcoloring.HighlightingStyles;
import org.eclipse.xtext.nodemodel.ILeafNode;
import org.eclipse.xtext.nodemodel.INode;
import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
@ -21,6 +20,7 @@ import org.eclipse.xtext.parser.IParseResult;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.tasks.ITaskFinder;
import org.eclipse.xtext.tasks.Task;
import org.eclipse.xtext.util.CancelIndicator;
import org.eclipse.xtext.util.ITextRegion;
import com.google.inject.Inject;
@ -33,15 +33,16 @@ public class DefaultSemanticHighlightingCalculator implements ISemanticHighlight
@Inject
private ITaskFinder taskFinder;
@Override
public void provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor) {
public void provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor,
CancelIndicator cancelIndicator) {
if (resource == null)
return;
IParseResult parseResult = resource.getParseResult();
if (parseResult == null || parseResult.getRootASTElement() == null)
return;
doProvideHighlightingFor(resource, acceptor);
doProvideHighlightingFor(resource, acceptor, cancelIndicator);
}
/**
@ -51,8 +52,8 @@ public class DefaultSemanticHighlightingCalculator implements ISemanticHighlight
* </p>
* <p>
* By default this will visit the elements in the resource recursively and call
* {@link #highlightElement(EObject, IHighlightedPositionAcceptor)} for each of them. As the last step, tasks will
* be highlighted.
* {@link #highlightElement(EObject, IHighlightedPositionAcceptor, CancelIndicator)} for each of them. As the
* last step, tasks will be highlighted.
* </p>
* <p>
* Clients can override this method if the default recursive approach does not fit their use case
@ -63,33 +64,37 @@ public class DefaultSemanticHighlightingCalculator implements ISemanticHighlight
* @param acceptor
* the acceptor. Is never <code>null</code>.
*/
protected void doProvideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor) {
searchAndHighlightElements(resource, acceptor);
protected void doProvideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor,
CancelIndicator cancelIndicator) {
searchAndHighlightElements(resource, acceptor, cancelIndicator);
highlightTasks(resource, acceptor);
}
protected void searchAndHighlightElements(XtextResource resource, IHighlightedPositionAcceptor acceptor) {
protected void searchAndHighlightElements(XtextResource resource, IHighlightedPositionAcceptor acceptor,
CancelIndicator cancelIndicator) {
IParseResult parseResult = resource.getParseResult();
if (parseResult == null)
throw new IllegalStateException("resource#parseResult may not be null");
EObject element = parseResult.getRootASTElement();
highlightElementRecursively(element, acceptor);
highlightElementRecursively(element, acceptor, cancelIndicator);
}
protected void highlightElementRecursively(EObject element, IHighlightedPositionAcceptor acceptor) {
protected void highlightElementRecursively(EObject element, IHighlightedPositionAcceptor acceptor,
CancelIndicator cancelIndicator) {
TreeIterator<EObject> iterator = EcoreUtil2.eAll(element);
while (iterator.hasNext()) {
EObject object = iterator.next();
if (highlightElement(object, acceptor)) {
if (highlightElement(object, acceptor, cancelIndicator)) {
iterator.prune();
}
}
}
/**
* @return true to skip the children of this element false otherwise
* @return true to skip the children of this element, false otherwise
*/
protected boolean highlightElement(EObject object, IHighlightedPositionAcceptor acceptor) {
protected boolean highlightElement(EObject object, IHighlightedPositionAcceptor acceptor,
CancelIndicator cancelIndicator) {
return false;
}

5
plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/ISemanticHighlightingCalculator.java
View file

@ -8,6 +8,7 @@
package org.eclipse.xtext.ide.editor.syntaxcoloring;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.util.CancelIndicator;
import com.google.inject.ImplementedBy;
@ -24,7 +25,9 @@ public interface ISemanticHighlightingCalculator {
/**
* @param resource the resource that will be highlighted. May be <code>null</code> in some rare cases.
* @param acceptor used to announce the mapping from text-range to the style's id. The acceptor will never be <code>null</code>.
* @param cancelIndicator used to determine whether we should stop searching for highlighting positions
* (use {@code OperationCanceledManager} to check)
*/
void provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor);
void provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor, CancelIndicator cancelIndicator);
}

5
plugins/org.eclipse.xtext.ide/src/org/eclipse/xtext/ide/editor/syntaxcoloring/MergingHighlightedPositionAcceptor.java
View file

@ -12,6 +12,7 @@ import java.util.Collections;
import java.util.List;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.util.CancelIndicator;
import org.eclipse.xtext.ide.editor.syntaxcoloring.LightweightPosition.IntToStringArray;
import com.google.common.collect.Lists;
@ -57,9 +58,9 @@ public class MergingHighlightedPositionAcceptor implements IHighlightedPositionA
}
@Override
public void provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor) {
public void provideHighlightingFor(XtextResource resource, IHighlightedPositionAcceptor acceptor, CancelIndicator cancelIndicator) {
initialize();
delegate.provideHighlightingFor(resource, this);
delegate.provideHighlightingFor(resource, this, cancelIndicator);
mergePositions();
for(LightweightPosition pos: getPositions())
acceptor.addPosition(pos.getOffset(), pos.getLength(), pos.getIds());