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

Fix for 62512

Browse source 
Added matching routine to IncludePattern
This commit is contained in:
Bogdan Gheorghe 2004-05-18 02:29:20 +00:00
parent a86bb76c6a
commit a8037dbc3a
6 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,6 @@
2004-05-17 Bogdan Gheorghe
Added matching routine to IncludePattern
2004-05-17 Andrew Niefer 2004-05-17 Andrew Niefer
bug 61044 - report search matches at the end of each compilation unit bug 61044 - report search matches at the end of each compilation unit

18
core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/IncludePattern.java
View file

@ -12,8 +12,8 @@
package org.eclipse.cdt.internal.core.search.matching; package org.eclipse.cdt.internal.core.search.matching;
import java.io.IOException; import java.io.IOException;
import org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate; import org.eclipse.cdt.core.parser.ISourceElementCallbackDelegate;
import org.eclipse.cdt.core.parser.ast.IASTInclusion;
import org.eclipse.cdt.core.search.ICSearchScope; import org.eclipse.cdt.core.search.ICSearchScope;
import org.eclipse.cdt.internal.core.CharOperation; import org.eclipse.cdt.internal.core.CharOperation;
import org.eclipse.cdt.internal.core.index.IEntryResult; import org.eclipse.cdt.internal.core.index.IEntryResult;
@ -98,7 +98,21 @@ public class IncludePattern extends CSearchPattern {
*/ */
public int matchLevel(ISourceElementCallbackDelegate node, LimitTo limit) { public int matchLevel(ISourceElementCallbackDelegate node, LimitTo limit) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return 0; if (!( node instanceof IASTInclusion )) {
return IMPOSSIBLE_MATCH;
}
if( ! canAccept( limit ) )
return IMPOSSIBLE_MATCH;
IASTInclusion inc = (IASTInclusion) node;
String fileName = inc.getFullFileName();
if(CharOperation.equals(simpleName,fileName.toCharArray(),_caseSensitive)){
return ACCURATE_MATCH;
}
return IMPOSSIBLE_MATCH;
} }
} }

10
core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/processing/IndexingJob.java
View file

@ -35,7 +35,7 @@ public class IndexingJob extends Job {
public IndexingJob( Thread thread, JobManager manager ) public IndexingJob( Thread thread, JobManager manager )
{ {
super( "Indexer" ); super( "C/C++ Indexer" ); //$NON-NLS-1$
jobManager = manager; jobManager = manager;
indexThread = thread; indexThread = thread;
setPriority( LONG ); setPriority( LONG );
@ -46,7 +46,7 @@ public class IndexingJob extends Job {
protected IStatus run(IProgressMonitor monitor) { protected IStatus run(IProgressMonitor monitor) {
progressMonitor = monitor; progressMonitor = monitor;
setThread( indexThread ); setThread( indexThread );
progressMonitor.beginTask( "", 100 ); progressMonitor.beginTask( "", 100 ); //$NON-NLS-1$
return ASYNC_FINISH; return ASYNC_FINISH;
} }
@ -58,7 +58,7 @@ public class IndexingJob extends Job {
ticks++; ticks++;
if( ticks > maxTicks ) if( ticks > maxTicks )
maxTicks = ticks; maxTicks = ticks;
updateRemainingCount( "" ); updateRemainingCount( "" ); //$NON-NLS-1$
} }
public void setTicks( int n ){ public void setTicks( int n ){
@ -67,7 +67,7 @@ public class IndexingJob extends Job {
maxTicks = ticks; maxTicks = ticks;
updatePercentage(); updatePercentage();
updateRemainingCount( "" ); updateRemainingCount( "" ); //$NON-NLS-1$
} }
public int tickDown( String str ){ public int tickDown( String str ){
@ -86,7 +86,7 @@ public class IndexingJob extends Job {
if( progressMonitor == null ) if( progressMonitor == null )
return; return;
String taskString = Util.bind("manager.filesToIndex", Integer.toString(ticks)); String taskString = Util.bind("manager.filesToIndex", Integer.toString(ticks)); //$NON-NLS-1$
taskString += str; taskString += str;
progressMonitor.subTask( taskString ); progressMonitor.subTask( taskString );
} }

8
core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/processing/JobManager.java
View file

@ -51,8 +51,8 @@ public abstract class JobManager implements Runnable {
protected IndexingJob indexJob = null; protected IndexingJob indexJob = null;
static private final IStatus OK_STATUS = new Status( IStatus.OK, "org.eclipse.cdt.core", IStatus.OK, "", null ); static private final IStatus OK_STATUS = new Status( IStatus.OK, "org.eclipse.cdt.core", IStatus.OK, "", null ); //$NON-NLS-1$//$NON-NLS-2$
static private final IStatus ERROR_STATUS = new Status( IStatus.ERROR, "org.eclipse.cdt.core", IStatus.ERROR, "", null ); static private final IStatus ERROR_STATUS = new Status( IStatus.ERROR, "org.eclipse.cdt.core", IStatus.ERROR, "", null ); //$NON-NLS-1$//$NON-NLS-2$
public static void verbose(String log) { public static void verbose(String log) {
System.out.println("(" + Thread.currentThread() + ") " + log); //$NON-NLS-1$//$NON-NLS-2$ System.out.println("(" + Thread.currentThread() + ") " + log); //$NON-NLS-1$//$NON-NLS-2$
@ -194,9 +194,9 @@ public abstract class JobManager implements Runnable {
String progressString = null; String progressString = null;
IJob job = currentJob(); IJob job = currentJob();
if( job instanceof IndexRequest ){ if( job instanceof IndexRequest ){
progressString = " ("; progressString = " ("; //$NON-NLS-1$
progressString += job.toString(); progressString += job.toString();
progressString += ")"; progressString += ")"; //$NON-NLS-1$
} }
if( indexJob.tickDown( progressString ) == 0 ){ if( indexJob.tickDown( progressString ) == 0 ){
indexJob.done( OK_STATUS ); indexJob.done( OK_STATUS );

2
core/org.eclipse.cdt.ui/plugin.properties
View file

@ -153,7 +153,7 @@ HideHeaderFiles.description= Hides all Header files
WorkInProgress.name=Work In Progress WorkInProgress.name=Work In Progress
CDTIndexerProperty.name=CDT Indexer CDTIndexerProperty.name=C/C++ Indexer
cDocumentFactory=C Document Factory cDocumentFactory=C Document Factory
cDocumentSetupParticipant=C Document Setup Participant cDocumentSetupParticipant=C Document Setup Participant

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginResources.properties
View file

@ -43,8 +43,8 @@ ErrorParserBlock.desc=Set the error parsers for this project
BinaryParserBlock.label=Binary Parser BinaryParserBlock.label=Binary Parser
BinaryParserBlock.desc=Set required binary parser for this project BinaryParserBlock.desc=Set required binary parser for this project
IndexerBlock.label=Indexer IndexerBlock.label=C/C++ Indexer
IndexerBlock.desc=Indexer setting for this project. The indexer is required for search and other related features. IndexerBlock.desc=C/C++ Indexer setting for this project. The C/C++ indexer is required for C/C++ search and other related features.
ReferenceBlock.label= Projects ReferenceBlock.label= Projects
ReferenceBlock.desc= Referenced C/C++ Projects ReferenceBlock.desc= Referenced C/C++ Projects