upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 20:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

eclipse plugin: Fix the logic for appending end brace for macro calls

Browse Source
This commit is contained in:
Timotei Dolean 2012-03-02 22:29:42 +00:00
parent bb8748ceb3
commit 9ff5e7a9ba
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/contentassist/WMLProposalProvider.java
View File

@ -163,7 +163,6 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
if( model != null ) {
addTagProposals( model, false, context, acceptor );
}
}
@ -193,6 +192,11 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
private void addMacroCallProposals( EObject model, boolean ruleProposal,
ContentAssistContext context, ICompletionProposalAcceptor acceptor )
{
INode currentNode = context.getCurrentNode( );
boolean appendEndBrace = currentNode != null && ! currentNode.getText( ).equals( "}" );
for( Entry< String, Define > define: projectCache_.getDefines( )
.entrySet( ) ) {
StringBuilder proposal = new StringBuilder( 10 );
@ -204,7 +208,10 @@ public class WMLProposalProvider extends AbstractWMLProposalProvider
for( String arg: define.getValue( ).getArguments( ) ) {
proposal.append( " " + arg ); //$NON-NLS-1$
}
proposal.append( "}" ); //$NON-NLS-1$
if( appendEndBrace ) {
proposal.append( "}" ); //$NON-NLS-1$
}
acceptor.accept( createCompletionProposal( proposal.toString( ),
define.getKey( ), MACRO_CALL_IMAGE, context,