44
55import 'dart:convert' show json;
66
7+ import 'package:analyzer/dart/analysis/analysis_context.dart' ;
78import 'package:analyzer/dart/analysis/results.dart' ;
89import 'package:analyzer/diagnostic/diagnostic.dart' ;
910import 'package:analyzer/error/error.dart' ;
@@ -12,7 +13,6 @@ import 'package:analyzer/file_system/file_system.dart';
1213import 'package:analyzer/source/file_source.dart' ;
1314import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart' ;
1415import 'package:analyzer/src/dart/analysis/byte_store.dart' ;
15- import 'package:analyzer/src/dart/analysis/driver_based_analysis_context.dart' ;
1616import 'package:analyzer/src/dart/analysis/experiments.dart' ;
1717import 'package:analyzer/src/error/codes.dart' ;
1818import 'package:analyzer/src/lint/pub.dart' ;
@@ -526,27 +526,17 @@ class PubPackageResolutionTest with MockPackagesMixin, ResourceProviderMixin {
526526 }
527527 }
528528
529- DriverBasedAnalysisContext _contextFor (String path) {
530- _createAnalysisContexts ();
531-
532- var convertedPath = convertPath (path);
533- return _analysisContextCollection! .contextFor (convertedPath);
534- }
535-
536- /// Creates all analysis contexts in [_collectionIncludedPaths] .
537- void _createAnalysisContexts () {
538- if (_analysisContextCollection != null ) {
539- return ;
540- }
541-
542- _analysisContextCollection = AnalysisContextCollectionImpl (
529+ AnalysisContext _contextFor (String path) {
530+ _analysisContextCollection ?? = AnalysisContextCollectionImpl (
543531 byteStore: _byteStore,
544532 declaredVariables: {},
545533 enableIndex: true ,
546534 includedPaths: _collectionIncludedPaths.map (convertPath).toList (),
547535 resourceProvider: resourceProvider,
548536 sdkPath: _sdkRoot.path,
549537 );
538+
539+ return _analysisContextCollection! .contextFor (convertPath (path));
550540 }
551541
552542 /// Resolves the file with the [path] into [result] .
0 commit comments