Skip to content

Commit f111a2d

Browse files
pqCommit Bot
authored and
Commit Bot
committed
Revert "[data driven] support moving symbols across packages"
This reverts commit 3290d7a. Reason for revert: flutter engine breakage (flutter/flutter#105641) Original change's description: > [data driven] support moving symbols across packages > > See: #48997 > > Change-Id: Iad16b9eae0523bc4bc14537af642b05efa75b6f7 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/246663 > Commit-Queue: Phil Quitslund <[email protected]> > Reviewed-by: Brian Wilkerson <[email protected]> # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: I4a83d50497d6208b7f518ca1b381ece3aab192ad Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/247606 Reviewed-by: Siva Annamalai <[email protected]> Reviewed-by: Keerti Parthasarathy <[email protected]> Commit-Queue: Phil Quitslund <[email protected]> Reviewed-by: Phil Quitslund <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 3fd96e2 commit f111a2d

File tree

6 files changed

+0
-211
lines changed

6 files changed

+0
-211
lines changed

pkg/analysis_server/lib/src/services/correction/fix/data_driven/replaced_by.dart

-5
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ class ReplacedBy extends Change<_Data> {
2727
void apply(DartFileEditBuilder builder, DataDrivenFix fix, _Data data) {
2828
var referenceRange = data.referenceRange;
2929
builder.addSimpleReplacement(referenceRange, _referenceTo(newElement));
30-
var libraryUris = newElement.libraryUris;
31-
if (libraryUris.isEmpty) return;
32-
if (!libraryUris.any((uri) => builder.importsLibrary(uri))) {
33-
builder.importLibraryElement(libraryUris.first);
34-
}
3530
}
3631

3732
@override

pkg/analysis_server/test/src/services/correction/fix/data_driven/replaced_by_test.dart

-78
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import 'data_driven_test_support.dart';
1414
void main() {
1515
defineReflectiveSuite(() {
1616
defineReflectiveTests(ReplacedByTest);
17-
defineReflectiveTests(ReplacedByUriSemanticsTest);
1817
});
1918
}
2019

@@ -863,83 +862,6 @@ var x = $prefixReference${newElement.reference}$invocation;
863862
}
864863
}
865864

866-
@reflectiveTest
867-
class ReplacedByUriSemanticsTest extends DataDrivenFixProcessorTest {
868-
Future<void> test_new_element_uris_multiple() async {
869-
setPackageContent('');
870-
newFile('$workspaceRootPath/p/lib/expect.dart', '''
871-
void expect(actual, expected) {}
872-
''');
873-
newFile('$workspaceRootPath/p/lib/export.dart', '''
874-
export 'expect.dart';
875-
''');
876-
addPackageDataFile('''
877-
version: 1
878-
transforms:
879-
- title: 'Replace expect'
880-
date: 2022-05-12
881-
bulkApply: false
882-
element:
883-
uris: ['$importUri']
884-
function: 'expect'
885-
changes:
886-
- kind: 'replacedBy'
887-
newElement:
888-
uris: ['package:p/expect.dart', 'package:p/export.dart']
889-
function: 'expect'
890-
''');
891-
await resolveTestCode('''
892-
import '$importUri';
893-
894-
f() {
895-
expect(true, true);
896-
}
897-
''');
898-
await assertHasFix('''
899-
import 'package:p/expect.dart';
900-
import '$importUri';
901-
902-
f() {
903-
expect(true, true);
904-
}
905-
''', errorFilter: ignoreUnusedImport);
906-
}
907-
908-
Future<void> test_new_element_uris_single() async {
909-
setPackageContent('');
910-
addPackageDataFile('''
911-
version: 1
912-
transforms:
913-
- title: 'Replace expect'
914-
date: 2022-05-12
915-
bulkApply: false
916-
element:
917-
uris: ['$importUri']
918-
function: 'expect'
919-
changes:
920-
- kind: 'replacedBy'
921-
newElement:
922-
uris: ['package:matcher/expect.dart']
923-
function: 'expect'
924-
''');
925-
await resolveTestCode('''
926-
import '$importUri';
927-
928-
main() {
929-
expect(true, true);
930-
}
931-
''');
932-
await assertHasFix('''
933-
import 'package:matcher/expect.dart';
934-
import '$importUri';
935-
936-
main() {
937-
expect(true, true);
938-
}
939-
''', errorFilter: ignoreUnusedImport);
940-
}
941-
}
942-
943865
class _Element {
944866
final ElementKind kind;
945867
final List<String> components;

pkg/analysis_server/test/src/services/correction/fix/data_driven/test_all.dart

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import 'rename_parameter_test.dart' as rename_parameter;
1717
import 'rename_test.dart' as rename;
1818
import 'replaced_by_test.dart' as replaced_by;
1919
import 'sdk_fix_test.dart' as sdk_fix;
20-
import 'test_use_case_test.dart' as test_use_case;
2120
import 'transform_override_set_parser_test.dart'
2221
as transform_override_set_parser;
2322
import 'transform_set_manager_test.dart' as transform_set_manager;
@@ -38,7 +37,6 @@ void main() {
3837
rename.main();
3938
replaced_by.main();
4039
sdk_fix.main();
41-
test_use_case.main();
4240
transform_override_set_parser.main();
4341
transform_set_manager.main();
4442
transform_set_parser.main();

pkg/analysis_server/test/src/services/correction/fix/data_driven/test_use_case_test.dart

-102
This file was deleted.

pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart

-20
Original file line numberDiff line numberDiff line change
@@ -1483,26 +1483,6 @@ class DartFileEditBuilderImpl extends FileEditBuilderImpl
14831483
return _importLibrary(uri, prefix: prefix, forceRelative: true).uriText;
14841484
}
14851485

1486-
@override
1487-
bool importsLibrary(Uri uri) {
1488-
// Self-reference.
1489-
if (resolvedUnit.libraryElement.source.uri == uri) return false;
1490-
1491-
// Existing import.
1492-
for (var import in resolvedUnit.libraryElement.imports) {
1493-
var importedLibrary = import.importedLibrary;
1494-
if (importedLibrary != null && importedLibrary.source.uri == uri) {
1495-
return true;
1496-
}
1497-
}
1498-
1499-
// Queued change.
1500-
var importChange = (libraryChangeBuilder ?? this).librariesToImport[uri];
1501-
if (importChange != null) return true;
1502-
1503-
return false;
1504-
}
1505-
15061486
@override
15071487
void replaceTypeWithFuture(
15081488
TypeAnnotation? typeAnnotation, TypeProvider typeProvider) {

pkg/analyzer_plugin/lib/utilities/change_builder/change_builder_dart.dart

-4
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,6 @@ abstract class DartFileEditBuilder implements FileEditBuilder {
359359
/// If there is no existing import, a new import is added.
360360
ImportLibraryElementResult importLibraryElement(Uri uri);
361361

362-
/// Return `true` if the given library [uri] is already imported or will be
363-
/// imported by a scheduled edit.
364-
bool importsLibrary(Uri uri);
365-
366362
/// Optionally create an edit to replace the given [typeAnnotation] with the
367363
/// type `Future` (with the given type annotation as the type argument). The
368364
/// [typeProvider] is used to check the current type, because if it is already

0 commit comments

Comments
 (0)