| Index: pkg/analysis_server/test/analysis_abstract.dart
|
| diff --git a/pkg/analysis_server/test/analysis_abstract.dart b/pkg/analysis_server/test/analysis_abstract.dart
|
| index 43afb7be6245315959942dd0a21df6aad5c7e63b..6fe24e6e6e3052e3ebe6ece6a92b816f6208953d 100644
|
| --- a/pkg/analysis_server/test/analysis_abstract.dart
|
| +++ b/pkg/analysis_server/test/analysis_abstract.dart
|
| @@ -6,7 +6,8 @@ library test.domain.analysis.abstract;
|
|
|
| import 'dart:async';
|
|
|
| -import 'package:analysis_server/plugin/protocol/protocol.dart';
|
| +import 'package:analysis_server/plugin/protocol/protocol.dart'
|
| + hide AnalysisOptions;
|
| import 'package:analysis_server/src/analysis_server.dart';
|
| import 'package:analysis_server/src/constants.dart';
|
| import 'package:analysis_server/src/domain_analysis.dart';
|
| @@ -17,6 +18,7 @@ import 'package:analysis_server/src/services/index/index.dart';
|
| import 'package:analyzer/file_system/file_system.dart';
|
| import 'package:analyzer/file_system/memory_file_system.dart';
|
| import 'package:analyzer/instrumentation/instrumentation.dart';
|
| +import 'package:analyzer/src/dart/analysis/driver.dart';
|
| import 'package:analyzer/src/generated/engine.dart';
|
| import 'package:analyzer/src/generated/sdk.dart';
|
| import 'package:linter/src/plugin/linter_plugin.dart';
|
| @@ -69,8 +71,14 @@ class AbstractAnalysisTest {
|
| AnalysisDomainHandler get analysisHandler => server.handlers
|
| .singleWhere((handler) => handler is AnalysisDomainHandler);
|
|
|
| + AnalysisOptions get analysisOptions => enableNewAnalysisDriver
|
| + ? testDiver.analysisOptions
|
| + : testContext.analysisOptions;
|
| +
|
| AnalysisContext get testContext => server.getAnalysisContext(testFile);
|
|
|
| + AnalysisDriver get testDiver => server.getAnalysisDriver(testFile);
|
| +
|
| void addAnalysisSubscription(AnalysisService service, String file) {
|
| // add file to subscription
|
| var files = analysisSubscriptions[service];
|
|
|