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

Revert "Bug 459186 - Index read locks are leaking"

Browse source 
This reverts commit dc08061cc6.
This commit is contained in:
Sergey Prigogin 2015-02-06 14:12:02 -08:00
parent a424fc6329
commit 9de6de9fd4
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/SurroundWithTemplateMenuAction.java
View file

@ -272,15 +272,11 @@ public class SurroundWithTemplateMenuAction implements IWorkbenchWindowPulldownD
TemplateCompletionProposalComputer templateComputer = new TemplateCompletionProposalComputer(); TemplateCompletionProposalComputer templateComputer = new TemplateCompletionProposalComputer();
CContentAssistInvocationContext context = new CContentAssistInvocationContext( editor.getViewer(), textSelection.getOffset(), editor, true, false ); CContentAssistInvocationContext context = new CContentAssistInvocationContext( editor.getViewer(), textSelection.getOffset(), editor, true, false );
try { List<ICompletionProposal> proposals= templateComputer.computeCompletionProposals(context, null);
List<ICompletionProposal> proposals= templateComputer.computeCompletionProposals(context, null); if (proposals == null || proposals.isEmpty())
if (proposals == null || proposals.isEmpty()) return null;
return null;
return getActionsFromProposals(proposals, context.getInvocationOffset(), editor.getViewer());
return getActionsFromProposals(proposals, context.getInvocationOffset(), editor.getViewer());
} finally {
context.dispose();
}
} }
private static ITextSelection getTextSelection(CEditor editor) { private static ITextSelection getTextSelection(CEditor editor) {

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

@ -358,19 +358,13 @@ public class ParameterGuessingProposal extends FunctionCompletionProposal {
} }
/** /**
* Returns a list of functions and variables that are defined in the current context. * Returns a list of functions and variables that are defined in current context.
* @return a list of assignable elements. * @return a list of assignable elements.
*/ */
private List<IBinding> getAssignableElements() { private List<IBinding> getAssignableElements() {
int i = getStatementStartOffset(fContext.getDocument(), getStatementStartOffset()); int i = getStatementStartOffset(fContext.getDocument(), getStatementStartOffset());
CContentAssistInvocationContext context = CContentAssistInvocationContext c = new CContentAssistInvocationContext(fTextViewer, i, getCEditor(), true, false);
new CContentAssistInvocationContext(fTextViewer, i, getCEditor(), true, false); IASTCompletionNode node = c.getCompletionNode();
IASTCompletionNode node;
try {
node = context.getCompletionNode();
} finally {
context.dispose();
}
IASTName[] names = node.getNames(); IASTName[] names = node.getNames();
List<IBinding> allBindings = new ArrayList<>(); List<IBinding> allBindings = new ArrayList<>();
for (IASTName name : names) { for (IASTName name : names) {