Drop the suffix "Change" from class names
I don't think it adds value, but if you disagree I'll add it to the class ModifyParameters for consistency. Change-Id: Ib823dd482d13a2ae9eb355298d3db813a3791fb4 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/159301 Reviewed-by: Phil Quitslund <pquitslund@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
committed by
commit-bot@chromium.org
parent
952e9b3eda
commit
11ba8cb2dd
+2
-2
@@ -11,7 +11,7 @@ import 'package:meta/meta.dart';
|
||||
|
||||
/// The data related to a type parameter that was added to either a function or
|
||||
/// a type.
|
||||
class AddTypeParameterChange extends Change<_Data> {
|
||||
class AddTypeParameter extends Change<_Data> {
|
||||
/// The index of the type parameter that was added.
|
||||
final int index;
|
||||
|
||||
@@ -28,7 +28,7 @@ class AddTypeParameterChange extends Change<_Data> {
|
||||
/// Initialize a newly created change to describe adding a type parameter to a
|
||||
/// type or a function.
|
||||
// TODO(brianwilkerson) Support adding multiple type parameters.
|
||||
AddTypeParameterChange(
|
||||
AddTypeParameter(
|
||||
{@required this.index,
|
||||
@required this.name,
|
||||
@required this.value,
|
||||
+2
-2
@@ -10,13 +10,13 @@ import 'package:analyzer_plugin/utilities/range_factory.dart';
|
||||
import 'package:meta/meta.dart';
|
||||
|
||||
/// The data related to an element that has been renamed.
|
||||
class RenameChange extends Change<SimpleIdentifier> {
|
||||
class Rename extends Change<SimpleIdentifier> {
|
||||
/// The new name of the element.
|
||||
final String newName;
|
||||
|
||||
/// Initialize a newly created transform to describe a renaming of an element
|
||||
/// to the [newName].
|
||||
RenameChange({@required this.newName});
|
||||
Rename({@required this.newName});
|
||||
|
||||
@override
|
||||
void apply(DartFileEditBuilder builder, DataDrivenFix fix,
|
||||
+8
-11
@@ -2,7 +2,7 @@
|
||||
// for details. All rights reserved. Use of this source code is governed by a
|
||||
// BSD-style license that can be found in the LICENSE file.
|
||||
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/add_type_parameter_change.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/add_type_parameter.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/element_descriptor.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/transform.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/value_extractor.dart';
|
||||
@@ -12,16 +12,14 @@ import 'data_driven_test_support.dart';
|
||||
|
||||
void main() {
|
||||
defineReflectiveSuite(() {
|
||||
defineReflectiveTests(AddTypeParameterChange_DeprecatedMemberUseTest);
|
||||
defineReflectiveTests(AddTypeParameterChange_InvalidOverrideTest);
|
||||
defineReflectiveTests(
|
||||
AddTypeParameterChange_WrongNumberOfTypeArgumentsTest);
|
||||
defineReflectiveTests(AddTypeParameter_DeprecatedMemberUseTest);
|
||||
defineReflectiveTests(AddTypeParameter_InvalidOverrideTest);
|
||||
defineReflectiveTests(AddTypeParameter_WrongNumberOfTypeArgumentsTest);
|
||||
});
|
||||
}
|
||||
|
||||
@reflectiveTest
|
||||
class AddTypeParameterChange_DeprecatedMemberUseTest
|
||||
extends _AddTypeParameterChange {
|
||||
class AddTypeParameter_DeprecatedMemberUseTest extends _AddTypeParameterChange {
|
||||
Future<void> test_method_first() async {
|
||||
setPackageContent('''
|
||||
class C {
|
||||
@@ -120,8 +118,7 @@ void f(C c) {
|
||||
}
|
||||
|
||||
@reflectiveTest
|
||||
class AddTypeParameterChange_InvalidOverrideTest
|
||||
extends _AddTypeParameterChange {
|
||||
class AddTypeParameter_InvalidOverrideTest extends _AddTypeParameterChange {
|
||||
Future<void> test_method_bound() async {
|
||||
setPackageContent('''
|
||||
class C {
|
||||
@@ -174,7 +171,7 @@ class D extends C {
|
||||
}
|
||||
|
||||
@reflectiveTest
|
||||
class AddTypeParameterChange_WrongNumberOfTypeArgumentsTest
|
||||
class AddTypeParameter_WrongNumberOfTypeArgumentsTest
|
||||
extends _AddTypeParameterChange {
|
||||
Future<void> test_class() async {
|
||||
setPackageContent('''
|
||||
@@ -271,7 +268,7 @@ abstract class _AddTypeParameterChange extends DataDrivenFixProcessorTest {
|
||||
element: ElementDescriptor(
|
||||
libraryUris: [importUri], components: components ?? ['C', 'm']),
|
||||
changes: [
|
||||
AddTypeParameterChange(
|
||||
AddTypeParameter(
|
||||
extendedType: extendedType,
|
||||
index: index,
|
||||
name: 'T',
|
||||
+2
-2
@@ -5,7 +5,7 @@
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/element_descriptor.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/modify_parameters.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/parameter_reference.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/rename_change.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/rename.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/transform.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/value_extractor.dart';
|
||||
import 'package:test_reflective_loader/test_reflective_loader.dart';
|
||||
@@ -844,6 +844,6 @@ abstract class _ModifyParameters extends DataDrivenFixProcessorTest {
|
||||
libraryUris: [importUri], components: originalComponents),
|
||||
changes: [
|
||||
ModifyParameters(modifications: modifications),
|
||||
if (newName != null) RenameChange(newName: newName),
|
||||
if (newName != null) Rename(newName: newName),
|
||||
]);
|
||||
}
|
||||
|
||||
+4
-4
@@ -3,7 +3,7 @@
|
||||
// BSD-style license that can be found in the LICENSE file.
|
||||
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/element_descriptor.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/rename_change.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/rename.dart';
|
||||
import 'package:analysis_server/src/services/correction/fix/data_driven/transform.dart';
|
||||
import 'package:test_reflective_loader/test_reflective_loader.dart';
|
||||
|
||||
@@ -11,12 +11,12 @@ import 'data_driven_test_support.dart';
|
||||
|
||||
void main() {
|
||||
defineReflectiveSuite(() {
|
||||
defineReflectiveTests(RenameChange_DeprecatedMemberUseTest);
|
||||
defineReflectiveTests(Rename_DeprecatedMemberUseTest);
|
||||
});
|
||||
}
|
||||
|
||||
@reflectiveTest
|
||||
class RenameChange_DeprecatedMemberUseTest extends DataDrivenFixProcessorTest {
|
||||
class Rename_DeprecatedMemberUseTest extends DataDrivenFixProcessorTest {
|
||||
Future<void> test_class() async {
|
||||
addMetaPackage();
|
||||
setPackageContent('''
|
||||
@@ -240,6 +240,6 @@ void f() {
|
||||
element: ElementDescriptor(
|
||||
libraryUris: [importUri], components: components),
|
||||
changes: [
|
||||
RenameChange(newName: newName),
|
||||
Rename(newName: newName),
|
||||
]);
|
||||
}
|
||||
@@ -4,9 +4,9 @@
|
||||
|
||||
import 'package:test_reflective_loader/test_reflective_loader.dart';
|
||||
|
||||
import 'add_type_parameter_change_test.dart' as add_type_parameter_change;
|
||||
import 'add_type_parameter_test.dart' as add_type_parameter_change;
|
||||
import 'modify_parameters_test.dart' as modify_parameters;
|
||||
import 'rename_change_test.dart' as rename_change;
|
||||
import 'rename_test.dart' as rename_change;
|
||||
|
||||
void main() {
|
||||
defineReflectiveSuite(() {
|
||||
|
||||
Reference in New Issue
Block a user