Skip to content

Commit 7256f4b

Browse files
committed
migrate to AnalysisContextCollection
1 parent 2df7406 commit 7256f4b

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

working/macros/dart_model/dart_model_analyzer_service/test/golden_test.dart

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
import 'dart:convert';
66
import 'dart:io';
77

8-
import 'package:analyzer/dart/analysis/context_builder.dart';
9-
import 'package:analyzer/dart/analysis/context_locator.dart';
8+
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
109
import 'package:dart_model/model.dart';
1110
import 'package:dart_model/query.dart';
1211
import 'package:dart_model/schemas.dart' as schemas;
@@ -28,11 +27,9 @@ void main() {
2827
.where((f) => f.path.endsWith('.dart'))
2928
.toList();
3029

31-
final contextBuilder = ContextBuilder();
32-
final contextRoot = ContextLocator()
33-
.locateRoots(includedPaths: [directory.absolute.path]).first;
34-
final analysisContext =
35-
contextBuilder.createContext(contextRoot: contextRoot);
30+
final contextCollection =
31+
AnalysisContextCollection(includedPaths: [directory.absolute.path]);
32+
final analysisContext = contextCollection.contextFor(directory.absolute.path);
3633
final service = DartModelAnalyzerService(context: analysisContext);
3734

3835
for (final file in dartFiles) {

working/macros/dart_model/dart_model_repl/lib/dart_model_repl.dart

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import 'dart:async';
66
import 'dart:convert';
77
import 'dart:io';
88

9-
import 'package:analyzer/dart/analysis/context_builder.dart';
10-
import 'package:analyzer/dart/analysis/context_locator.dart';
9+
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
1110
import 'package:async/async.dart';
1211
import 'package:dart_model/model.dart';
1312
import 'package:dart_model/query.dart';
@@ -93,10 +92,9 @@ watch <URI>[#name]
9392
}
9493

9594
void createHost(String workspace) {
96-
final contextBuilder = ContextBuilder();
97-
final analysisContext = contextBuilder.createContext(
98-
contextRoot:
99-
ContextLocator().locateRoots(includedPaths: [workspace]).first);
95+
final contextCollection =
96+
AnalysisContextCollection(includedPaths: [workspace]);
97+
final analysisContext = contextCollection.contextFor(workspace);
10098
final service = DartModelAnalyzerService(context: analysisContext);
10199
File? uriConverter(Uri uri) {
102100
final path = analysisContext.currentSession.uriConverter.uriToPath(uri);

0 commit comments

Comments
 (0)