0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eclipse plugin: More migration: remove the...

Browse source 
...dependency on the now non-existing bracket matching class, and use
the JFace's CharacterPairMatcher.  Still needs rework
This commit is contained in:
Timotei Dolean 2011-07-15 21:08:17 +00:00
parent 948399d4a7
commit 493f26fdd8
4 changed files with 190 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/WMLUiModule.java
View file

@ -9,6 +9,7 @@
package org.wesnoth.ui;
import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
import org.eclipse.jface.text.source.ICharacterPairMatcher;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.xtext.resource.ILocationInFileProvider;
@ -35,11 +36,11 @@ import org.wesnoth.ui.labeling.WMLLabelProvider;
import org.wesnoth.ui.navigation.WMLHyperlinkHelper;
import org.wesnoth.ui.resource.WMLLocationInFileProvider;
import org.wesnoth.ui.syntax.WMLAntlrTokenToAttributeIdMapper;
import org.wesnoth.ui.syntax.WMLCharacterPairMatcher;
import org.wesnoth.ui.syntax.WMLHighlightingConfiguration;
import org.wesnoth.ui.syntax.WMLHighlightingHelper;
import org.wesnoth.ui.syntax.WMLHighlightingReconciler;
import org.wesnoth.ui.syntax.WMLSemanticHighlightingCalculator;
import org.wesnoth.ui.syntax.bracketmatching.WMLBracketMatching;
import com.google.inject.Binder;
import com.google.inject.Provider;
@ -77,11 +78,11 @@ public class WMLUiModule extends org.wesnoth.ui.AbstractWMLUiModule
return WMLSemanticHighlightingCalculator.class;
}
public Class<? extends IBracketMatcher> bindIBracketMatcher()
{
// XtextGrammarBracketMatcher
return WMLBracketMatching.class;
}
@Override
public ICharacterPairMatcher bindICharacterPairMatcher()
{
return new WMLCharacterPairMatcher( new char[] { '(', ')', '{', '}', '[', ']' } );
}
public Class<? extends XtextEditor> bindEditor()
{

1
utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/labeling/wmldoc/WMLDocHandler.java
View file

@ -60,6 +60,7 @@ public class WMLDocHandler extends AbstractHandler
positionAbsolute.y +=20;
IParseResult parseResult = resource.getParseResult();
//TODO: check this
INode abstractNode = NodeModelUtils.getNode( eObjectAtOffsetHelper.resolveElementAt( resource, selection.getOffset( ) ) );
if (abstractNode == null || abstractNode.eContainer() == null)
return;

182
utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLCharacterPairMatcher.java Normal file
View file

@ -0,0 +1,182 @@
/*******************************************************************************
* Copyright (c) 2010 - 2011 by Timotei Dolean <timotei21@gmail.com>
*
* This program and the accompanying materials are made available
* under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.wesnoth.ui.syntax;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.source.DefaultCharacterPairMatcher;
import org.eclipse.xtext.nodemodel.ICompositeNode;
import org.eclipse.xtext.nodemodel.ILeafNode;
import org.eclipse.xtext.nodemodel.INode;
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.ui.editor.model.XtextDocument;
import org.eclipse.xtext.util.concurrent.IUnitOfWork;
import org.wesnoth.services.WMLGrammarAccess;
import org.wesnoth.wml.WMLTag;
import com.google.inject.Inject;
public class WMLCharacterPairMatcher extends DefaultCharacterPairMatcher
{
@Inject
private WMLGrammarAccess grammarAccess;
public WMLCharacterPairMatcher( char[] chars )
{
super( chars );
}
@Override
public IRegion match( IDocument doc, final int offset )
{
IRegion region = super.match( doc, offset );
if ( region == null && doc instanceof XtextDocument ) {
( ( XtextDocument ) doc ).modify( new IUnitOfWork<IRegion, XtextResource>(){
@Override
public IRegion exec( XtextResource state ) throws Exception
{
return computeMatchingRegion( state, offset );
}
});
}
return region;
}
public IRegion computeMatchingRegion(XtextResource state, int offset)
{
//TODO: rework this.
if ( true )
return null;
// if (state == null || state.getContents() == null || state.getContents().isEmpty())
// return null;
// ICompositeNode rootNode = state.getParseResult( ).getRootNode( );
// if (rootNode == null)
// return null;
// ILeafNode node = NodeModelUtils.findLeafNodeAtOffset(rootNode, offset);
// if (node == null)
// return null;
//
// /* -- AbstractBracketMatcher.class -- */
// AbstractElement element = findElement(node, getPairs());
// boolean forwardSearch = true;
// if (element == null)
// {
// forwardSearch = false;
// element = findElement(node, getPairs().inverse());
// }
// if (element != null)
// {
// INode correspondingNode = findMatchingNode(node, element, forwardSearch);
// if (correspondingNode != null)
// {
// return new Region(correspondingNode.getOffset(), correspondingNode.getLength());
// }
// }
//
// WMLEditor editor = (WMLEditor) EditorUtils.getActiveXtextEditor();
// if (editor == null || editor.getHighlightingHelper() == null)
// return null;
// HighlightingReconciler reconcilier = editor.getHighlightingHelper().getReconciler();
// if (reconcilier == null)
// return null;
// editor.setCurrentHighlightedNode(null);
// // clear any highlighted nodes
// reconcilier.refresh();
// /* -- WML Related -- */
// // search for opened/closed tag
//
// // find opened tag at this offset
// ILeafNode wmlNode = findWMLLeafNodeAtOffset(rootNode, offset, false);
// if (wmlNode == null)
// {
// wmlNode = findWMLLeafNodeAtOffset(rootNode, offset, true);
// }
// if (wmlNode != null)
// {
// ILeafNode tmp = null;
// ILeafNode correspondingTag = null;
// boolean correspondingIsClosed = false;
// for (int i = 0; i < wmlNode.getParent().getChildren().size(); i++)
// {
// if (!(wmlNode.getParent().getChildren().get(i) instanceof ILeafNode))
// continue;
//
// if (i > 0 && wmlNode.getParent().getChildren().get(i-1) instanceof ILeafNode)
// tmp = (ILeafNode)wmlNode.getParent().getChildren().get(i-1);
//
// ILeafNode tmpNode = (ILeafNode)wmlNode.getParent().getChildren().get(i);
//
// if ((tmpNode).getText().equals(wmlNode.getText()) &&
// tmpNode != wmlNode && !tmpNode.isHidden())
// {
// correspondingTag = tmpNode;
// if (tmp != null && tmp.getText().equals("[/")) //$NON-NLS-1$
// correspondingIsClosed = true;
// break;
// }
// }
//
// if (correspondingTag != null)
// {
// int tagOffset = correspondingTag.getTotalOffset();
// int length = correspondingTag.getLength();
// tagOffset--; // we need to color the '['
// length += 2;
//
// // we need to color the auxilliary '/'
// if (correspondingIsClosed)
// {
// tagOffset--;
// length++;
// }
//
// editor.setCurrentHighlightedNode(correspondingTag);
// reconcilier.addPosition(tagOffset, length,
// WMLHighlightingConfiguration.RULE_START_END_TAG);
// reconcilier.refresh();
// }
// }
return null;
}
public ILeafNode findWMLLeafNodeAtOffset(ICompositeNode parseTreeRootNode, int offset, boolean findClosed)
{
boolean isClosed = false;
for (INode node : parseTreeRootNode.getChildren())
{
if (node.getTotalOffset() <= offset)
{
if (node instanceof ILeafNode && ((ILeafNode) node).getText().equals("[/")) //$NON-NLS-1$
{
isClosed = true;
}
if (node.getTotalOffset() + node.getTotalLength() >= offset)
{
if (node instanceof ILeafNode && isWMLTag(node) && (isClosed == findClosed))
return (ILeafNode) node;
else if (node instanceof ICompositeNode)
return findWMLLeafNodeAtOffset((ICompositeNode) node, offset, findClosed);
}
}
}
return null;
}
private boolean isWMLTag(INode node)
{
return (node.eContainer() != null &&
node.eContainer() instanceof ICompositeNode && ((ICompositeNode) node.eContainer()).getElement() instanceof WMLTag);
}
}

173
utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/bracketmatching/WMLBracketMatching.java
View file

@ -1,173 +0,0 @@
/*******************************************************************************
* Copyright (c) 2010 - 2011 by Timotei Dolean <timotei21@gmail.com>
*
* This program and the accompanying materials are made available
* under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.wesnoth.ui.syntax.bracketmatching;
import java.util.List;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Region;
import org.eclipse.xtext.AbstractElement;
import org.eclipse.xtext.Keyword;
import org.eclipse.xtext.nodemodel.ICompositeNode;
import org.eclipse.xtext.nodemodel.ILeafNode;
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.HighlightingReconciler;
import org.eclipse.xtext.ui.editor.utils.EditorUtils;
import org.eclipse.xtext.util.Pair;
import org.wesnoth.services.WMLGrammarAccess;
import org.wesnoth.ui.editor.WMLEditor;
import org.wesnoth.ui.syntax.WMLHighlightingConfiguration;
import org.wesnoth.wml.WMLTag;
import com.google.inject.Inject;
public class WMLBracketMatching extends DefaultBracketMatcher
{
@Inject
private WMLGrammarAccess grammarAccess;
@Override
public void configure(IBracketPairAcceptor acceptor)
{
List<Pair<Keyword, Keyword>> pairs2 = grammarAccess.findKeywordPairs("[/", "]"); //$NON-NLS-1$ //$NON-NLS-2$
for (Pair<Keyword, Keyword> pair : pairs2)
{
acceptor.accept(pair.getFirst(), pair.getSecond());
}
super.configure(acceptor);
}
@Override
public IRegion computeMatchingRegion(XtextResource state, int offset)
{
if (state == null || state.getContents() == null || state.getContents().isEmpty())
return null;
ICompositeNode rootNode = state.getParseResult( ).getRootNode( );
if (rootNode == null)
return null;
ILeafNode node = NodeModelUtils.findLeafNodeAtOffset(rootNode, offset);
if (node == null)
return null;
/* -- AbstractBracketMatcher.class -- */
AbstractElement element = findElement(node, getPairs());
boolean forwardSearch = true;
if (element == null)
{
forwardSearch = false;
element = findElement(node, getPairs().inverse());
}
if (element != null)
{
INode correspondingNode = findMatchingNode(node, element, forwardSearch);
if (correspondingNode != null)
{
return new Region(correspondingNode.getOffset(), correspondingNode.getLength());
}
}
WMLEditor editor = (WMLEditor) EditorUtils.getActiveXtextEditor();
if (editor == null || editor.getHighlightingHelper() == null)
return null;
HighlightingReconciler reconcilier = editor.getHighlightingHelper().getReconciler();
if (reconcilier == null)
return null;
editor.setCurrentHighlightedNode(null);
// clear any highlighted nodes
reconcilier.refresh();
/* -- WML Related -- */
// search for opened/closed tag
// find opened tag at this offset
ILeafNode wmlNode = findWMLLeafNodeAtOffset(rootNode, offset, false);
if (wmlNode == null)
{
wmlNode = findWMLLeafNodeAtOffset(rootNode, offset, true);
}
if (wmlNode != null)
{
ILeafNode tmp = null;
ILeafNode correspondingTag = null;
boolean correspondingIsClosed = false;
for (int i = 0; i < wmlNode.getParent().getChildren().size(); i++)
{
if (!(wmlNode.getParent().getChildren().get(i) instanceof ILeafNode))
continue;
if (i > 0 && wmlNode.getParent().getChildren().get(i-1) instanceof ILeafNode)
tmp = (ILeafNode)wmlNode.getParent().getChildren().get(i-1);
ILeafNode tmpNode = (ILeafNode)wmlNode.getParent().getChildren().get(i);
if ((tmpNode).getText().equals(wmlNode.getText()) &&
tmpNode != wmlNode && !tmpNode.isHidden())
{
correspondingTag = tmpNode;
if (tmp != null && tmp.getText().equals("[/")) //$NON-NLS-1$
correspondingIsClosed = true;
break;
}
}
if (correspondingTag != null)
{
int tagOffset = correspondingTag.getTotalOffset();
int length = correspondingTag.getLength();
tagOffset--; // we need to color the '['
length += 2;
// we need to color the auxilliary '/'
if (correspondingIsClosed)
{
tagOffset--;
length++;
}
editor.setCurrentHighlightedNode(correspondingTag);
reconcilier.addPosition(tagOffset, length,
WMLHighlightingConfiguration.RULE_START_END_TAG);
reconcilier.refresh();
}
}
return null;
}
public ILeafNode findWMLLeafNodeAtOffset(ICompositeNode parseTreeRootNode, int offset, boolean findClosed)
{
boolean isClosed = false;
for (INode node : parseTreeRootNode.getChildren())
{
if (node.getTotalOffset() <= offset)
{
if (node instanceof ILeafNode && ((ILeafNode) node).getText().equals("[/")) //$NON-NLS-1$
{
isClosed = true;
}
if (node.getTotalOffset() + node.getTotalLength() >= offset)
{
if (node instanceof ILeafNode && isWMLTag(node) && (isClosed == findClosed))
return (ILeafNode) node;
else if (node instanceof ICompositeNode)
return findWMLLeafNodeAtOffset((ICompositeNode) node, offset, findClosed);
}
}
}
return null;
}
private boolean isWMLTag(INode node)
{
return (node.eContainer() != null &&
node.eContainer() instanceof ICompositeNode && ((ICompositeNode) node.eContainer()).getElement() instanceof WMLTag);
}
}