From f0bc570599938ee7ccfa7c47ac8d3c15efc3d89a Mon Sep 17 00:00:00 2001 From: Chris Recoskie Date: Wed, 25 Mar 2009 14:33:44 +0000 Subject: [PATCH] RESOLVED - bug 268145: include heuristics break standalone indexing https://bugs.eclipse.org/bugs/show_bug.cgi?id=268145 --- .../core/indexer/StandaloneIndexerInputAdapter.java | 8 ++++---- .../internal/core/indexer/StandaloneIndexerTask.java | 10 ++++++++++ .../cdt/internal/core/pdom/AbstractIndexerTask.java | 6 +----- .../eclipse/cdt/internal/core/pdom/PDOMWriter.java | 11 +++++++++-- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerInputAdapter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerInputAdapter.java index c7e6da60296..d54868e4977 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerInputAdapter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerInputAdapter.java @@ -45,7 +45,7 @@ public class StandaloneIndexerInputAdapter extends IndexerInputAdapter { @Override public long getLastModified(IIndexFileLocation location) { - return new File(location.getFullPath()).lastModified(); + return new File(URIUtil.toPath(location.getURI()).toOSString()).lastModified(); } @Override @@ -65,7 +65,7 @@ public class StandaloneIndexerInputAdapter extends IndexerInputAdapter { @Override public String getASTPath(IIndexFileLocation ifl) { - return ifl.getFullPath(); + return URIUtil.toPath(ifl.getURI()).toOSString(); } @Override @@ -101,7 +101,7 @@ public class StandaloneIndexerInputAdapter extends IndexerInputAdapter { // use the original } //Stand-alone indexing stores the absolute paths of files being indexed - result = new IndexFileLocation(URIUtil.toURI(includePath),includePath); + result = new IndexFileLocation(URIUtil.toURI(includePath),null); fIflCache.put(includePath, result); } return result; @@ -128,7 +128,7 @@ public class StandaloneIndexerInputAdapter extends IndexerInputAdapter { @Override public Object getInputFile(IIndexFileLocation location) { - return location.getFullPath(); + return URIUtil.toPath(location.getURI()); } @Override diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java index dd62f4bfcac..83003bf705b 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerTask.java @@ -186,6 +186,16 @@ public abstract class StandaloneIndexerTask extends AbstractIndexerTask { protected IStatus createStatus(String msg) { return new Status(IStatus.ERROR, "org.eclipse.cdt.core", IStatus.ERROR, msg, null); //$NON-NLS-1$ } + + + + /* (non-Javadoc) + * @see org.eclipse.cdt.internal.core.pdom.PDOMWriter#createStatus(java.lang.String, java.lang.Throwable) + */ + @Override + protected IStatus createStatus(String msg, Throwable e) { + return new Status(IStatus.ERROR, "org.eclipse.cdt.core", IStatus.ERROR, msg, e); //$NON-NLS-1$ + } /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.pdom.AbstractIndexerTask#getMessage(org.eclipse.cdt.internal.core.pdom.AbstractIndexerTask.MessageKind, java.lang.Object[]) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java index a6ab17d4870..c4302c36636 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/AbstractIndexerTask.java @@ -717,7 +717,7 @@ public abstract class AbstractIndexerTask extends PDOMWriter { s= new Status(s.getSeverity(), s.getPlugin(), s.getCode(), s.getMessage(), e); } } else { - s= CCorePlugin.createStatus(getMessage(MessageKind.errorWhileParsing, file), e); + s= createStatus(getMessage(MessageKind.errorWhileParsing, file), e); } logError(s); if (++fStatistics.fErrorCount > MAX_ERRORS) { @@ -817,10 +817,6 @@ public abstract class AbstractIndexerTask extends PDOMWriter { } - protected IStatus createStatus(String msg) { - return CCorePlugin.createStatus(msg); - } - /** * @return array of linkage IDs that should be parsed */ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMWriter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMWriter.java index 49440a52603..5d524ab0655 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMWriter.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMWriter.java @@ -211,8 +211,7 @@ abstract public class PDOMWriter { th= e; } if (th != null) { - stati.add(CCorePlugin.createStatus( - NLS.bind(Messages.PDOMWriter_errorWhileParsing, ifl.getURI().getPath()), th)); + stati.add(createStatus(NLS.bind(Messages.PDOMWriter_errorWhileParsing, ifl.getURI().getPath(), th))); } if (i