mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Patch for Andrew Niefer

Browse source 
- set default C++ search sort order to be by path
- modified search dialog to use checkboxes instead of radio buttons

SearchFor buttons are now organized like this:
        Class / Struct          Function        Variable
        Union                   Method          Field
        Enumeration             Namespace       Any Element

When multiple buttons are selected, they are combined using the Or 
Pattern.
This commit is contained in:
John Camelon 2003-09-04 13:50:42 +00:00
parent ebf52677b8
commit b8321abb0a
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core/search/ChangeLog
View file

@ -1,3 +1,7 @@
2003-09-03 Andrew Niefer
- added CLASS_STRUCT to the SearchFor constants
- Modified CSearchPattern to handle CLASS_STRUCT
2003-08-26 Bogdan Gheorghe 2003-08-26 Bogdan Gheorghe
- Added debug tracing statements to SearchEngine - Added debug tracing statements to SearchEngine
- Modified scanForNames in CSearchPattern to treat append - Modified scanForNames in CSearchPattern to treat append

2
core/org.eclipse.cdt.core/search/org/eclipse/cdt/core/search/ICSearchConstants.java
View file

@ -95,6 +95,8 @@ public interface ICSearchConstants {
public static final SearchFor MACRO = new SearchFor( 10 ); public static final SearchFor MACRO = new SearchFor( 10 );
public static final SearchFor CLASS_STRUCT = new SearchFor( 11 );
/* Nature of match */ /* Nature of match */
/** /**

9
core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/CSearchPattern.java
View file

@ -76,7 +76,7 @@ public abstract class CSearchPattern implements ICSearchConstants, ICSearchPatte
} }
CSearchPattern pattern = null; CSearchPattern pattern = null;
if( searchFor == TYPE || searchFor == CLASS || searchFor == STRUCT || searchFor == ENUM || searchFor == UNION ){ if( searchFor == TYPE || searchFor == CLASS || searchFor == STRUCT || searchFor == ENUM || searchFor == UNION || searchFor == CLASS_STRUCT ){
pattern = createClassPattern( patternString, searchFor, limitTo, matchMode, caseSensitive ); pattern = createClassPattern( patternString, searchFor, limitTo, matchMode, caseSensitive );
} else if ( searchFor == METHOD || searchFor == FUNCTION ){ } else if ( searchFor == METHOD || searchFor == FUNCTION ){
pattern = createMethodPattern( patternString, searchFor, limitTo, matchMode, caseSensitive ); pattern = createMethodPattern( patternString, searchFor, limitTo, matchMode, caseSensitive );
@ -239,6 +239,13 @@ public abstract class CSearchPattern implements ICSearchConstants, ICSearchPatte
return orPattern; return orPattern;
} }
if( searchFor == CLASS_STRUCT ){
OrPattern orPattern = new OrPattern();
orPattern.addPattern( createClassPattern( patternString, CLASS, limitTo, matchMode, caseSensitive ) );
orPattern.addPattern( createClassPattern( patternString, STRUCT, limitTo, matchMode, caseSensitive ) );
return orPattern;
}
IScanner scanner = ParserFactory.createScanner( new StringReader( patternString ), "TEXT", new ScannerInfo(), ParserMode.QUICK_PARSE, null ); IScanner scanner = ParserFactory.createScanner( new StringReader( patternString ), "TEXT", new ScannerInfo(), ParserMode.QUICK_PARSE, null );
IToken token = null; IToken token = null;