Attachment #111120 for bug #245443

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




import org.eclipse.cdt.core.model.AbstractLanguage;
import org.eclipse.cdt.core.model.ILanguage;
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.pdom.AbstractIndexerTask;
import org.eclipse.cdt.internal.core.pdom.IndexerProgress;

		getLogService().traceLog(s.getMessage());
	}
	
	/*
	 * (non-Javadoc)
	 * @see org.eclipse.cdt.internal.core.pdom.AbstractIndexerTask#createDefaultScannerConfig(int)
	 */
	@Override
	protected IScannerInfo retrieveScannerConfig(int linkageID) {
		if (fIndexer.getScannerInfo() == null) return super.createDefaultScannerConfig(linkageID);
		else return fIndexer.getScannerInfo();
	}

	
}

Lines 141-147 Link Here

(-)pdom/AbstractIndexerTask.java (-2 / +2 lines)
141	return null;	141	return null;
142	}	142	}
143		143
144	protected IScannerInfo createDefaultScannerConfig(int linkageID) {	144	protected IScannerInfo retrieveScannerConfig(int linkageID) {
145	return new ScannerInfo();	145	return new ScannerInfo();
146	}	146	}
147		147
Lines 454-460 Link Here
454	int linkageID= lang.getLinkageID();	454	int linkageID= lang.getLinkageID();
455	String code= "#include \"" + filePath + "\"\n"; //$NON-NLS-1$ //$NON-NLS-2$	455	String code= "#include \"" + filePath + "\"\n"; //$NON-NLS-1$ //$NON-NLS-2$
456		456
457	IScannerInfo scanInfo= createDefaultScannerConfig(linkageID);	457	IScannerInfo scanInfo= retrieveScannerConfig(linkageID);
458	if (scanInfo != null) {	458	if (scanInfo != null) {
459	long start= System.currentTimeMillis();	459	long start= System.currentTimeMillis();
460	IASTTranslationUnit ast= createAST(code, lang, scanInfo, fASTOptions, monitor);	460	IASTTranslationUnit ast= createAST(code, lang, scanInfo, fASTOptions, monitor);

Return to bug 245443

Lines 20-25 Link Here

(-)indexer/StandaloneIndexerTask.java (+11 lines)
20	import org.eclipse.cdt.core.model.AbstractLanguage;	20	import org.eclipse.cdt.core.model.AbstractLanguage;
21	import org.eclipse.cdt.core.model.ILanguage;	21	import org.eclipse.cdt.core.model.ILanguage;
22	import org.eclipse.cdt.core.parser.IParserLogService;	22	import org.eclipse.cdt.core.parser.IParserLogService;
		23	import org.eclipse.cdt.core.parser.IScannerInfo;
23	import org.eclipse.cdt.internal.core.index.IWritableIndex;	24	import org.eclipse.cdt.internal.core.index.IWritableIndex;
24	import org.eclipse.cdt.internal.core.pdom.AbstractIndexerTask;	25	import org.eclipse.cdt.internal.core.pdom.AbstractIndexerTask;
25	import org.eclipse.cdt.internal.core.pdom.IndexerProgress;	26	import org.eclipse.cdt.internal.core.pdom.IndexerProgress;
Lines 219-223 Link Here
219	getLogService().traceLog(s.getMessage());	220	getLogService().traceLog(s.getMessage());
220	}	221	}
221		222
		223	/*
		224	* (non-Javadoc)
		225	* @see org.eclipse.cdt.internal.core.pdom.AbstractIndexerTask#createDefaultScannerConfig(int)
		226	*/
		227	@Override
		228	protected IScannerInfo retrieveScannerConfig(int linkageID) {
		229	if (fIndexer.getScannerInfo() == null) return super.createDefaultScannerConfig(linkageID);
		230	else return fIndexer.getScannerInfo();
		231	}
		232
222		233
223	}	234	}