Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/reflectable/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 5.2.0

- Upgrade reflectable to use analyzer ^10.0.0 and lints ^6.0.0.

## 5.1.0

- Upgrade reflectable to use version ^8.0.0 of the analyzer and version
Expand Down
4 changes: 2 additions & 2 deletions packages/reflectable/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: reflectable
version: 5.1.0
version: 5.2.0
description: >
Reflection support based on code generation, using 'capabilities' to
specify which operations to support, on which objects. This is the
Expand All @@ -10,4 +10,4 @@ environment:
resolution: workspace
dependencies:
dev_dependencies:
lints: ^5.0.0
lints: ^6.0.0
5 changes: 5 additions & 0 deletions packages/reflectable_builder/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 1.2.0

- Upgrade the code generator to use analyzer ^10.0.0 and lints 6.0.0.
Remove dependencies on discontinued packages.

## 1.1.0

- Upgrade the reflectable code generator to use version ^8.0.0 of the
Expand Down
23 changes: 14 additions & 9 deletions packages/reflectable_builder/lib/src/builder_implementation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/constant/value.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/element2.dart';
import 'package:analyzer/dart/element/nullability_suffix.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/dart/element/type_system.dart';
import 'package:analyzer/error/error.dart';
import 'package:analyzer/diagnostic/diagnostic.dart';
import 'package:analyzer/error/listener.dart';
import 'package:analyzer/source/line_info.dart';
import 'package:analyzer/source/source.dart';
Expand Down Expand Up @@ -2474,7 +2473,7 @@ class _ReflectorDomain {
/// [importCollector] is used to find the library prefixes needed in order
/// to obtain values from other libraries.
String _dynamicTypeCodeOfClass(
TypeDefiningElement typeDefiningElement,
Element typeDefiningElement,
_ImportCollector importCollector,
) {
DartType? type = typeDefiningElement is InterfaceElement
Expand Down Expand Up @@ -6412,7 +6411,7 @@ Future<DartObject?> _evaluateConstant(
Source source = unitElement.source;
var libraryElement = unitElement.element as LibraryElementImpl;

var errorListener = RecorderingErrorListener();
var errorListener = RecordingDiagnosticListener();
var errorReporter = ErrorReporter(errorListener, source);
var declaredVariables = DeclaredVariables(); // No variables.

Expand Down Expand Up @@ -6440,12 +6439,18 @@ Future<DartObject?> _evaluateConstant(
Constant constant = visitor.evaluateAndReportInvalidConstant(expression);
DartObjectImpl? dartObject = constant is DartObjectImpl ? constant : null;

if (errorListener.errors.isNotEmpty) {
var message = StringBuffer('Constant `$expression` has errors:\n');
for (AnalysisError error in errorListener.errors) {
message.writeln(error);
if (errorListener.diagnostics.isNotEmpty) {
bool hasErrors = false;
final message = StringBuffer('Constant `$expression` has errors:\n');
for (final diagnostic in errorListener.diagnostics) {
if (diagnostic.severity == Severity.error) {
hasErrors = true;
message.writeln(diagnostic);
}
}
if (hasErrors) {
_severe(message.toString());
}
_severe(message.toString());
}

return dartObject;
Expand Down
14 changes: 6 additions & 8 deletions packages/reflectable_builder/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: reflectable_builder
version: 1.1.0
version: 1.2.0
description: >
Reflection support based on code generation, using 'capabilities' to
specify which operations to support, on which objects. This is the
Expand All @@ -9,19 +9,17 @@ environment:
sdk: ^3.9.0
resolution: workspace
dependencies:
analyzer: ^8.0.0
analyzer: ^10.0.0
build: ^4.0.0
dart_style: ^3.0.0
pub_semver: ^2.2.0
path: ^1.9.0
reflectable: '>=5.1.0 <5.2.0'
reflectable: '>=5.2.0 <5.3.0'
dev_dependencies:
build_config: ^1.1.0
build_resolvers: ^3.0.4
build_runner: ^2.4.0
build_runner_core: ^9.3.2
build_config: ^1.2.0
build_runner: ^2.10.0
glob: ^2.1.0
lints: ^5.0.0
lints: ^6.0.0
logging: ^1.2.0
package_config: ^2.1.0
source_span: ^1.10.0
Expand Down
67 changes: 0 additions & 67 deletions packages/test_reflectable/test/exported_main_lib.dart

This file was deleted.

10 changes: 0 additions & 10 deletions packages/test_reflectable/test/exported_main_test.dart

This file was deleted.