editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/ExpressionStatement.java - Issue 11364134: Merge libv1.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/ExpressionStatement.java

Issue 11364134: Merge libv1. (Closed) Base URL: https://dart.googlecode.com/svn/experimental/lib_v2/dart

Patch Set: Reupload due to error Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/CompilationUnit.java ('k') | editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/FunctionDeclaration.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/ExpressionStatement.java

diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/ExpressionStatement.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/ExpressionStatement.java

index 6adb0330cf20a67897bef2f931ab81cb88c10304..c951e3824c38de745109974680f0b11d76364a5a 100644

--- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/ExpressionStatement.java

+++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/ast/ExpressionStatement.java

@@ -30,7 +30,8 @@ public class ExpressionStatement extends Statement {

private Expression expression;

/**

- * The semicolon terminating the statement.

+ * The semicolon terminating the statement, or {@code null} if the expression is a function

+ * expression and isn't followed by a semicolon.

private Token semicolon;

@@ -63,7 +64,10 @@ public class ExpressionStatement extends Statement {

@Override

public Token getEndToken() {

- return semicolon;

+ if (semicolon != null) {

+ return semicolon;

+ }

+ return expression.getEndToken();

}

/**