mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-26 01:33:53 +02:00
Code Issues Wiki Activity

Bug 72391 - When completing a function, do not insert parentheses if they are already present

Browse source 
Change-Id: Ia4beb5e7ee288c48f2dbde45b1f34a562b939cab
This commit is contained in:
Nathan Ridge 2017-01-11 20:53:00 -05:00
parent 81cbe87666
commit 07ca5174d5
3 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests.java
View file

@ -1676,4 +1676,12 @@ public class CompletionTests extends CompletionTestBase {
assertCompletionResults(fCursorOffset, expected, ID); assertCompletionResults(fCursorOffset, expected, ID);
assertDotReplacedWithArrow(); assertDotReplacedWithArrow();
} }
// void waldo();
// int main() {
// wal/*cursor*/();
// }
public void testExistingParens_72391() throws Exception {
assertCompletionResults(new String[] { "waldo" }); // expect no parens in replacement
}
} }

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistInvocationContext.java
View file

@ -195,6 +195,17 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
return token == Symbols.TokenSEMICOLON; return token == Symbols.TokenSEMICOLON;
} }
}; };
private final Lazy<Boolean> followedByOpeningParen = new Lazy<Boolean>() {
@Override
protected Boolean calculateValue() {
final IDocument doc = getDocument();
final int offset = getInvocationOffset();
final CHeuristicScanner.TokenStream tokenStream = new CHeuristicScanner.TokenStream(doc, offset);
final int token = tokenStream.nextToken();
return token == Symbols.TokenLPAREN;
}
};
private final Lazy<String> functionParameterDelimiter = new Lazy<String>() { private final Lazy<String> functionParameterDelimiter = new Lazy<String>() {
@Override @Override
@ -452,6 +463,11 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
assertNotDisposed(); assertNotDisposed();
return followedBySemicolon.value(); return followedBySemicolon.value();
} }
public boolean isFollowedByOpeningParen() {
assertNotDisposed();
return followedByOpeningParen.value();
}
public String getFunctionParameterDelimiter() { public String getFunctionParameterDelimiter() {
assertNotDisposed(); assertNotDisposed();

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionProposalComputer.java
View file

@ -614,8 +614,10 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
// Instead, emitting a semicolon is useful. // Instead, emitting a semicolon is useful.
boolean inUsingDeclaration = context.isInUsingDirective(); boolean inUsingDeclaration = context.isInUsingDirective();
if (!inUsingDeclaration) { if (!inUsingDeclaration) {
repStringBuff.append('('); if (!context.isFollowedByOpeningParen()) {
repStringBuff.append(')'); repStringBuff.append('(');
repStringBuff.append(')');
}
} else if (!context.isFollowedBySemicolon()) { } else if (!context.isFollowedBySemicolon()) {
repStringBuff.append(';'); repStringBuff.append(';');
} }