mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

Fix for Bug 172865 - [Content Assist] Parameter hint popup should disappear outside parentheses

Browse source
This commit is contained in:
Anton Leherbauer 2007-02-07 11:05:35 +00:00
parent cc7e0a31f7
commit 6b90a610a5
3 changed files with 41 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,7 +85,7 @@ public class CParameterListValidator implements IContextInformationValidator, IC
Assert.isTrue((increment != 0 || decrement != 0) && increment != decrement);
int nestingLevel = -1; // Set to -1 to take into account first ( for function call
int nestingLevel = 0;
int charCount = 0;
while (start < end) {
char curr = document.getChar(start++);

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

@ -51,6 +51,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
private ASTCompletionNode fCN= null;
private boolean fCNComputed= false;
private IIndex fIndex = null;
private int fContextInfoPosition;
/**
* Creates a new context.
@ -109,6 +110,9 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
fCNComputed = true;
int offset = getParseOffset();
if (offset < 0) return null;
ICProject proj= getProject();
if (proj == null) return null;
@ -129,7 +133,7 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
flags = 0;
}
fCN = fTU.getCompletionNode(fIndex, flags, getParseOffset());
fCN = fTU.getCompletionNode(fIndex, flags, offset);
} catch (CoreException e) {
}
@ -139,19 +143,35 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
public int getParseOffset() {
if (!fParseOffsetComputed) {
fParseOffsetComputed= true;
fContextInfoPosition= guessContextInformationPosition();
if (fIsCompletion) {
fParseOffset = guessCompletionPosition();
fParseOffset = guessCompletionPosition(getInvocationOffset());
} else if (fContextInfoPosition > 0) {
fParseOffset = guessCompletionPosition(fContextInfoPosition);
} else {
fParseOffset = guessContextInformationPosition();
fParseOffset = -1;
}
}
return fParseOffset;
}
/**
* @return the offset where context information (parameter hints) starts.
*/
public int getContextInformationOffset() {
getParseOffset();
return fContextInfoPosition;
}
protected int guessCompletionPosition() {
final int contextPosition= getInvocationOffset();
/**
* Try to find a sensible completion position backwards in case the given offset
* is inside a function call argument list.
*
* @param contextPosition the starting position
* @return a sensible completion offset
*/
protected int guessCompletionPosition(int contextPosition) {
CHeuristicScanner scanner= new CHeuristicScanner(getDocument());
int bound= Math.max(-1, contextPosition - 200);
@ -162,14 +182,14 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
if (token == Symbols.TokenCOMMA) {
pos= scanner.findOpeningPeer(pos, bound, '(', ')');
if (pos == CHeuristicScanner.NOT_FOUND) return contextPosition;
if (pos == CHeuristicScanner.NOT_FOUND) return contextPosition;
token = scanner.previousToken(pos, bound);
}
if (token == Symbols.TokenLPAREN) {
pos= scanner.findNonWhitespaceBackward(pos - 1, bound);
if (pos == CHeuristicScanner.NOT_FOUND) return contextPosition;
if (pos == CHeuristicScanner.NOT_FOUND) return contextPosition;
token= scanner.previousToken(pos, bound);
@ -181,6 +201,13 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
return contextPosition;
}
/**
* Try to find the smallest offset inside the opening parenthesis of a function call
* argument list.
*
* @return the offset of the function call parenthesis plus 1 or -1 if the invocation
* offset is not inside a function call (or similar)
*/
protected int guessContextInformationPosition() {
final int contextPosition= getInvocationOffset();
@ -193,20 +220,16 @@ public class CContentAssistInvocationContext extends ContentAssistInvocationCont
int paren= scanner.findOpeningPeer(pos, bound, '(', ')');
if (paren == CHeuristicScanner.NOT_FOUND)
break;
paren= scanner.findNonWhitespaceBackward(paren - 1, bound);
if (paren == CHeuristicScanner.NOT_FOUND) {
break;
}
int token= scanner.previousToken(paren, bound);
int token= scanner.previousToken(paren - 1, bound);
// next token must be a method name (identifier) or the closing angle of a
// constructor call of a template type.
if (token == Symbols.TokenIDENT || token == Symbols.TokenGREATERTHAN) {
return paren + 1;
}
pos= paren;
pos= paren - 1;
} while (true);
return contextPosition;
return -1;
}
/**

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

@ -195,7 +195,7 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
if (argString.length() > 0) {
CProposalContextInformation info = new CProposalContextInformation(image, descString, argString);
info.setContextInformationPosition(context.getParseOffset());
info.setContextInformationPosition(context.getContextInformationOffset());
proposal.setContextInformation(info);
}
@ -307,7 +307,7 @@ public class DOMCompletionProposalComputer extends ParsingBasedProposalComputer
if (dispargString.length() > 0) {
CProposalContextInformation info = new CProposalContextInformation(image, dispString, dispargString);
info.setContextInformationPosition(context.getParseOffset());
info.setContextInformationPosition(context.getContextInformationOffset());
proposal.setContextInformation(info);
}