Attachment 42057 Details for Bug 142793 – Proposed fix

[patch] Proposed fix

patch_142793.txt (text/plain), 2.19 KB, created by Olivier Thomann

on 2006-05-19 14:22:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2006-05-19 14:22:01 EDT

Size: 2.19 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: dom/org/eclipse/jdt/core/dom/ASTRecoveryPropagator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTRecoveryPropagator.java,v
>retrieving revision 1.5
>diff -u -r1.5 ASTRecoveryPropagator.java
>--- dom/org/eclipse/jdt/core/dom/ASTRecoveryPropagator.java	10 Apr 2006 14:02:46 -0000	1.5
>+++ dom/org/eclipse/jdt/core/dom/ASTRecoveryPropagator.java	19 May 2006 18:24:24 -0000
>@@ -138,6 +138,18 @@
> 		return visitChildren;
> 	}
> 	
>+	public boolean visit(EmptyStatement emptyStatement) {
>+		if (emptyStatement.getStartPosition() == -1) {
>+			ASTNode parent = emptyStatement.getParent();
>+			if (parent != null) {
>+				int endPosition = parent.getStartPosition() + parent.getLength() - 1;
>+				emptyStatement.setSourceRange(endPosition, 0);
>+				emptyStatement.setFlags(emptyStatement.getFlags() | ASTNode.RECOVERED);
>+			}
>+		}
>+		return visitNode(emptyStatement);
>+	}
>+	
> 	protected boolean visitNode(ASTNode node) {
> 		if(this.blockDepth > 0) {
> 			int start = node.getStartPosition();
>Index: dom/org/eclipse/jdt/core/dom/ASTConverter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/dom/org/eclipse/jdt/core/dom/ASTConverter.java,v
>retrieving revision 1.238
>diff -u -r1.238 ASTConverter.java
>--- dom/org/eclipse/jdt/core/dom/ASTConverter.java	29 Mar 2006 02:54:50 -0000	1.238
>+++ dom/org/eclipse/jdt/core/dom/ASTConverter.java	19 May 2006 18:24:24 -0000
>@@ -3316,9 +3316,11 @@
> 	protected Statement createFakeEmptyStatement(org.eclipse.jdt.internal.compiler.ast.Statement statement) {
> 		EmptyStatement emptyStatement = new EmptyStatement(this.ast);
> 		emptyStatement.setFlags(emptyStatement.getFlags() | ASTNode.MALFORMED);
>-		int start = statement.sourceStart;
>-		int end = statement.sourceEnd;
>-		emptyStatement.setSourceRange(start, end - start + 1);
>+		if (statement != null) {
>+			int start = statement.sourceStart;
>+			int end = statement.sourceEnd;
>+			emptyStatement.setSourceRange(start, end - start + 1);
>+		}
> 		return emptyStatement;
> 	}
> 	/**

Actions: View | Diff

Attachments on bug 142793: 42031 | 42040 | 42057 | 42059 | 42294