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 build hang caused by Indexer; DependencyTest fix

Browse source
This commit is contained in:
Bogdan Gheorghe 2004-04-01 18:41:01 +00:00
parent c5df08b65b
commit 98583fe50f
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java
View file

@ -587,7 +587,9 @@ import org.eclipse.core.runtime.Platform;
private String[] convertToLocalPath(String[] model) { private String[] convertToLocalPath(String[] model) {
IPath defaultPath = Platform.getLocation(); IPath defaultPath = Platform.getLocation();
String pathString = defaultPath.toOSString(); String pathString = defaultPath.toOSString();
if (pathString.charAt(pathString.length() - 1) == '\\') char endChar = pathString.charAt(pathString.length() - 1);
if (endChar == '/' ||
endChar == '\\')
{ {
pathString = pathString.substring(0, pathString.length() - 1); pathString = pathString.substring(0, pathString.length() - 1);
} }

2
core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java
View file

@ -74,7 +74,7 @@ public class SourceIndexer extends AbstractIndexer {
output.addDocument(document); output.addDocument(document);
// Create a new Parser // Create a new Parser
SourceIndexerRequestor requestor = new SourceIndexerRequestor(this, resourceFile); SourceIndexerRequestor requestor = new SourceIndexerRequestor(this, resourceFile);
requestor.removeMarkers(resourceFile); //requestor.removeMarkers(resourceFile);
//Get the scanner info //Get the scanner info
IProject currentProject = resourceFile.getProject(); IProject currentProject = resourceFile.getProject();

8
core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java
View file

@ -96,7 +96,7 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo
*/ */
public boolean acceptProblem(IProblem problem) { public boolean acceptProblem(IProblem problem) {
IASTInclusion include = peekInclude(); /* IASTInclusion include = peekInclude();
IFile tempFile = resourceFile; IFile tempFile = resourceFile;
int lineNumber = problem.getSourceLineNumber(); int lineNumber = problem.getSourceLineNumber();
@ -118,7 +118,7 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo
} }
addMarkers(tempFile,problem, lineNumber); addMarkers(tempFile,problem, lineNumber);
*/
return DefaultProblemHandler.ruleOnProblem( problem, ParserMode.COMPLETE_PARSE ); return DefaultProblemHandler.ruleOnProblem( problem, ParserMode.COMPLETE_PARSE );
} }
@ -219,7 +219,7 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo
*/ */
public void enterInclusion(IASTInclusion inclusion) { public void enterInclusion(IASTInclusion inclusion) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
IPath newPath = new Path(inclusion.getFullFileName()); /* IPath newPath = new Path(inclusion.getFullFileName());
IFile tempFile = CCorePlugin.getWorkspace().getRoot().getFileForLocation(newPath); IFile tempFile = CCorePlugin.getWorkspace().getRoot().getFileForLocation(newPath);
if (tempFile !=null){ if (tempFile !=null){
removeMarkers(tempFile); removeMarkers(tempFile);
@ -227,7 +227,7 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo
else{ else{
//File is out of workspace //File is out of workspace
} }*/
IASTInclusion parent = peekInclude(); IASTInclusion parent = peekInclude();
indexer.addInclude(inclusion, parent); indexer.addInclude(inclusion, parent);