| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library services.src.correction.util; | 5 library services.src.correction.util; |
| 6 | 6 |
| 7 import 'package:analysis_server/src/services/correction/change.dart'; | 7 import 'package:analysis_server/src/protocol2.dart' show SourceEdit; |
| 8 import 'package:analysis_server/src/services/correction/source_range.dart'; | 8 import 'package:analysis_server/src/services/correction/source_range.dart'; |
| 9 import 'package:analysis_server/src/services/correction/strings.dart'; | 9 import 'package:analysis_server/src/services/correction/strings.dart'; |
| 10 import 'package:analyzer/src/generated/ast.dart'; | 10 import 'package:analyzer/src/generated/ast.dart'; |
| 11 import 'package:analyzer/src/generated/element.dart'; | 11 import 'package:analyzer/src/generated/element.dart'; |
| 12 import 'package:analyzer/src/generated/engine.dart'; | 12 import 'package:analyzer/src/generated/engine.dart'; |
| 13 import 'package:analyzer/src/generated/resolver.dart'; | 13 import 'package:analyzer/src/generated/resolver.dart'; |
| 14 import 'package:analyzer/src/generated/scanner.dart'; | 14 import 'package:analyzer/src/generated/scanner.dart'; |
| 15 import 'package:analyzer/src/generated/source.dart'; | 15 import 'package:analyzer/src/generated/source.dart'; |
| 16 | 16 |
| 17 | 17 |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 } | 224 } |
| 225 } | 225 } |
| 226 return _endOfLine; | 226 return _endOfLine; |
| 227 } | 227 } |
| 228 | 228 |
| 229 /** | 229 /** |
| 230 * Returns an [Edit] that changes indentation of the source of the given | 230 * Returns an [Edit] that changes indentation of the source of the given |
| 231 * [SourceRange] from [oldIndent] to [newIndent], keeping indentation of lines | 231 * [SourceRange] from [oldIndent] to [newIndent], keeping indentation of lines |
| 232 * relative to each other. | 232 * relative to each other. |
| 233 */ | 233 */ |
| 234 Edit createIndentEdit(SourceRange range, String oldIndent, String newIndent) { | 234 SourceEdit createIndentEdit(SourceRange range, String oldIndent, |
| 235 String newIndent) { |
| 235 String newSource = replaceSourceRangeIndent(range, oldIndent, newIndent); | 236 String newSource = replaceSourceRangeIndent(range, oldIndent, newIndent); |
| 236 return new Edit(range.offset, range.length, newSource); | 237 return new SourceEdit(range.offset, range.length, newSource); |
| 237 } | 238 } |
| 238 | 239 |
| 239 /** | 240 /** |
| 240 * Returns the actual type source of the given [Expression], may be `null` | 241 * Returns the actual type source of the given [Expression], may be `null` |
| 241 * if can not be resolved, should be treated as the `dynamic` type. | 242 * if can not be resolved, should be treated as the `dynamic` type. |
| 242 */ | 243 */ |
| 243 String getExpressionTypeSource(Expression expression) { | 244 String getExpressionTypeSource(Expression expression) { |
| 244 if (expression == null) { | 245 if (expression == null) { |
| 245 return null; | 246 return null; |
| 246 } | 247 } |
| (...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 885 int newOperatorPrecedence) { | 886 int newOperatorPrecedence) { |
| 886 if (expr._precedence < newOperatorPrecedence) { | 887 if (expr._precedence < newOperatorPrecedence) { |
| 887 return "(${expr._source})"; | 888 return "(${expr._source})"; |
| 888 } | 889 } |
| 889 return expr._source; | 890 return expr._source; |
| 890 } | 891 } |
| 891 | 892 |
| 892 static _InvertedCondition _simple(String source) => | 893 static _InvertedCondition _simple(String source) => |
| 893 new _InvertedCondition(2147483647, source); | 894 new _InvertedCondition(2147483647, source); |
| 894 } | 895 } |
| OLD | NEW |