Minor cleanup found while working on the next change
Change-Id: Ibdc2552bf373b080507ef139480343561bc74891
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/158520
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/add_type_parameter_change.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/add_type_parameter_change.dart
index edc2312..c195e50 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/add_type_parameter_change.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/add_type_parameter_change.dart
@@ -41,8 +41,10 @@
void apply(DartFileEditBuilder builder, DataDrivenFix fix, _Data data) {
if (data is _TypeArgumentData) {
_applyToTypeArguments(builder, data);
+ } else if (data is _TypeParameterData) {
+ _applyToTypeParameters(builder, data);
} else {
- _applyToTypeParameters(builder, data as _TypeParameterData);
+ throw StateError('Unsupported class of data: ${data.runtimeType}');
}
}
@@ -165,7 +167,7 @@
/// The data returned when updating a type parameter list.
class _TypeParameterData extends _Data {
- /// The list of type parameters to which a new type paramete is being added,
+ /// The list of type parameters to which a new type parameter is being added,
/// or `null` if the first type parameter is being added.
final TypeParameterList typeParameters;
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/value_extractor.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/value_extractor.dart
index 704eae8..ad5243b 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/value_extractor.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/value_extractor.dart
@@ -6,14 +6,16 @@
import 'package:analysis_server/src/services/correction/util.dart';
import 'package:analyzer/dart/ast/ast.dart';
-/// A value extractor used to extract a specified argument of an invocation.
+/// A value extractor used to extract a specified argument from an invocation.
class ArgumentExtractor extends ValueExtractor {
- /// The parameter that defines the argument to be extracted.
+ /// The parameter corresponding to the argument from the original invocation,
+ /// or `null` if the value of the argument can't be taken from the original
+ /// invocation.
final ParameterReference parameter;
/// Initialize a newly created extractor to extract the argument that
/// corresponds to the given [parameter].
- ArgumentExtractor(this.parameter);
+ ArgumentExtractor(this.parameter) : assert(parameter != null);
@override
String from(AstNode node, CorrectionUtils utils) {
@@ -32,7 +34,7 @@
/// The code to be returned.
final String code;
- /// Initialize a newly created extractor to return the given [code].
+ /// Initialize a newly created extractor to return the given [code].
LiteralExtractor(this.code);
@override
