Attachment #29274 for bug #114909

Lines 16-22 Link Here

(-)model/org/eclipse/jdt/internal/core/CompilationUnit.java (-2 / +1 lines)
16	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
17	import org.eclipse.jdt.core.*;	17	import org.eclipse.jdt.core.*;
18	import org.eclipse.jdt.core.compiler.*;	18	import org.eclipse.jdt.core.compiler.*;
19	import org.eclipse.jdt.core.compiler.IProblem;
20	import org.eclipse.jdt.core.dom.AST;	19	import org.eclipse.jdt.core.dom.AST;
21	import org.eclipse.jdt.internal.compiler.ASTVisitor;	20	import org.eclipse.jdt.internal.compiler.ASTVisitor;
22	import org.eclipse.jdt.internal.compiler.IProblemFactory;	21	import org.eclipse.jdt.internal.compiler.IProblemFactory;
Lines 155-161 Link Here
155	try {	154	try {
156	if (computeProblems){	155	if (computeProblems){
157	perWorkingCopyInfo.beginReporting();	156	perWorkingCopyInfo.beginReporting();
158	compilationUnitDeclaration = CompilationUnitProblemFinder.process(unit, this, contents, parser, this.owner, perWorkingCopyInfo, !createAST/reset env if not creating AST/, pm);	157	compilationUnitDeclaration = CompilationUnitProblemFinder.process(unit, this, contents, parser, this.owner, perWorkingCopyInfo, createAST, pm);
159	perWorkingCopyInfo.endReporting();	158	perWorkingCopyInfo.endReporting();
160	}	159	}
161		160

Lines 79-85 Link Here

(-)model/org/eclipse/jdt/internal/core/ReconcileWorkingCopyOperation.java (-1 / +1 lines)
79	try {	79	try {
80	problemRequestor.beginReporting();	80	problemRequestor.beginReporting();
81	char[] contents = workingCopy.getContents();	81	char[] contents = workingCopy.getContents();
82	unit = CompilationUnitProblemFinder.process(workingCopy, contents, this.workingCopyOwner, problemRequestor, !this.createAST/reset env if not creating AST/, this.progressMonitor);	82	unit = CompilationUnitProblemFinder.process(workingCopy, contents, this.workingCopyOwner, problemRequestor, this.createAST, this.progressMonitor);
83	problemRequestor.endReporting();	83	problemRequestor.endReporting();
84	if (progressMonitor != null) progressMonitor.worked(1);	84	if (progressMonitor != null) progressMonitor.worked(1);
85	if (this.createAST && unit != null) {	85	if (this.createAST && unit != null) {




		IErrorHandlingPolicy policy,
		Map settings,
		ICompilerRequestor requestor,
		IProblemFactory problemFactory,
		boolean parseLiteralExpressionsAsConstants ) {

		super(environment, policy, settings, requestor, problemFactory, parseLiteralExpressionsAsConstants );
	}

	/**

		Parser parser,
		WorkingCopyOwner workingCopyOwner,
		IProblemRequestor problemRequestor,
		boolean createAST,
		IProgressMonitor monitor)
		throws JavaModelException {


				getHandlingPolicy(),
				project.getOptions(true),
				getRequestor(),
				problemFactory,
				!createAST);
			if (parser != null) {
				problemFinder.parser = parser;
			}

			if (problemFactory != null)
				problemFactory.monitor = null; // don't hold a reference to this external object
			// NB: unit.cleanUp() is done by caller
			if (problemFinder != null && !createAST)
				problemFinder.lookupEnvironment.reset();		
		}
	}


		char[] contents,
		WorkingCopyOwner workingCopyOwner,
		IProblemRequestor problemRequestor,
		boolean createAST,
		IProgressMonitor monitor)
		throws JavaModelException {
			
		return process(null/*no CompilationUnitDeclaration*/, unitElement, contents, null/*use default Parser*/, workingCopyOwner, problemRequestor, createAST, monitor);
	}

	

Lines 158-163 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/Compiler.java (+1 lines)
158		158
159	// create a problem handler given a handling policy	159	// create a problem handler given a handling policy
160	this.options = new CompilerOptions(settings);	160	this.options = new CompilerOptions(settings);
		161	this.options.parseLiteralExpressionsAsConstants = parseLiteralExpressionsAsConstants;
161		162
162	// wrap requestor in DebugRequestor if one is specified	163	// wrap requestor in DebugRequestor if one is specified
163	if(DebugRequestor == null) {	164	if(DebugRequestor == null) {

Return to bug 114909

Lines 79-87 Link Here

(-)model/org/eclipse/jdt/internal/core/CompilationUnitProblemFinder.java (-8 / +10 lines)
79	IErrorHandlingPolicy policy,	79	IErrorHandlingPolicy policy,
80	Map settings,	80	Map settings,
81	ICompilerRequestor requestor,	81	ICompilerRequestor requestor,
82	IProblemFactory problemFactory) {	82	IProblemFactory problemFactory,
		83	boolean parseLiteralExpressionsAsConstants ) {
83		84
84	super(environment, policy, settings, requestor, problemFactory, true);	85	super(environment, policy, settings, requestor, problemFactory, parseLiteralExpressionsAsConstants );
85	}	86	}
86		87
87	/**	88	/**
Lines 136-142 Link Here
136	Parser parser,	137	Parser parser,
137	WorkingCopyOwner workingCopyOwner,	138	WorkingCopyOwner workingCopyOwner,
138	IProblemRequestor problemRequestor,	139	IProblemRequestor problemRequestor,
139	boolean resetEnvironment,	140	boolean createAST,
140	IProgressMonitor monitor)	141	IProgressMonitor monitor)
141	throws JavaModelException {	142	throws JavaModelException {
142		143
Lines 152-158 Link Here
152	getHandlingPolicy(),	153	getHandlingPolicy(),
153	project.getOptions(true),	154	project.getOptions(true),
154	getRequestor(),	155	getRequestor(),
155	problemFactory);	156	problemFactory,
		157	!createAST);
156	if (parser != null) {	158	if (parser != null) {
157	problemFinder.parser = parser;	159	problemFinder.parser = parser;
158	}	160	}
Lines 197-204 Link Here
197	if (problemFactory != null)	199	if (problemFactory != null)
198	problemFactory.monitor = null; // don't hold a reference to this external object	200	problemFactory.monitor = null; // don't hold a reference to this external object
199	// NB: unit.cleanUp() is done by caller	201	// NB: unit.cleanUp() is done by caller
200	if (problemFinder != null && resetEnvironment)	202	if (problemFinder != null && !createAST)
201	problemFinder.lookupEnvironment.reset();	203	problemFinder.lookupEnvironment.reset();
202	}	204	}
203	}	205	}
204		206
Lines 207-217 Link Here
207	char[] contents,	209	char[] contents,
208	WorkingCopyOwner workingCopyOwner,	210	WorkingCopyOwner workingCopyOwner,
209	IProblemRequestor problemRequestor,	211	IProblemRequestor problemRequestor,
210	boolean resetEnvironment,	212	boolean createAST,
211	IProgressMonitor monitor)	213	IProgressMonitor monitor)
212	throws JavaModelException {	214	throws JavaModelException {
213		215
214	return process(null/no CompilationUnitDeclaration/, unitElement, contents, null/use default Parser/, workingCopyOwner, problemRequestor, resetEnvironment, monitor);	216	return process(null/no CompilationUnitDeclaration/, unitElement, contents, null/use default Parser/, workingCopyOwner, problemRequestor, createAST, monitor);
215	}	217	}
216		218
217		219