Attachment #35938 for bug #130980

Lines 1090-1095 Link Here

(-)compiler/org/eclipse/jdt/core/compiler/IProblem.java (+7 lines)
1090	*/	1090	*/
1091	/** @since 3.1 */	1091	/** @since 3.1 */
1092	int CorruptedSignature = Internal + 700;	1092	int CorruptedSignature = Internal + 700;
		1093	/**
		1094	* Corrupted source
		1095	*/
		1096	/** @since 3.2 */
		1097	int InvalidEncoding = Internal + 701;
		1098	/** @since 3.2 */
		1099	int CannotReadSource = Internal + 702;
1093		1100
1094	/**	1101	/**
1095	* Autoboxing	1102	* Autoboxing

Lines 525-530 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties (+4 lines)
525	### CORRUPTED BINARIES	525	### CORRUPTED BINARIES
526	700 = The class file {0} contains a signature ''{1}'' ill-formed at position {2}	526	700 = The class file {0} contains a signature ''{1}'' ill-formed at position {2}
527		527
		528	### CORRUPTED SOURCES
		529	701 = Cannot read the source from {0}; either the file uses a different encoding than {1} or it is corrupted
		530	702 = Cannot read the source from {0} due to internal exception {1}
		531
528	### AUTOBOXING	532	### AUTOBOXING
529	720 = The expression of type {0} is boxed into {1}	533	720 = The expression of type {0} is boxed into {1}
530	721 = The expression of type {0} is unboxed into {1}	534	721 = The expression of type {0} is unboxed into {1}

Lines 10-15 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java (+32 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.internal.compiler.problem;	11	package org.eclipse.jdt.internal.compiler.problem;
12		12
		13	import java.io.CharConversionException;
		14	import java.io.PrintWriter;
		15	import java.io.StringWriter;
13	import java.text.MessageFormat;	16	import java.text.MessageFormat;
14		17
15	import org.eclipse.jdt.core.compiler.CategorizedProblem;	18	import org.eclipse.jdt.core.compiler.CategorizedProblem;
Lines 815-820 Link Here
815	constructorCall.sourceStart,	818	constructorCall.sourceStart,
816	constructorCall.sourceEnd);	819	constructorCall.sourceEnd);
817	}	820	}
		821	public void cannotReadSource(CompilationUnitDeclaration unit, AbortCompilationUnit abortException) {
		822	String fileName = new String(unit.compilationResult.fileName);
		823	if (abortException.exception instanceof CharConversionException) {
		824	// specific encoding issue
		825	String encoding = abortException.encoding;
		826	if (encoding == null) {
		827	encoding = System.getProperty("file.encoding"); //$NON-NLS-1$
		828	}
		829	String[] arguments = new String[]{ fileName, encoding, };
		830	this.handle(
		831	IProblem.InvalidEncoding,
		832	arguments,
		833	arguments,
		834	0,
		835	0);
		836	return;
		837	}
		838	StringWriter stringWriter = new StringWriter();
		839	PrintWriter writer = new PrintWriter(stringWriter);
		840	abortException.exception.printStackTrace(writer);
		841	String exceptionTrace = stringWriter.toString();
		842	String[] arguments = new String[]{ fileName, exceptionTrace, };
		843	this.handle(
		844	IProblem.CannotReadSource,
		845	arguments,
		846	arguments,
		847	0,
		848	0);
		849	}
818	public void cannotReferToNonFinalOuterLocal(LocalVariableBinding local, ASTNode location) {	850	public void cannotReferToNonFinalOuterLocal(LocalVariableBinding local, ASTNode location) {
819	String[] arguments =new String[]{ new String(local.readableName())};	851	String[] arguments =new String[]{ new String(local.readableName())};
820	this.handle(	852	this.handle(

Lines 10-15 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/problem/AbortCompilationUnit.java (+12 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.internal.compiler.problem;	11	package org.eclipse.jdt.internal.compiler.problem;
12		12
		13	import java.io.IOException;
		14
13	import org.eclipse.jdt.core.compiler.CategorizedProblem;	15	import org.eclipse.jdt.core.compiler.CategorizedProblem;
14	import org.eclipse.jdt.internal.compiler.CompilationResult;	16	import org.eclipse.jdt.internal.compiler.CompilationResult;
15		17
Lines 23-29 Link Here
23		25
24	private static final long serialVersionUID = -4253893529982226734L; // backward compatible	26	private static final long serialVersionUID = -4253893529982226734L; // backward compatible
25		27
		28	public String encoding;
		29
26	public AbortCompilationUnit(CompilationResult compilationResult, CategorizedProblem problem) {	30	public AbortCompilationUnit(CompilationResult compilationResult, CategorizedProblem problem) {
27	super(compilationResult, problem);	31	super(compilationResult, problem);
28	}	32	}
		33
		34	/**
		35	* Used to surface encoding issues when reading sources
		36	*/
		37	public AbortCompilationUnit(CompilationResult compilationResult, IOException exception, String encoding) {
		38	super(compilationResult, exception);
		39	this.encoding = encoding;
		40	}
29	}	41	}




import org.eclipse.jdt.internal.compiler.lookup.TypeIds;
import org.eclipse.jdt.internal.compiler.parser.diagnose.DiagnoseParser;
import org.eclipse.jdt.internal.compiler.problem.AbortCompilation;
import org.eclipse.jdt.internal.compiler.problem.AbortCompilationUnit;
import org.eclipse.jdt.internal.compiler.problem.ProblemReporter;
import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;
import org.eclipse.jdt.internal.compiler.util.Messages;

	try {
		this.diet = true;
		parsedUnit = parse(sourceUnit, compilationResult);
	} finally {
	finally {
		this.diet = old;
	}
	return parsedUnit;

		initialize(true);
		goForCompilationUnit();

		/* unit creation */
		this.referenceContext = 
			this.compilationUnit = 
				new CompilationUnitDeclaration(
					this.problemReporter, 
					compilationResult, 
					0);

		/* scanners initialization */
		char[] contents;
		try {
			contents = sourceUnit.getContents();
		} catch(AbortCompilationUnit abortException) {
			this.problemReporter().cannotReadSource(this.compilationUnit, abortException);
			contents = CharOperation.NO_CHAR; // pretend empty from thereon
		}
		this.scanner.setSource(contents);
		this.compilationUnit.sourceEnd = this.scanner.source.length - 1;
		if (end != -1) this.scanner.resetTo(start, end);
		if (this.javadocParser != null && this.javadocParser.checkDocComment) {
			this.javadocParser.scanner.setSource(contents);

				this.javadocParser.scanner.resetTo(start, end);
			}
		}
		/* unit creation */
		this.referenceContext = 
			this.compilationUnit = 
				new CompilationUnitDeclaration(
					this.problemReporter, 
					compilationResult, 
					this.scanner.source.length);
		/* run automaton */
		parse();
	} finally {





import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
import org.eclipse.jdt.internal.compiler.problem.AbortCompilationUnit;
import org.eclipse.jdt.internal.compiler.util.Util;

public class CompilationUnit implements ICompilationUnit {

	try {
		return Util.getFileCharContent(new File(new String(this.fileName)), this.encoding);
	} catch (IOException e) {
		this.contents = CharOperation.NO_CHAR; // assume no source if asked again
		throw new AbortCompilationUnit(null, e, this.encoding);
	}
	return CharOperation.NO_CHAR;
}
/**
 * @see org.eclipse.jdt.internal.compiler.env.IDependent#getFileName()

Return to bug 130980

Lines 15-20 Link Here

(-)batch/org/eclipse/jdt/internal/compiler/batch/CompilationUnit.java (-2 / +3 lines)
15		15
16	import org.eclipse.jdt.core.compiler.CharOperation;	16	import org.eclipse.jdt.core.compiler.CharOperation;
17	import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;	17	import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
		18	import org.eclipse.jdt.internal.compiler.problem.AbortCompilationUnit;
18	import org.eclipse.jdt.internal.compiler.util.Util;	19	import org.eclipse.jdt.internal.compiler.util.Util;
19		20
20	public class CompilationUnit implements ICompilationUnit {	21	public class CompilationUnit implements ICompilationUnit {
Lines 56-64 Link Here
56	try {	57	try {
57	return Util.getFileCharContent(new File(new String(this.fileName)), this.encoding);	58	return Util.getFileCharContent(new File(new String(this.fileName)), this.encoding);
58	} catch (IOException e) {	59	} catch (IOException e) {
59	// assume no content then	60	this.contents = CharOperation.NO_CHAR; // assume no source if asked again
		61	throw new AbortCompilationUnit(null, e, this.encoding);
60	}	62	}
61	return CharOperation.NO_CHAR;
62	}	63	}
63	/**	64	/**
64	* @see org.eclipse.jdt.internal.compiler.env.IDependent#getFileName()	65	* @see org.eclipse.jdt.internal.compiler.env.IDependent#getFileName()