eclipse plugin: update entity names to match the latest grammar

This commit is contained in:
Timotei Dolean 2010-08-10 09:53:26 +00:00
parent f7ed697c73
commit da51fe066c
2 changed files with 6 additions and 6 deletions

View File

@ -21,8 +21,8 @@ import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightedPositionAcceptor;
import org.eclipse.xtext.xtext.ui.editor.syntaxcoloring.SemanticHighlightingCalculator;
import org.wesnoth.ui.editor.WMLEditor;
import org.wesnoth.wML.WMLAbstractMacroCall;
import org.wesnoth.wML.WMLKey;
import org.wesnoth.wML.WMLMacroCall;
import org.wesnoth.wML.WMLPackage;
import org.wesnoth.wML.WMLTag;
@ -58,9 +58,9 @@ public class WMLSemanticHighlightingCalculator extends SemanticHighlightingCalcu
AbstractNode begin = getFirstFeatureNode(current, WMLPackage.Literals.WML_KEY__NAME.getName());
highlightNode(begin, WMLHighlightingConfiguration.RULE_WML_KEY, acceptor);
}
else if (current instanceof WMLMacroCall)
else if (current instanceof WMLAbstractMacroCall)
{
AbstractNode begin = getFirstFeatureNode(current, WMLPackage.Literals.WML_MACRO_CALL__NAME.getName());
AbstractNode begin = getFirstFeatureNode(current, WMLPackage.Literals.WML_ABSTRACT_MACRO_CALL__NAME.getName());
highlightNode(begin, WMLHighlightingConfiguration.RULE_WML_MACRO, acceptor);
// AbstractNode end = getFirstFeatureNode(current, WMLPackage.Literals.WML_MACRO__VALUE.getName());

View File

@ -48,9 +48,9 @@ public class WMLFormatter extends AbstractDeclarativeFormatter
// one indentation after tag ...
c.setIndentationIncrement().before(f.getWMLTagAccess().getTagsAssignment_4_0());
c.setIndentationIncrement().before(f.getWMLTagAccess().getTextdomainsAssignment_4_4());
c.setIndentationIncrement().before(f.getWMLTagAccess().getMacroCallsAssignment_4_2());
c.setIndentationIncrement().before(f.getWMLTagAccess().getKeysAssignment_4_1());
// c.setIndentationIncrement().before(f.getWMLTagAccess().getTextdomainsAssignment_4_4());
// c.setIndentationIncrement().before(f.getWMLTagAccess().getMacroCallsAssignment_4_2());
// c.setIndentationIncrement().before(f.getWMLTagAccess().getKeysAssignment_4_1());
// but get back the [/<tagname>]
c.setIndentationDecrement().before(f.getWMLTagAccess().getLeftSquareBracketSolidusKeyword_5());