diff options
Diffstat (limited to 'core')
3 files changed, 8 insertions, 6 deletions
diff --git a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java index 24900b25e8b..979fea6dfbe 100644 --- a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java +++ b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java @@ -587,7 +587,9 @@ import org.eclipse.core.runtime.Platform; private String[] convertToLocalPath(String[] model) { IPath defaultPath = Platform.getLocation(); 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); } diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java index a4c529e3264..02879914837 100644 --- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java +++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexer.java @@ -74,7 +74,7 @@ public class SourceIndexer extends AbstractIndexer { output.addDocument(document); // Create a new Parser SourceIndexerRequestor requestor = new SourceIndexerRequestor(this, resourceFile); - requestor.removeMarkers(resourceFile); + //requestor.removeMarkers(resourceFile); //Get the scanner info IProject currentProject = resourceFile.getProject(); diff --git a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java index 59cf5d1099d..e3d093d71bf 100644 --- a/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java +++ b/core/org.eclipse.cdt.core/index/org/eclipse/cdt/internal/core/search/indexing/SourceIndexerRequestor.java @@ -96,7 +96,7 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo */ public boolean acceptProblem(IProblem problem) { - IASTInclusion include = peekInclude(); +/* IASTInclusion include = peekInclude(); IFile tempFile = resourceFile; int lineNumber = problem.getSourceLineNumber(); @@ -118,7 +118,7 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo } addMarkers(tempFile,problem, lineNumber); - + */ return DefaultProblemHandler.ruleOnProblem( problem, ParserMode.COMPLETE_PARSE ); } @@ -219,7 +219,7 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo */ public void enterInclusion(IASTInclusion inclusion) { // TODO Auto-generated method stub - IPath newPath = new Path(inclusion.getFullFileName()); +/* IPath newPath = new Path(inclusion.getFullFileName()); IFile tempFile = CCorePlugin.getWorkspace().getRoot().getFileForLocation(newPath); if (tempFile !=null){ removeMarkers(tempFile); @@ -227,7 +227,7 @@ public class SourceIndexerRequestor implements ISourceElementRequestor, IIndexCo else{ //File is out of workspace - } + }*/ IASTInclusion parent = peekInclude(); indexer.addInclude(inclusion, parent); |