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

Fixed https://bugs.eclipse.org/bugs/show_bug.cgi?id=64280

Browse source
This commit is contained in:
John Camelon 2004-06-06 20:16:09 +00:00
parent 69a1d5f73d
commit a029d87d56
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
View file

@ -447,18 +447,22 @@ public class CompletionEngine implements RelevanceConstants {
private List lookupMacros(String prefix){ private List lookupMacros(String prefix){
Set keySet = new TreeSet(macroMap.keySet()); Set keySet = new TreeSet(macroMap.keySet());
Iterator i = keySet.iterator(); Iterator i = keySet.iterator();
final int length = prefix.length();
List resultSet = new ArrayList(); String newPrefix = prefix.toUpperCase();
List resultSet = new ArrayList();
String key = null;
String value = null; //$NON-NLS-1$
while( i.hasNext() ) while( i.hasNext() )
{ {
String key = (String) i.next(); key = (String) i.next();
String value = ""; //$NON-NLS-1$ if( key.length() < length )
if(key.length() > prefix.length()) { continue;
value = key.substring(0, prefix.length()).toUpperCase();
if(key.length() > length) {
value = key.substring(0, length).toUpperCase();
}else { }else {
value = key; value = key;
} }
String newPrefix = prefix.toUpperCase();
if( value.equals( newPrefix ) ) { if( value.equals( newPrefix ) ) {
IMacroDescriptor macroD = (IMacroDescriptor)macroMap.get(key); IMacroDescriptor macroD = (IMacroDescriptor)macroMap.get(key);
@ -467,7 +471,7 @@ public class CompletionEngine implements RelevanceConstants {
else else
resultSet.add( macroD.getName() ); resultSet.add( macroD.getName() );
} }
else if( value.compareTo( newPrefix ) > 0 ) else if( key.compareTo( prefix ) > 0 )
break; break;
} }
return resultSet; return resultSet;