Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(636)

Unified Diff: pkg/analysis_server/lib/src/services/correction/assist_internal.dart

Issue 969113002: Reformat (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 10 months 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
Index: pkg/analysis_server/lib/src/services/correction/assist_internal.dart
diff --git a/pkg/analysis_server/lib/src/services/correction/assist_internal.dart b/pkg/analysis_server/lib/src/services/correction/assist_internal.dart
index 85a5194299f8320adf6fe819447b54cef88076a8..525a198d0775746ccd58a30bee4c5079c91d9c15 100644
--- a/pkg/analysis_server/lib/src/services/correction/assist_internal.dart
+++ b/pkg/analysis_server/lib/src/services/correction/assist_internal.dart
@@ -22,11 +22,8 @@ import 'package:analyzer/src/generated/scanner.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:path/path.dart';
-
-
typedef _SimpleIdentifierVisitor(SimpleIdentifier node);
-
/**
* The computer for Dart assists.
*/
@@ -44,8 +41,8 @@ class AssistProcessor {
String unitLibraryFolder;
final List<Assist> assists = <Assist>[];
- final Map<String, LinkedEditGroup> linkedPositionGroups = <String,
- LinkedEditGroup>{};
+ final Map<String, LinkedEditGroup> linkedPositionGroups =
+ <String, LinkedEditGroup>{};
Position exitPosition = null;
int selectionEnd;
@@ -148,8 +145,8 @@ class AssistProcessor {
}
// prepare Change
change.message = formatList(kind.message, args);
- linkedPositionGroups.values.forEach(
- (group) => change.addLinkedEditGroup(group));
+ linkedPositionGroups.values
+ .forEach((group) => change.addLinkedEditGroup(group));
change.selection = exitPosition;
// add Assist
Assist assist = new Assist(kind, change);
@@ -590,9 +587,7 @@ class AssistProcessor {
BinaryExpression binaryExpression = node as BinaryExpression;
// prepare operator position
if (!_isOperatorSelected(
- binaryExpression,
- selectionOffset,
- selectionLength)) {
+ binaryExpression, selectionOffset, selectionLength)) {
_coverageMarker();
return;
}
@@ -829,8 +824,7 @@ class AssistProcessor {
utils.getLinesRangeStatements(innerThenStatements);
String oldSource = utils.getRangeText(lineRanges);
String newSource = utils.indentSourceLeftRight(oldSource, false);
- _addReplaceEdit(
- rangeNode(targetIfStatement),
+ _addReplaceEdit(rangeNode(targetIfStatement),
'if ($condition) {$eol$newSource$prefix}');
}
// done
@@ -892,8 +886,7 @@ class AssistProcessor {
utils.getLinesRangeStatements(targetThenStatements);
String oldSource = utils.getRangeText(lineRanges);
String newSource = utils.indentSourceLeftRight(oldSource, false);
- _addReplaceEdit(
- rangeNode(outerIfStatement),
+ _addReplaceEdit(rangeNode(outerIfStatement),
'if ($condition) {$eol$newSource$prefix}');
}
// done
@@ -905,8 +898,7 @@ class AssistProcessor {
if (node is SimpleIdentifier &&
node.parent is AssignmentExpression &&
(node.parent as AssignmentExpression).leftHandSide == node &&
- node.parent.parent is ExpressionStatement) {
- } else {
+ node.parent.parent is ExpressionStatement) {} else {
_coverageMarker();
return;
}
@@ -928,8 +920,7 @@ class AssistProcessor {
declNode.parent is VariableDeclaration &&
(declNode.parent as VariableDeclaration).name == declNode &&
declNode.parent.parent is VariableDeclarationList &&
- declNode.parent.parent.parent is VariableDeclarationStatement) {
- } else {
+ declNode.parent.parent.parent is VariableDeclarationStatement) {} else {
_coverageMarker();
return;
}
@@ -951,8 +942,7 @@ class AssistProcessor {
ExpressionStatement assignStatement =
node.parent.parent as ExpressionStatement;
if (assignStatement.parent is Block &&
- assignStatement.parent == declStatement.parent) {
- } else {
+ assignStatement.parent == declStatement.parent) {} else {
_coverageMarker();
return;
}
@@ -960,8 +950,7 @@ class AssistProcessor {
// check that "declaration" and "assignment" statements are adjacent
List<Statement> statements = block.statements;
if (statements.indexOf(assignStatement) ==
- statements.indexOf(declStatement) + 1) {
- } else {
+ statements.indexOf(declStatement) + 1) {} else {
_coverageMarker();
return;
}
@@ -978,8 +967,7 @@ class AssistProcessor {
// prepare enclosing VariableDeclarationList
VariableDeclarationList declList =
node.getAncestor((node) => node is VariableDeclarationList);
- if (declList != null && declList.variables.length == 1) {
- } else {
+ if (declList != null && declList.variables.length == 1) {} else {
_coverageMarker();
return;
}
@@ -991,8 +979,7 @@ class AssistProcessor {
}
// prepare VariableDeclarationStatement in Block
if (declList.parent is VariableDeclarationStatement &&
- declList.parent.parent is Block) {
- } else {
+ declList.parent.parent is Block) {} else {
_coverageMarker();
return;
}
@@ -1005,23 +992,20 @@ class AssistProcessor {
{
// declaration should not be last Statement
int declIndex = statements.indexOf(declStatement);
- if (declIndex < statements.length - 1) {
- } else {
+ if (declIndex < statements.length - 1) {} else {
_coverageMarker();
return;
}
// next Statement should be assignment
Statement assignStatement = statements[declIndex + 1];
- if (assignStatement is ExpressionStatement) {
- } else {
+ if (assignStatement is ExpressionStatement) {} else {
_coverageMarker();
return;
}
ExpressionStatement expressionStatement =
assignStatement as ExpressionStatement;
// expression should be assignment
- if (expressionStatement.expression is AssignmentExpression) {
- } else {
+ if (expressionStatement.expression is AssignmentExpression) {} else {
_coverageMarker();
return;
}
@@ -1104,8 +1088,8 @@ class AssistProcessor {
bool inVariable = false;
if (statement is VariableDeclarationStatement) {
VariableDeclarationStatement variableStatement = statement;
- for (VariableDeclaration variable in
- variableStatement.variables.variables) {
+ for (VariableDeclaration variable
+ in variableStatement.variables.variables) {
if (variable.initializer is ConditionalExpression) {
conditional = variable.initializer as ConditionalExpression;
inVariable = true;
@@ -1209,8 +1193,7 @@ class AssistProcessor {
String theSrc = _getNodeText(thenStatement.expression);
String elseSrc = _getNodeText(elseStatement.expression);
_addReplaceEdit(
- rangeNode(ifStatement),
- 'return $conditionSrc ? $theSrc : $elseSrc;');
+ rangeNode(ifStatement), 'return $conditionSrc ? $theSrc : $elseSrc;');
}
// assignments -> v = Conditional;
if (thenStatement is ExpressionStatement &&
@@ -1229,8 +1212,7 @@ class AssistProcessor {
String conditionSrc = _getNodeText(ifStatement.condition);
String theSrc = _getNodeText(thenAssignment.rightHandSide);
String elseSrc = _getNodeText(elseAssignment.rightHandSide);
- _addReplaceEdit(
- rangeNode(ifStatement),
+ _addReplaceEdit(rangeNode(ifStatement),
'$thenTarget = $conditionSrc ? $theSrc : $elseSrc;');
}
}
@@ -1248,9 +1230,7 @@ class AssistProcessor {
BinaryExpression binaryExpression = node as BinaryExpression;
// prepare operator position
if (!_isOperatorSelected(
- binaryExpression,
- selectionOffset,
- selectionLength)) {
+ binaryExpression, selectionOffset, selectionLength)) {
_coverageMarker();
return;
}
@@ -1334,8 +1314,7 @@ class AssistProcessor {
// prepare DartVariableStatement, should be part of Block
VariableDeclarationStatement statement =
node.getAncestor((node) => node is VariableDeclarationStatement);
- if (statement != null && statement.parent is Block) {
- } else {
+ if (statement != null && statement.parent is Block) {} else {
_coverageMarker();
return;
}
@@ -1709,15 +1688,14 @@ class AssistProcessor {
*
* https://code.google.com/p/dart/issues/detail?id=19912
*/
- static void _coverageMarker() {
- }
+ static void _coverageMarker() {}
/**
* Returns `true` if the selection covers an operator of the given
* [BinaryExpression].
*/
- static bool _isOperatorSelected(BinaryExpression binaryExpression, int offset,
- int length) {
+ static bool _isOperatorSelected(
+ BinaryExpression binaryExpression, int offset, int length) {
AstNode left = binaryExpression.leftOperand;
AstNode right = binaryExpression.rightOperand;
// between the nodes
@@ -1753,7 +1731,6 @@ class AssistProcessor {
}
}
-
class _SimpleIdentifierRecursiveAstVisitor extends RecursiveAstVisitor {
final _SimpleIdentifierVisitor visitor;
« no previous file with comments | « pkg/analysis_server/lib/src/services/correction/assist.dart ('k') | pkg/analysis_server/lib/src/services/correction/fix.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698