rand dart fix

This commit is contained in:
2026-01-15 17:36:22 -08:00
parent dbbdafd893
commit 91e7e39fe8
131 changed files with 976 additions and 1365 deletions
@@ -18,7 +18,7 @@ abstract class NgDartCommand extends Command {
String readArg(String errorMessage) {
var args = argResults.rest;
if (args == null || args.length == 0) {
if (args.length == 0) {
// Usage is provided by command runner.
throw new UsageException(errorMessage, '');
}
@@ -12,9 +12,9 @@ class FileReader {
FileReader._();
String readAsString(String filePath, {Encoding encoding: utf8}) =>
String readAsString(String filePath, {Encoding encoding = utf8}) =>
new File(filePath).readAsStringSync(encoding: encoding);
List<String> readAsLines(String filePath, {Encoding encoding: utf8}) =>
List<String> readAsLines(String filePath, {Encoding encoding = utf8}) =>
new File(filePath).readAsLinesSync(encoding: encoding);
}
@@ -42,8 +42,6 @@ class PackageUriResolver {
/// Resolves a package URI to a file path.
String resolve(String packageUri) {
if (_packageMap == null) _buildPackageMap();
var packageName = getPackageName(packageUri);
if (_packageMap[packageName] == null) {
@@ -81,7 +81,7 @@ class _Selector {
return new _Selector('ByTagName', element.localName);
}
_Selector(this.type, this.name, [this.value]);
_Selector(this.type, this.name);
@override
String toString() => "@$type('${value ?? name}')";
@@ -99,9 +99,6 @@ class _Variable implements Comparable<_Variable> {
factory _Variable.fromElement(Element element) {
var selector = new _Selector.fromElement(element);
if (selector == null) {
return null;
}
var type = new DartClassInfo(
'PageLoaderElement', 'package:pageloader/objects.dart');
@@ -49,7 +49,7 @@ class ProjectModel {
this.componentClassUri, this.dartClasses, this.components, this.modules);
/// Whether providers are needed when generating test.
bool get needProviders => serviceClasses != null && serviceClasses.isNotEmpty;
bool get needProviders => serviceClasses.isNotEmpty;
/// Uris for service classes used.
List<String> get referencedUris => serviceClasses
@@ -84,10 +84,6 @@ class ProjectModel {
file, out, asts.publicUris, _getBindingVariables(components))));
var componentClassName = className;
if (componentClassName == null) {
componentClassName =
_getComponentClassName(componentClassUri, components);
}
var serviceClasses = _getServiceClasses(
componentClassName, dartClasses, components, modules);
@@ -125,8 +121,6 @@ Set<String> _getBindingVariables(Map<String, ComponentInfo> components) {
var result = new Set<String>();
for (var component in components.values) {
if (component.module == null) continue;
for (var binding in component.module.directChildren) {
if (binding is String) result.add(binding);
}
@@ -159,17 +153,14 @@ List<String> _getServiceClasses(
var dependencies = <String>[];
for (var parameter in dartClasses[componentClassName].constructorParameters) {
var service = parameter.dependency;
if (dartClasses[service].uri == null) continue;
dependencies.add(service);
}
var module = components[componentClassName].module;
if (module != null) {
for (var binding in module.getAllBindingInstances(modules)) {
if (dependencies.contains(binding.className)) {
dependencies.remove(binding.className);
}
for (var binding in module.getAllBindingInstances(modules)) {
if (dependencies.contains(binding.className)) {
dependencies.remove(binding.className);
}
}
@@ -56,7 +56,7 @@ void processBindingElement(Expression node, ModuleInfo module) {
throw new UnsupportedError('Unable to handle $node.');
}
if (binding != null) module.directChildren.add(binding);
module.directChildren.add(binding);
}
/// Extracts binding information from instance creation expression [node].
@@ -107,10 +107,8 @@ BindingInstance _buildBindingInstance(
binding = new BindingInstance(token.value, creationExpression);
}
if (binding != null) {
_handleBindingArgs(args, binding);
return binding;
}
_handleBindingArgs(args, binding);
return binding;
throw new UnsupportedError('Unable to handle $token '
'(${token.runtimeType}) in $creationExpression');
@@ -53,10 +53,8 @@ class ModuleInfo extends BindingInfo {
/// Expands binding information in this module.
List<BindingInstance> getAllBindingInstances(
Map<String, ModuleInfo> allModules) {
if (_allBindingInstances != null) {
return _allBindingInstances;
}
return _allBindingInstances;
_allBindingInstances = [];
for (var binding in directChildren) {
@@ -51,7 +51,7 @@ class DartClassVisitor extends RecursiveAstVisitor {
var classInfo = _getClass(className(classDeclaration));
// Only first appeared class is used to get more accurate matching.
if (classInfo.uri != null) return;
return;
classInfo.uri = _publicUris[_uri];
@@ -97,13 +97,13 @@ var _dotPackages = ['a:a/lib/', 'b:b/lib/'];
class FileReaderMock implements FileReader {
@override
List<String> readAsLines(String filePath, {Encoding encoding: utf8}) {
List<String> readAsLines(String filePath, {Encoding encoding = utf8}) {
if (filePath == '.packages') return _dotPackages;
return null;
}
@override
String readAsString(String filePath, {Encoding encoding: utf8}) {
String readAsString(String filePath, {Encoding encoding = utf8}) {
for (var file in _files) {
if (file['path'] == filePath) return file['content'];
}
@@ -101,7 +101,7 @@ var _pubSpec = ['name: hello_flutter'];
class FileReaderMock implements FileReader {
@override
List<String> readAsLines(String filePath, {Encoding encoding: utf8}) {
List<String> readAsLines(String filePath, {Encoding encoding = utf8}) {
if (filePath == '.packages') {
return _dotPackages;
} else if (filePath == 'pubspec.yaml') {
@@ -111,7 +111,7 @@ class FileReaderMock implements FileReader {
}
@override
String readAsString(String filePath, {Encoding encoding: utf8}) {
String readAsString(String filePath, {Encoding encoding = utf8}) {
for (var file in _files) {
if (file['path'] == filePath) return file['content'];
}
@@ -60,11 +60,11 @@ class FileReaderMock implements FileReader {
];
@override
List<String> readAsLines(Object uri, {Encoding encoding: utf8}) {
List<String> readAsLines(Object uri, {Encoding encoding = utf8}) {
if (uri is String && uri == '.packages') return _dotPackages;
return null;
}
@override
String readAsString(Object uri, {Encoding encoding: utf8}) => null;
String readAsString(Object uri, {Encoding encoding = utf8}) => null;
}
@@ -108,7 +108,7 @@ var _pubSpec = ['name: a'];
class FileReaderMock implements FileReader {
@override
List<String> readAsLines(String filePath, {Encoding encoding: utf8}) {
List<String> readAsLines(String filePath, {Encoding encoding = utf8}) {
if (filePath == '.packages') {
return _dotPackages;
} else if (filePath == 'pubspec.yaml') {
@@ -118,7 +118,7 @@ class FileReaderMock implements FileReader {
}
@override
String readAsString(String filePath, {Encoding encoding: utf8}) {
String readAsString(String filePath, {Encoding encoding = utf8}) {
for (var file in _files) {
if (file['path'] == filePath) return file['content'];
}