Change FileResolver() constructor to named parameters.
Change-Id: I9040d4947ce431002ef9469244aa582e3dd2de2d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/246760
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Keerti Parthasarathy <keertip@google.com>
diff --git a/pkg/analysis_server/test/src/cider/cider_service.dart b/pkg/analysis_server/test/src/cider/cider_service.dart
index fbc50e9..35e01af 100644
--- a/pkg/analysis_server/test/src/cider/cider_service.dart
+++ b/pkg/analysis_server/test/src/cider/cider_service.dart
@@ -5,6 +5,7 @@
import 'dart:convert';
import 'package:analyzer/src/dart/analysis/performance_logger.dart';
+import 'package:analyzer/src/dart/micro/cider_byte_store.dart';
import 'package:analyzer/src/dart/micro/resolve_file.dart';
import 'package:analyzer/src/dart/sdk/sdk.dart';
import 'package:analyzer/src/test_utilities/mock_sdk.dart';
@@ -36,12 +37,13 @@
)!;
fileResolver = FileResolver(
- logger,
- resourceProvider,
- workspace.createSourceFactory(sdk, null),
- (String path) => _getDigest(path),
- null,
+ logger: logger,
+ resourceProvider: resourceProvider,
+ sourceFactory: workspace.createSourceFactory(sdk, null),
+ getFileDigest: (String path) => _getDigest(path),
+ prefetchFiles: null,
workspace: workspace,
+ byteStore: CiderCachedByteStore(20 * 1024 * 1024 /* 20 MB */),
);
fileResolver.testView = FileResolverTestView();
}
diff --git a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
index 198bb5b..3b94d9b 100644
--- a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
+++ b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
@@ -42,9 +42,6 @@
import 'package:meta/meta.dart';
import 'package:yaml/yaml.dart';
-const M = 1024 * 1024 /*1 MiB*/;
-const memoryCacheSize = 200 * M;
-
class CiderSearchInfo {
final CharacterLocation startPosition;
final int length;
@@ -129,24 +126,18 @@
@visibleForTesting
final Map<String, ResolvedLibraryResult> cachedResults = {};
- FileResolver(
- PerformanceLog logger,
- ResourceProvider resourceProvider,
- SourceFactory sourceFactory,
- String Function(String path) getFileDigest,
- void Function(List<String> paths)? prefetchFiles, {
- required Workspace workspace,
- bool Function(String path)? isGenerated,
- }) : this.from(
- logger: logger,
- resourceProvider: resourceProvider,
- sourceFactory: sourceFactory,
- getFileDigest: getFileDigest,
- prefetchFiles: prefetchFiles,
- workspace: workspace,
- isGenerated: isGenerated,
- );
+ FileResolver({
+ required this.logger,
+ required this.resourceProvider,
+ required this.sourceFactory,
+ required this.getFileDigest,
+ required this.prefetchFiles,
+ required this.workspace,
+ this.isGenerated,
+ required this.byteStore,
+ });
+ @Deprecated('Use the unnamed constructor instead')
FileResolver.from({
required this.logger,
required this.resourceProvider,
@@ -155,8 +146,8 @@
required this.prefetchFiles,
required this.workspace,
this.isGenerated,
- CiderByteStore? byteStore,
- }) : byteStore = byteStore ?? CiderCachedByteStore(memoryCacheSize);
+ required this.byteStore,
+ });
/// Update the resolver to reflect the fact that the file with the given
/// [path] was changed. We need to make sure that when this file, of any file
diff --git a/pkg/analyzer/test/src/dart/micro/file_resolution.dart b/pkg/analyzer/test/src/dart/micro/file_resolution.dart
index 51c7429..d9c67b6 100644
--- a/pkg/analyzer/test/src/dart/micro/file_resolution.dart
+++ b/pkg/analyzer/test/src/dart/micro/file_resolution.dart
@@ -50,7 +50,7 @@
)!;
byteStore.testView = CiderByteStoreTestView();
- fileResolver = FileResolver.from(
+ fileResolver = FileResolver(
logger: logger,
resourceProvider: resourceProvider,
byteStore: byteStore,
