| 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/src/plugin/server_plugin.dart'; | 9 import 'package:analysis_server/src/plugin/server_plugin.dart'; |
| 10 import 'package:analysis_server/src/services/correction/assist.dart'; | 10 import 'package:analysis_server/src/services/correction/assist.dart'; |
| 11 import 'package:analysis_server/src/services/correction/assist_internal.dart'; | 11 import 'package:analysis_server/src/services/correction/assist_internal.dart'; |
| 12 import 'package:analyzer/dart/ast/ast.dart'; | 12 import 'package:analyzer/dart/ast/ast.dart'; |
| 13 import 'package:analyzer/dart/ast/standard_resolution_map.dart'; | 13 import 'package:analyzer/dart/ast/standard_resolution_map.dart'; |
| 14 import 'package:analyzer/dart/element/element.dart'; | 14 import 'package:analyzer/dart/element/element.dart'; |
| 15 import 'package:analyzer/file_system/file_system.dart'; | 15 import 'package:analyzer/file_system/file_system.dart'; |
| 16 import 'package:analyzer/source/package_map_resolver.dart'; | 16 import 'package:analyzer/source/package_map_resolver.dart'; |
| 17 import 'package:analyzer/src/dart/analysis/ast_provider_context.dart'; | |
| 18 import 'package:analyzer/src/dart/analysis/ast_provider_driver.dart'; | 17 import 'package:analyzer/src/dart/analysis/ast_provider_driver.dart'; |
| 18 import 'package:analyzer/src/dart/analysis/driver.dart'; |
| 19 import 'package:analyzer/src/dart/element/ast_provider.dart'; | 19 import 'package:analyzer/src/dart/element/ast_provider.dart'; |
| 20 import 'package:analyzer/src/generated/engine.dart'; | 20 import 'package:analyzer/src/generated/engine.dart'; |
| 21 import 'package:analyzer/src/generated/source.dart'; | 21 import 'package:analyzer/src/generated/source.dart'; |
| 22 import 'package:analyzer_plugin/protocol/protocol_common.dart'; | 22 import 'package:analyzer_plugin/protocol/protocol_common.dart'; |
| 23 import 'package:plugin/manager.dart'; | 23 import 'package:plugin/manager.dart'; |
| 24 import 'package:plugin/plugin.dart'; | 24 import 'package:plugin/plugin.dart'; |
| 25 import 'package:test/test.dart'; | 25 import 'package:test/test.dart'; |
| 26 import 'package:test_reflective_loader/test_reflective_loader.dart'; | 26 import 'package:test_reflective_loader/test_reflective_loader.dart'; |
| 27 | 27 |
| 28 import '../../abstract_single_unit.dart'; | 28 import '../../abstract_single_unit.dart'; |
| (...skipping 4661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4690 expect(group.positions, unorderedEquals(expectedPositions)); | 4690 expect(group.positions, unorderedEquals(expectedPositions)); |
| 4691 if (expectedSuggestions != null) { | 4691 if (expectedSuggestions != null) { |
| 4692 expect(group.suggestions, unorderedEquals(expectedSuggestions)); | 4692 expect(group.suggestions, unorderedEquals(expectedSuggestions)); |
| 4693 } | 4693 } |
| 4694 } | 4694 } |
| 4695 | 4695 |
| 4696 Future<List<Assist>> _computeAssists() async { | 4696 Future<List<Assist>> _computeAssists() async { |
| 4697 CompilationUnitElement testUnitElement = | 4697 CompilationUnitElement testUnitElement = |
| 4698 resolutionMap.elementDeclaredByCompilationUnit(testUnit); | 4698 resolutionMap.elementDeclaredByCompilationUnit(testUnit); |
| 4699 DartAssistContext assistContext; | 4699 DartAssistContext assistContext; |
| 4700 if (enableNewAnalysisDriver) { | 4700 assistContext = new _DartAssistContextForValues(testUnitElement.source, |
| 4701 assistContext = new _DartAssistContextForValues( | 4701 offset, length, driver, new AstProviderForDriver(driver), testUnit); |
| 4702 testUnitElement.source, | |
| 4703 offset, | |
| 4704 length, | |
| 4705 testUnitElement.context, | |
| 4706 new AstProviderForDriver(driver), | |
| 4707 testUnit); | |
| 4708 } else { | |
| 4709 assistContext = new _DartAssistContextForValues( | |
| 4710 testUnitElement.source, | |
| 4711 offset, | |
| 4712 length, | |
| 4713 testUnitElement.context, | |
| 4714 new AstProviderForContext(testUnitElement.context), | |
| 4715 testUnit); | |
| 4716 } | |
| 4717 AssistProcessor processor = new AssistProcessor(assistContext); | 4702 AssistProcessor processor = new AssistProcessor(assistContext); |
| 4718 return await processor.compute(); | 4703 return await processor.compute(); |
| 4719 } | 4704 } |
| 4720 | 4705 |
| 4721 /** | 4706 /** |
| 4722 * Configures the [SourceFactory] to have the `flutter` package in | 4707 * Configures the [SourceFactory] to have the `flutter` package in |
| 4723 * `/packages/flutter/lib` folder. | 4708 * `/packages/flutter/lib` folder. |
| 4724 */ | 4709 */ |
| 4725 void _configureFlutterPkg(Map<String, String> pathToCode) { | 4710 void _configureFlutterPkg(Map<String, String> pathToCode) { |
| 4726 pathToCode.forEach((path, code) { | 4711 pathToCode.forEach((path, code) { |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4770 @override | 4755 @override |
| 4771 final Source source; | 4756 final Source source; |
| 4772 | 4757 |
| 4773 @override | 4758 @override |
| 4774 final int selectionOffset; | 4759 final int selectionOffset; |
| 4775 | 4760 |
| 4776 @override | 4761 @override |
| 4777 final int selectionLength; | 4762 final int selectionLength; |
| 4778 | 4763 |
| 4779 @override | 4764 @override |
| 4780 final AnalysisContext analysisContext; | 4765 final AnalysisDriver analysisDriver; |
| 4781 | 4766 |
| 4782 @override | 4767 @override |
| 4783 final AstProvider astProvider; | 4768 final AstProvider astProvider; |
| 4784 | 4769 |
| 4785 @override | 4770 @override |
| 4786 final CompilationUnit unit; | 4771 final CompilationUnit unit; |
| 4787 | 4772 |
| 4788 _DartAssistContextForValues(this.source, this.selectionOffset, | 4773 _DartAssistContextForValues(this.source, this.selectionOffset, |
| 4789 this.selectionLength, this.analysisContext, this.astProvider, this.unit); | 4774 this.selectionLength, this.analysisDriver, this.astProvider, this.unit); |
| 4790 } | 4775 } |
| OLD | NEW |