| Index: pkg/analysis_server/lib/src/context_manager.dart
|
| diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart
|
| index 147dd0d28b262f6d6a03a8752f800502a2856dc6..47293f77fc3495ed38ceb73bf80087051a42f55d 100644
|
| --- a/pkg/analysis_server/lib/src/context_manager.dart
|
| +++ b/pkg/analysis_server/lib/src/context_manager.dart
|
| @@ -16,7 +16,6 @@ import 'package:analyzer/instrumentation/instrumentation.dart';
|
| import 'package:analyzer/plugin/options.dart';
|
| import 'package:analyzer/plugin/resolver_provider.dart';
|
| import 'package:analyzer/source/analysis_options_provider.dart';
|
| -import 'package:analyzer/source/config.dart';
|
| import 'package:analyzer/source/package_map_provider.dart';
|
| import 'package:analyzer/source/package_map_resolver.dart';
|
| import 'package:analyzer/source/path_filter.dart';
|
| @@ -1104,17 +1103,6 @@ class ContextManagerImpl implements ContextManager {
|
| pubspec = child;
|
| }
|
| }
|
| - if (pubspec != null) {
|
| - File pubSource = resourceProvider.getFile(pubspec.path);
|
| - if (enableNewAnalysisDriver) {
|
| - // TODO(scheglov) implement for the new analysis driver
|
| - } else {
|
| - setConfiguration(
|
| - info.context,
|
| - new AnalysisConfiguration.fromPubspec(
|
| - pubSource, resourceProvider, disposition.packages));
|
| - }
|
| - }
|
|
|
| if (enableNewAnalysisDriver) {
|
| // TODO(scheglov) implement for the new analysis driver
|
| @@ -1272,18 +1260,6 @@ class ContextManagerImpl implements ContextManager {
|
| if (maps.length == 1) {
|
| embeddedOptions = maps.first;
|
| }
|
| -
|
| - AnalysisConfiguration configuration = getConfiguration(info.context);
|
| - if (configuration != null) {
|
| - Map configMap = configuration.options;
|
| - if (configMap != null) {
|
| - if (embeddedOptions != null) {
|
| - embeddedOptions = new Merger().merge(embeddedOptions, configMap);
|
| - } else {
|
| - embeddedOptions = configMap;
|
| - }
|
| - }
|
| - }
|
| return embeddedOptions;
|
| }
|
|
|
|
|