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

Fix for 238955: [Content Assist] symbol completion buggy for #if

Browse source
This commit is contained in:
Anton Leherbauer 2008-07-07 12:57:41 +00:00
parent 604b8366ec
commit 803729074d
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -236,7 +236,7 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
String repString = repStringBuff.toString(); String repString = repStringBuff.toString();
String descString = descStringBuff.toString(); String descString = descStringBuff.toString();
CCompletionProposal proposal = createProposal(repString, descString, image, baseRelevance + RelevanceConstants.MACRO_TYPE_RELEVANCE, context); CCompletionProposal proposal = createProposal(repString, descString, prefix.length(), image, baseRelevance + RelevanceConstants.MACRO_TYPE_RELEVANCE, context);
if (!context.isContextInformationStyle()) { if (!context.isContextInformationStyle()) {
proposal.setCursorPosition(repString.length() - 1); proposal.setCursorPosition(repString.length() - 1);
} }
@ -249,7 +249,7 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
proposals.add(proposal); proposals.add(proposal);
} else } else
proposals.add(createProposal(macroName, macroName, image, baseRelevance + RelevanceConstants.MACRO_TYPE_RELEVANCE, context)); proposals.add(createProposal(macroName, macroName, prefix.length(), image, baseRelevance + RelevanceConstants.MACRO_TYPE_RELEVANCE, context));
} }
protected void handleBinding(IBinding binding, protected void handleBinding(IBinding binding,
@ -400,7 +400,7 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
String repString = repStringBuff.toString(); String repString = repStringBuff.toString();
final int relevance = function instanceof ICPPMethod ? RelevanceConstants.METHOD_TYPE_RELEVANCE : RelevanceConstants.FUNCTION_TYPE_RELEVANCE; final int relevance = function instanceof ICPPMethod ? RelevanceConstants.METHOD_TYPE_RELEVANCE : RelevanceConstants.FUNCTION_TYPE_RELEVANCE;
CCompletionProposal proposal = createProposal(repString, dispString, idString, image, baseRelevance + relevance, context); CCompletionProposal proposal = createProposal(repString, dispString, idString, context.getCompletionNode().getLength(), image, baseRelevance + relevance, context);
if (!context.isContextInformationStyle()) { if (!context.isContextInformationStyle()) {
proposal.setCursorPosition(repString.length() - 1); proposal.setCursorPosition(repString.length() - 1);
} }
@ -444,7 +444,7 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
: isField(variable) : isField(variable)
? RelevanceConstants.FIELD_TYPE_RELEVANCE ? RelevanceConstants.FIELD_TYPE_RELEVANCE
: RelevanceConstants.VARIABLE_TYPE_RELEVANCE; : RelevanceConstants.VARIABLE_TYPE_RELEVANCE;
CCompletionProposal proposal = createProposal(repString, dispString, idString, image, baseRelevance + relevance, context); CCompletionProposal proposal = createProposal(repString, dispString, idString, context.getCompletionNode().getLength(), image, baseRelevance + relevance, context);
proposals.add(proposal); proposals.add(proposal);
} }
@ -502,15 +502,19 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
} }
private CCompletionProposal createProposal(String repString, String dispString, Image image, int relevance, CContentAssistInvocationContext context) { private CCompletionProposal createProposal(String repString, String dispString, Image image, int relevance, CContentAssistInvocationContext context) {
return createProposal(repString, dispString, null, image, relevance, context); return createProposal(repString, dispString, null, context.getCompletionNode().getLength(), image, relevance, context);
} }
private CCompletionProposal createProposal(String repString, String dispString, String idString, Image image, int relevance, CContentAssistInvocationContext context) { private CCompletionProposal createProposal(String repString, String dispString, int prefixLength, Image image, int relevance, CContentAssistInvocationContext context) {
return createProposal(repString, dispString, null, prefixLength, image, relevance, context);
}
private CCompletionProposal createProposal(String repString, String dispString, String idString, int prefixLength, Image image, int relevance, CContentAssistInvocationContext context) {
int parseOffset = context.getParseOffset(); int parseOffset = context.getParseOffset();
int invocationOffset = context.getInvocationOffset(); int invocationOffset = context.getInvocationOffset();
boolean doReplacement = !context.isContextInformationStyle(); boolean doReplacement = !context.isContextInformationStyle();
int repLength = doReplacement ? context.getCompletionNode().getLength() : 0; int repLength = doReplacement ? prefixLength : 0;
int repOffset = doReplacement ? parseOffset - repLength : invocationOffset; int repOffset = doReplacement ? parseOffset - repLength : invocationOffset;
repString = doReplacement ? repString : ""; //$NON-NLS-1$ repString = doReplacement ? repString : ""; //$NON-NLS-1$