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

Bug 98881 - Added lots of goodies to the search completion to make it more usable. Also fixed up the DOM indexer to record varargs.

Browse source
This commit is contained in:
Doug Schaefer 2005-07-06 17:11:07 +00:00
parent 4d55560528
commit e8f0d1c55e
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/FunctionMethodPatternTests.java
View file

@ -118,7 +118,7 @@ public class FunctionMethodPatternTests extends BaseSearchTest {
search( workspace, pattern, scope, resultCollector ); search( workspace, pattern, scope, resultCollector );
matches = resultCollector.getSearchResults(); matches = resultCollector.getSearchResults();
assertEquals( 2, matches.size()); assertEquals( 0, matches.size()); // The pattern must match the use of the void in the code
pattern = SearchEngine.createSearchPattern( "turnAgain()", METHOD, DECLARATIONS, true ); //$NON-NLS-1$ pattern = SearchEngine.createSearchPattern( "turnAgain()", METHOD, DECLARATIONS, true ); //$NON-NLS-1$

5
core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/IndexVisitorUtil.java
View file

@ -219,9 +219,8 @@ public class IndexVisitorUtil {
IType paramType = parameters[i].getType(); IType paramType = parameters[i].getType();
parameterList.add(ASTTypeUtil.getType(paramType).toCharArray()); parameterList.add(ASTTypeUtil.getType(paramType).toCharArray());
} }
if (parameterList.isEmpty()) { if (function.takesVarArgs())
parameterList.add("void".toCharArray()); //$NON-NLS-1$ parameterList.add("...".toCharArray()); //$NON-NLS-1$
}
} }
catch (DOMException e) { catch (DOMException e) {
} }

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

@ -125,7 +125,7 @@ public class DOMCompletionContributor implements ICompletionContributor {
args.append(ASTTypeUtil.getType(paramType)); args.append(ASTTypeUtil.getType(paramType));
String paramName = params[i].getName(); String paramName = params[i].getName();
if (paramName != null) { if (paramName != null && paramName.length() > 0) {
args.append(' '); args.append(' ');
args.append(paramName); args.append(paramName);
} }

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

@ -15,7 +15,6 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import org.eclipse.cdt.core.dom.ast.ASTCompletionNode; import org.eclipse.cdt.core.dom.ast.ASTCompletionNode;
import org.eclipse.cdt.core.dom.ast.DOMException;
import org.eclipse.cdt.core.dom.ast.IASTFieldReference; import org.eclipse.cdt.core.dom.ast.IASTFieldReference;
import org.eclipse.cdt.core.dom.ast.IASTName; import org.eclipse.cdt.core.dom.ast.IASTName;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
@ -40,6 +39,9 @@ public class SearchCompletionContributor implements ICompletionContributor {
{ {
if (!validContext(completionNode)) if (!validContext(completionNode))
return; return;
if (prefix == null || prefix.length() == 0)
return;
// Create search engine // Create search engine
SearchEngine searchEngine = new SearchEngine(); SearchEngine searchEngine = new SearchEngine();