Issue 18895. Convert an expression function body into the block function body when Extract Local.

Issue 18895. Convert an expression function body into the block function body when Extract Local.

R=paulberry@google.com
BUG= https://code.google.com/p/dart/issues/detail?id=18895

Committed: https://code.google.com/p/dart/source/detail?r=40250

[Paul Berry, 2014-09-15 14:45:23]

lgtm with comment addressed

https://codereview.chromium.org/568333003/diff/1/pkg/analysis_server/lib/src/...
File pkg/analysis_server/lib/src/services/refactoring/extract_local.dart
(right):

https://codereview.chromium.org/568333003/diff/1/pkg/analysis_server/lib/src/...
pkg/analysis_server/lib/src/services/refactoring/extract_local.dart:140:
Statement targetStatement;
This code is confusing because of the implicit convention that either
targetStatement or targetBody will be null, depending whether the target is a
statement or a body.

How about something like this instead?

AstNode target;
{
  ...
  if (commonParent is Block) {
    ...
    target = firstParents[commonIndex + 1];
  } else {
    target = _getEnclosingExpressionBody(commonParent);
    if (target == null) {
      target = commonParent.getAncestor((node) => node is Statement);
    }
  }
  // insert variable declaration
  if (target is Statement) {
    ...
  } else if (target is ExpressionFunctionBody) {
    ...
  }

[scheglov, 2014-09-15 15:28:13]

https://codereview.chromium.org/568333003/diff/1/pkg/analysis_server/lib/src/...
File pkg/analysis_server/lib/src/services/refactoring/extract_local.dart
(right):

https://codereview.chromium.org/568333003/diff/1/pkg/analysis_server/lib/src/...
pkg/analysis_server/lib/src/services/refactoring/extract_local.dart:140:
Statement targetStatement;
On 2014/09/15 14:45:23, Paul Berry wrote:
> This code is confusing because of the implicit convention that either
> targetStatement or targetBody will be null, depending whether the target is a
> statement or a body.
> 
> How about something like this instead?
> 
> AstNode target;
> {
>   ...
>   if (commonParent is Block) {
>     ...
>     target = firstParents[commonIndex + 1];
>   } else {
>     target = _getEnclosingExpressionBody(commonParent);
>     if (target == null) {
>       target = commonParent.getAncestor((node) => node is Statement);
>     }
>   }
>   // insert variable declaration
>   if (target is Statement) {
>     ...
>   } else if (target is ExpressionFunctionBody) {
>     ...
>   }

Done.

[scheglov, 2014-09-15 15:28:35]

Committed patchset #2 (id:20001) manually as 40250 (presubmit successful).