mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-06 09:16:02 +02:00
Code Issues Wiki Activity

Bug 511274 - Compute correct replacement length for ParameterGuessingProposal

Browse source 
Change-Id: Ia2d6f10086f8d2a9ec922a3ff37eadc8ab94c9ed
This commit is contained in:
Nathan Ridge 2017-01-29 19:34:48 -05:00
parent 0f2acb0221
commit a44bef00d6
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,8 @@ import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.testplugin.TestScannerProvider; import org.eclipse.cdt.core.testplugin.TestScannerProvider;
import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
import org.eclipse.cdt.internal.ui.text.contentassist.CCompletionProposal;
/** /**
* A collection of code completion tests. * A collection of code completion tests.
* *
@ -1660,6 +1662,17 @@ public class CompletionTests extends CompletionTestBase {
} }
} }
// void foo(int x, int y);
// void caller() {
// fo/*cursor*/
// }
public void testReplacementLength_511274() throws Exception {
Object[] results = invokeContentAssist(fCursorOffset, 0, true, false, true).results;
assertEquals(1, results.length);
assertInstance(results[0], CCompletionProposal.class);
assertEquals(2, ((CCompletionProposal) results[0]).getReplacementLength());
}
// struct A { // struct A {
// void foo(); // void foo();
// }; // };

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ParameterGuessingProposal.java
View file

@ -113,7 +113,7 @@ public class ParameterGuessingProposal extends FunctionCompletionProposal {
replacement = fullPrefix + replacement + ")"; //$NON-NLS-1$ replacement = fullPrefix + replacement + ")"; //$NON-NLS-1$
replacementOffset = proposal.getReplacementOffset(); replacementOffset = proposal.getReplacementOffset();
} }
replacementLength = replacement.length(); replacementLength = prefix.length();
ParameterGuessingProposal ret = new ParameterGuessingProposal(replacement, replacementOffset, ParameterGuessingProposal ret = new ParameterGuessingProposal(replacement, replacementOffset,
replacementLength, proposal.getImage(), proposal.getDisplayString(), proposal.getIdString(), replacementLength, proposal.getImage(), proposal.getDisplayString(), proposal.getIdString(),
proposal.getRelevance(), context.getViewer(), function, invocationOffset, parseOffset, proposal.getRelevance(), context.getViewer(), function, invocationOffset, parseOffset,