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

Applied Andrew's fix for PR 103055: [Indexer] reduce use of getFileForLocation while indexing

Browse source
This commit is contained in:
Vladimir Hirsl 2005-07-08 15:02:04 +00:00
parent 095e5fa132
commit 4f1d0f9247
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/index/domsourceindexer/IndexEncoderUtil.java
View file

@ -28,8 +28,8 @@ public class IndexEncoderUtil {
//the first step in the Source Indexer is to add the file being indexed to the index //the first step in the Source Indexer is to add the file being indexed to the index
//which actually creates an entry for the file in the index. //which actually creates an entry for the file in the index.
IndexedFileEntry mainIndexFile = indexer.getOutput().getIndexedFile( String fullPath = indexer.getResourceFile().getFullPath().toString();
indexer.getResourceFile().getFullPath().toString()); IndexedFileEntry mainIndexFile = indexer.getOutput().getIndexedFile( fullPath );
if (mainIndexFile != null) if (mainIndexFile != null)
fileNum = mainIndexFile.getFileID(); fileNum = mainIndexFile.getFileID();
@ -46,7 +46,7 @@ public class IndexEncoderUtil {
filePath = fileName; filePath = fileName;
} }
if (!filePath.equals(indexer.getResourceFile().getFullPath().toString())) { if (!filePath.equals(fullPath)) {
//We are not in the file that has triggered the index. Thus, we need to find the //We are not in the file that has triggered the index. Thus, we need to find the
//file number for the current file (if it has one). If the current file does not //file number for the current file (if it has one). If the current file does not
//have a file number, we need to add it to the index. //have a file number, we need to add it to the index.
@ -80,13 +80,20 @@ public class IndexEncoderUtil {
? true : false; ? true : false;
} }
static private boolean visitedExternalHeader = false;
static private String lastVisitedFile = null;
public static boolean nodeInVisitedExternalHeader(IASTNode node, DOMSourceIndexer indexer) { public static boolean nodeInVisitedExternalHeader(IASTNode node, DOMSourceIndexer indexer) {
String fileName = node.getContainingFilename(); String fileName = node.getContainingFilename();
if (fileName.equals(lastVisitedFile)) {
return visitedExternalHeader;
}
lastVisitedFile = fileName;
IPath filePath = new Path(fileName); IPath filePath = new Path(fileName);
IPath projectPath = indexer.getProject().getFullPath(); IPath projectPath = indexer.getProject().getFullPath();
visitedExternalHeader = (CCorePlugin.getWorkspace().getRoot().getFileForLocation(filePath) == null) &&
return (CCorePlugin.getWorkspace().getRoot().getFileForLocation(filePath) == null) &&
indexer.haveEncounteredHeader(projectPath, filePath, false); indexer.haveEncounteredHeader(projectPath, filePath, false);
return visitedExternalHeader;
} }
} }