| 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 import 'dart:async'; | 5 import 'dart:async'; |
| 6 | 6 |
| 7 import 'package:analysis_server/plugin/edit/assist/assist_core.dart'; | 7 import 'package:analysis_server/plugin/edit/assist/assist_core.dart'; |
| 8 import 'package:analysis_server/plugin/edit/assist/assist_dart.dart'; | 8 import 'package:analysis_server/plugin/edit/assist/assist_dart.dart'; |
| 9 import 'package:analysis_server/protocol/protocol_generated.dart'; | 9 import 'package:analysis_server/protocol/protocol_generated.dart'; |
| 10 import 'package:analysis_server/src/plugin/server_plugin.dart'; | 10 import 'package:analysis_server/src/plugin/server_plugin.dart'; |
| 11 import 'package:analysis_server/src/services/correction/assist.dart'; | 11 import 'package:analysis_server/src/services/correction/assist.dart'; |
| 12 import 'package:analysis_server/src/services/correction/assist_internal.dart'; | 12 import 'package:analysis_server/src/services/correction/assist_internal.dart'; |
| 13 import 'package:analyzer/dart/ast/ast.dart'; | 13 import 'package:analyzer/dart/ast/ast.dart'; |
| 14 import 'package:analyzer/dart/ast/standard_resolution_map.dart'; | 14 import 'package:analyzer/dart/ast/standard_resolution_map.dart'; |
| 15 import 'package:analyzer/dart/element/element.dart'; | 15 import 'package:analyzer/dart/element/element.dart'; |
| 16 import 'package:analyzer/file_system/file_system.dart'; | 16 import 'package:analyzer/file_system/file_system.dart'; |
| 17 import 'package:analyzer/source/package_map_resolver.dart'; | 17 import 'package:analyzer/source/package_map_resolver.dart'; |
| 18 import 'package:analyzer/src/dart/analysis/ast_provider_context.dart'; |
| 19 import 'package:analyzer/src/dart/analysis/ast_provider_driver.dart'; |
| 20 import 'package:analyzer/src/dart/element/ast_provider.dart'; |
| 18 import 'package:analyzer/src/generated/engine.dart'; | 21 import 'package:analyzer/src/generated/engine.dart'; |
| 19 import 'package:analyzer/src/generated/source.dart'; | 22 import 'package:analyzer/src/generated/source.dart'; |
| 20 import 'package:plugin/manager.dart'; | 23 import 'package:plugin/manager.dart'; |
| 21 import 'package:plugin/plugin.dart'; | 24 import 'package:plugin/plugin.dart'; |
| 22 import 'package:test/test.dart'; | 25 import 'package:test/test.dart'; |
| 23 import 'package:test_reflective_loader/test_reflective_loader.dart'; | 26 import 'package:test_reflective_loader/test_reflective_loader.dart'; |
| 24 | 27 |
| 25 import '../../abstract_single_unit.dart'; | 28 import '../../abstract_single_unit.dart'; |
| 26 import 'flutter_util.dart'; | 29 import 'flutter_util.dart'; |
| 27 | 30 |
| (...skipping 4610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4638 List<Position> expectedPositions = _findResultPositions(expectedStrings); | 4641 List<Position> expectedPositions = _findResultPositions(expectedStrings); |
| 4639 expect(group.positions, unorderedEquals(expectedPositions)); | 4642 expect(group.positions, unorderedEquals(expectedPositions)); |
| 4640 if (expectedSuggestions != null) { | 4643 if (expectedSuggestions != null) { |
| 4641 expect(group.suggestions, unorderedEquals(expectedSuggestions)); | 4644 expect(group.suggestions, unorderedEquals(expectedSuggestions)); |
| 4642 } | 4645 } |
| 4643 } | 4646 } |
| 4644 | 4647 |
| 4645 Future<List<Assist>> _computeAssists() async { | 4648 Future<List<Assist>> _computeAssists() async { |
| 4646 CompilationUnitElement testUnitElement = | 4649 CompilationUnitElement testUnitElement = |
| 4647 resolutionMap.elementDeclaredByCompilationUnit(testUnit); | 4650 resolutionMap.elementDeclaredByCompilationUnit(testUnit); |
| 4648 DartAssistContext assistContext = new _DartAssistContextForValues( | 4651 DartAssistContext assistContext; |
| 4649 testUnitElement.source, | 4652 if (enableNewAnalysisDriver) { |
| 4650 offset, | 4653 assistContext = new _DartAssistContextForValues( |
| 4651 length, | 4654 testUnitElement.source, |
| 4652 testUnitElement.context, | 4655 offset, |
| 4653 testUnit); | 4656 length, |
| 4657 testUnitElement.context, |
| 4658 new AstProviderForDriver(driver), |
| 4659 testUnit); |
| 4660 } else { |
| 4661 assistContext = new _DartAssistContextForValues( |
| 4662 testUnitElement.source, |
| 4663 offset, |
| 4664 length, |
| 4665 testUnitElement.context, |
| 4666 new AstProviderForContext(testUnitElement.context), |
| 4667 testUnit); |
| 4668 } |
| 4654 AssistProcessor processor = new AssistProcessor(assistContext); | 4669 AssistProcessor processor = new AssistProcessor(assistContext); |
| 4655 return await processor.compute(); | 4670 return await processor.compute(); |
| 4656 } | 4671 } |
| 4657 | 4672 |
| 4658 /** | 4673 /** |
| 4659 * Configures the [SourceFactory] to have the `flutter` package in | 4674 * Configures the [SourceFactory] to have the `flutter` package in |
| 4660 * `/packages/flutter/lib` folder. | 4675 * `/packages/flutter/lib` folder. |
| 4661 */ | 4676 */ |
| 4662 void _configureFlutterPkg(Map<String, String> pathToCode) { | 4677 void _configureFlutterPkg(Map<String, String> pathToCode) { |
| 4663 pathToCode.forEach((path, code) { | 4678 pathToCode.forEach((path, code) { |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4716 @override | 4731 @override |
| 4717 final int selectionOffset; | 4732 final int selectionOffset; |
| 4718 | 4733 |
| 4719 @override | 4734 @override |
| 4720 final int selectionLength; | 4735 final int selectionLength; |
| 4721 | 4736 |
| 4722 @override | 4737 @override |
| 4723 final AnalysisContext analysisContext; | 4738 final AnalysisContext analysisContext; |
| 4724 | 4739 |
| 4725 @override | 4740 @override |
| 4741 final AstProvider astProvider; |
| 4742 |
| 4743 @override |
| 4726 final CompilationUnit unit; | 4744 final CompilationUnit unit; |
| 4727 | 4745 |
| 4728 _DartAssistContextForValues(this.source, this.selectionOffset, | 4746 _DartAssistContextForValues(this.source, this.selectionOffset, |
| 4729 this.selectionLength, this.analysisContext, this.unit); | 4747 this.selectionLength, this.analysisContext, this.astProvider, this.unit); |
| 4730 } | 4748 } |
| OLD | NEW |