From 8e87278bf3b4782777e5c72b25543cfc57ef900e Mon Sep 17 00:00:00 2001 From: Mike Kucera Date: Wed, 29 Jul 2009 18:49:22 +0000 Subject: Bug 285052 - standalone index needs an ASTFilePathResolver --- .../cdt/internal/core/indexer/StandaloneIndexer.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexer.java index dc0f3a16cc5..05238ed50e2 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexer.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexer.java @@ -24,8 +24,10 @@ import java.util.Set; import org.eclipse.cdt.core.parser.IParserLogService; import org.eclipse.cdt.core.parser.IScannerInfo; import org.eclipse.cdt.internal.core.index.IWritableIndex; +import org.eclipse.cdt.internal.core.index.IWritableIndexFragment; import org.eclipse.cdt.internal.core.pdom.IndexerProgress; import org.eclipse.cdt.internal.core.pdom.PDOMWriter; +import org.eclipse.cdt.internal.core.pdom.WritablePDOM; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -172,6 +174,8 @@ public abstract class StandaloneIndexer { fLog = log; fScanner = scanner; fScannerInfoProvider = null; + + setupASTFilePathResolver(); } @@ -183,9 +187,19 @@ public abstract class StandaloneIndexer { fLog = log; fScanner = null; fScannerInfoProvider = scannerProvider; + + setupASTFilePathResolver(); + } + + + private void setupASTFilePathResolver() { + IWritableIndexFragment fragment = getIndex().getWritableFragment(); + if(fragment instanceof WritablePDOM) { + WritablePDOM pdom = (WritablePDOM)fragment; + pdom.setASTFilePathResolver(new StandaloneIndexerInputAdapter(this)); + } } - public void setScannerInfoProvider(IStandaloneScannerInfoProvider provider) { fScannerInfoProvider = provider; fScanner = null; -- cgit v1.2.3