Elements. Use identical() to compare ElementImpl(s).

scheglov · Commit Queue · commit 6494efb192fb · 2024-12-18T14:25:00.000-08:00
Change-Id: Idbe935bc6ae333d9940d8ea53ad44011eff237ab Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/401384 Commit-Queue: Konstantin Shcheglov <scheglov@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analysis_server/test/abstract_context.dart b/pkg/analysis_server/test/abstract_context.dart
@@ -188,6 +188,10 @@ class AbstractContextTest
     return result as ResolvedUnitResult;
   }
 
+  void makeFilePriority(File file) {
+    driverFor(file).priorityFiles2 = [file];
+  }
+
   @override
   File newFile(String path, String content) {
     if (_analysisContextCollection != null && !path.endsWith('.dart')) {
diff --git a/pkg/analysis_server/test/analysis_server_base.dart b/pkg/analysis_server/test/analysis_server_base.dart
@@ -152,6 +152,14 @@ abstract class ContextResolutionTest with ResourceProviderMixin {
     );
   }
 
+  Future<void> setPriorityFiles2(List<File> files) async {
+    await handleSuccessfulRequest(
+      AnalysisSetPriorityFilesParams(
+        files.map((e) => e.path).toList(),
+      ).toRequest('0', clientUriConverter: server.uriConverter),
+    );
+  }
+
   Future<void> setRoots({
     required List<String> included,
     required List<String> excluded,
diff --git a/pkg/analysis_server/test/edit/refactoring_test.dart b/pkg/analysis_server/test/edit/refactoring_test.dart
@@ -1232,6 +1232,7 @@ void f() {
 }
 ''');
     // Start refactoring.
+    await setPriorityFiles2([testFile]);
     var result = await getRefactoringResult(() {
       return _sendInlineRequest('res =');
     });
@@ -1241,6 +1242,7 @@ void f() {
   }
 
   Future<void> test_feedback() {
+    setPriorityFiles([testFile]);
     addTestFile('''
 void f() {
   int test = 42;
@@ -1272,6 +1274,7 @@ void f() {
   }
 
   Future<void> test_OK() {
+    setPriorityFiles([testFile]);
     addTestFile('''
 void f() {
   int test = 42;
@@ -2547,6 +2550,7 @@ void f() {
   }
 
   Future<void> test_feedback() {
+    setPriorityFiles([testFile]);
     addTestFile('''
 class Test {}
 void f() {
@@ -2770,6 +2774,7 @@ part of my.new_name;
   }
 
   Future<void> test_localVariable() {
+    setPriorityFiles([testFile]);
     addTestFile('''
 void f() {
   int test = 0;
@@ -2881,6 +2886,7 @@ void f(Object? x) {
   }
 
   Future<void> test_patternVariable_patternAssignment() {
+    setPriorityFiles([testFile]);
     addTestFile('''
 void f(Object? x) {
   int test;
diff --git a/pkg/analysis_server/test/lsp/code_actions_abstract.dart b/pkg/analysis_server/test/lsp/code_actions_abstract.dart
@@ -183,6 +183,7 @@ abstract class AbstractCodeActionsTest extends AbstractLspAnalysisServerTest {
     String? command,
     String? title,
     ProgressToken? commandWorkDoneToken,
+    bool openTargetFile = false,
   }) async {
     filePath ??= mainFilePath;
 
@@ -200,6 +201,7 @@ $expected''';
       kind: kind,
       command: command,
       title: title,
+      openTargetFile: openTargetFile,
     );
 
     // Verify the edits either by executing the command we expected, or
diff --git a/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart b/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart
@@ -882,6 +882,7 @@ class NewWidget extends StatelessWidget {
       expectedContent,
       command: Commands.performRefactor,
       title: extractWidgetTitle,
+      openTargetFile: true,
     );
   }
 
@@ -927,6 +928,7 @@ void f() {
       expectedContent,
       command: Commands.performRefactor,
       title: inlineVariableTitle,
+      openTargetFile: true,
     );
   }
 }
diff --git a/pkg/analysis_server/test/search/element_references_test.dart b/pkg/analysis_server/test/search/element_references_test.dart
@@ -882,6 +882,7 @@ void f(A a, B b, C c) {
   }
 
   Future<void> test_label() async {
+    await setPriorityFiles2([testFile]);
     addTestFile('''
 void f() {
 myLabel:
@@ -901,6 +902,7 @@ myLabel:
   }
 
   Future<void> test_localVariable() async {
+    await setPriorityFiles2([testFile]);
     addTestFile('''
 void f() {
   var vvv = 1;
@@ -1300,6 +1302,7 @@ void f(({int foo}) x, num ^a) {
   }
 
   Future<void> test_pattern_relational_variable() async {
+    await setPriorityFiles2([testFile]);
     await assertReferences(
       kind: ElementKind.LOCAL_VARIABLE,
       resultKinds: {0: SearchResultKind.READ},
@@ -1562,6 +1565,7 @@ class A<T> {
   }
 
   Future<void> test_variable_forEachElement_block() async {
+    await setPriorityFiles2([testFile]);
     addTestFile('''
 void f(List<int> values) {
   {
@@ -1575,6 +1579,7 @@ void f(List<int> values) {
   }
 
   Future<void> test_variable_forEachElement_expressionBody() async {
+    await setPriorityFiles2([testFile]);
     addTestFile('''
 Object f() => [for (final value in []) value * 2];
 ''');
@@ -1584,6 +1589,7 @@ Object f() => [for (final value in []) value * 2];
   }
 
   Future<void> test_variable_forEachElement_functionBody() async {
+    await setPriorityFiles2([testFile]);
     addTestFile('''
 void f(List<int> values) {
   [for (final value in values) value * 2];
@@ -1595,6 +1601,7 @@ void f(List<int> values) {
   }
 
   Future<void> test_variable_forEachElement_topLevelVariable() async {
+    await setPriorityFiles2([testFile]);
     addTestFile('''
 final a = [for (final value in []) value * 2];
 ''');
diff --git a/pkg/analysis_server/test/services/refactoring/legacy/abstract_refactoring.dart b/pkg/analysis_server/test/services/refactoring/legacy/abstract_refactoring.dart
@@ -145,6 +145,11 @@ abstract class RefactoringTest extends AbstractSingleUnitTest {
   }
 
   Future<void> indexTestUnit(String code) async {
+    // Make it priority, so the resolved unit stays in memory.
+    // So, when we get a local element, and search for it, we use this unit.
+    // This is important when local elements equality is identity.
+    makeFilePriority(testFile);
+
     await resolveTestCode(code);
   }
 
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -3074,12 +3074,7 @@ abstract class ElementImpl implements Element, Element2 {
 
   @override
   bool operator ==(Object other) {
-    if (identical(this, other)) {
-      return true;
-    }
-    return other is ElementImpl &&
-        other.kind == kind &&
-        other.location == location;
+    return identical(this, other);
   }
 
   @override
diff --git a/pkg/analyzer/test/src/dart/analysis/search_test.dart b/pkg/analyzer/test/src/dart/analysis/search_test.dart
@@ -1487,6 +1487,7 @@ main() {
   }
 
   test_searchReferences_FunctionElement_local() async {
+    makeFilePriority(testFile);
     await resolveTestCode('''
 main() {
   test() {}
@@ -1602,6 +1603,7 @@ main() {
   }
 
   test_searchReferences_LabelElement() async {
+    makeFilePriority(testFile);
     await resolveTestCode('''
 main() {
 label:
@@ -1693,6 +1695,7 @@ part 'unitB.dart';
   }
 
   test_searchReferences_LocalVariableElement() async {
+    makeFilePriority(testFile);
     await resolveTestCode(r'''
 main() {
   var v;
@@ -1713,6 +1716,7 @@ main() {
   }
 
   test_searchReferences_LocalVariableElement_inForEachElement_expressionBody() async {
+    makeFilePriority(testFile);
     await resolveTestCode('''
 Object f() => [
   for (var v in []) v,
@@ -1726,6 +1730,7 @@ Object f() => [
   }
 
   test_searchReferences_LocalVariableElement_inForEachElement_inBlock() async {
+    makeFilePriority(testFile);
     await resolveTestCode('''
 Object f() {
   {
@@ -1743,6 +1748,7 @@ Object f() {
   }
 
   test_searchReferences_LocalVariableElement_inForEachElement_inFunctionBody() async {
+    makeFilePriority(testFile);
     await resolveTestCode('''
 Object f() {
   return [
@@ -1758,6 +1764,7 @@ Object f() {
   }
 
   test_searchReferences_LocalVariableElement_inForEachElement_topLevel() async {
+    makeFilePriority(testFile);
     await resolveTestCode('''
 var x = [
   for (var v in []) v,
@@ -1771,6 +1778,7 @@ var x = [
   }
 
   test_searchReferences_LocalVariableElement_inForEachLoop() async {
+    makeFilePriority(testFile);
     await resolveTestCode('''
 main() {
   for (var v in []) {
@@ -1793,16 +1801,7 @@ main() {
 
   test_searchReferences_LocalVariableElement_inPackage() async {
     var aaaPackageRootPath = '$packagesRootPath/aaa';
-    var testPath = convertPath('$aaaPackageRootPath/lib/a.dart');
-
-    writeTestPackageConfig(
-      PackageConfigFileBuilder()
-        ..add(name: 'aaa', rootPath: aaaPackageRootPath),
-    );
-
-    fileForContextSelection = testFile;
-
-    await resolveFileCode(testPath, '''
+    var a_file = newFile('$aaaPackageRootPath/lib/a.dart', '''
 main() {
   var v;
   v = 1;
@@ -1811,6 +1810,17 @@ main() {
   v();
 }
 ''');
+
+    writeTestPackageConfig(
+      PackageConfigFileBuilder()
+        ..add(name: 'aaa', rootPath: aaaPackageRootPath),
+    );
+
+    fileForContextSelection = testFile;
+
+    driverFor(testFile).priorityFiles2 = [a_file];
+    await resolveFile2(a_file);
+
     var element = findElement2.localVar('v');
     await assertElementReferencesText(element, r'''
 package:aaa/a.dart::<fragment>::@function::main
@@ -2191,6 +2201,7 @@ main() {
   }
 
   test_searchReferences_ParameterElement_requiredPositional_ofLocalFunction() async {
+    makeFilePriority(testFile);
     await resolveTestCode('''
 main() {
   foo(p) {
@@ -2753,6 +2764,7 @@ void f(Object? x) {
   }
 
   test_searchReferences_VariablePatternElement_patternAssignment() async {
+    makeFilePriority(testFile);
     await resolveTestCode('''
 void f() {
   int v;
diff --git a/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart b/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart
@@ -310,6 +310,10 @@ abstract class ContextResolutionTest
     return libraryResult.element2;
   }
 
+  void makeFilePriority(File file) {
+    driverFor(file).priorityFiles2 = [file];
+  }
+
   @override
   File newFile(String path, String content) {
     if (_analysisContextCollection != null && !path.endsWith('.dart')) {
diff --git a/pkg/analyzer/test/src/diagnostics/duplicate_constructor_default_test.dart b/pkg/analyzer/test/src/diagnostics/duplicate_constructor_default_test.dart
@@ -130,6 +130,7 @@ enum E {
 }
 ''', [
       error(CompileTimeErrorCode.DUPLICATE_CONSTRUCTOR_DEFAULT, 35, 5),
+      error(WarningCode.UNUSED_ELEMENT, 37, 3),
     ]);
   }
 
@@ -154,6 +155,7 @@ enum E {
 }
 ''', [
       error(CompileTimeErrorCode.DUPLICATE_CONSTRUCTOR_DEFAULT, 39, 5),
+      error(WarningCode.UNUSED_ELEMENT, 41, 3),
     ]);
   }
 
diff --git a/pkg/analyzer/test/src/diagnostics/duplicate_constructor_name_test.dart b/pkg/analyzer/test/src/diagnostics/duplicate_constructor_name_test.dart
@@ -110,6 +110,7 @@ enum E {
 }
 ''', [
       error(CompileTimeErrorCode.DUPLICATE_CONSTRUCTOR_NAME, 45, 5),
+      error(WarningCode.UNUSED_ELEMENT, 47, 3),
     ]);
   }
 
diff --git a/pkg/analyzer/test/src/diagnostics/duplicate_definition_test.dart b/pkg/analyzer/test/src/diagnostics/duplicate_definition_test.dart
@@ -2733,6 +2733,11 @@ class B extends A {
 }
 ''', [
       error(WarningCode.UNUSED_FIELD, 17, 1),
+      error(
+          CompileTimeErrorCode
+              .SUPER_FORMAL_PARAMETER_WITHOUT_ASSOCIATED_POSITIONAL,
+          74,
+          1),
     ]);
   }
 
@@ -2752,6 +2757,11 @@ class B extends A {
       error(WarningCode.UNUSED_FIELD, 61, 1),
       error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 118, 1,
           contextMessages: [message(testFile, 109, 1)]),
+      error(
+          CompileTimeErrorCode
+              .SUPER_FORMAL_PARAMETER_WITHOUT_ASSOCIATED_POSITIONAL,
+          118,
+          1),
     ]);
   }
 
diff --git a/pkg/analyzer/test/src/diagnostics/invalid_constructor_name_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_constructor_name_test.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/src/dart/error/syntactic_errors.dart';
+import 'package:analyzer/src/error/codes.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import '../dart/resolution/context_collection_resolution.dart';
@@ -72,6 +73,7 @@ enum E {
 }
 ''', [
       error(ParserErrorCode.INVALID_CONSTRUCTOR_NAME, 40, 1),
+      error(WarningCode.UNUSED_ELEMENT, 59, 3),
     ]);
   }
 }
diff --git a/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart b/pkg/analyzer/test/src/summary/elements/duplicate_declaration_test.dart
@@ -736,6 +736,8 @@ library
       reference: <testLibrary>::@class::X::@def::0
       firstFragment: <testLibraryFragment>::@class::X::@def::0
       supertype: A
+      mixins
+        M
       constructors
         synthetic new
           firstFragment: <testLibraryFragment>::@class::X::@def::0::@constructor::new
diff --git a/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart b/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart

Original file line number	Diff line number	Diff line change
`@@ -882,6 +882,7 @@ class NewWidget extends StatelessWidget {`
`882`	`882`	`expectedContent,`
`883`	`883`	`command: Commands.performRefactor,`
`884`	`884`	`title: extractWidgetTitle,`
	`885`	`+ openTargetFile: true,`
`885`	`886`	`);`
`886`	`887`	`}`
`887`	`888`
`@@ -927,6 +928,7 @@ void f() {`
`927`	`928`	`expectedContent,`
`928`	`929`	`command: Commands.performRefactor,`
`929`	`930`	`title: inlineVariableTitle,`
	`931`	`+ openTargetFile: true,`
`930`	`932`	`);`
`931`	`933`	`}`
`932`	`934`	`}`
Original file line number	Diff line number	Diff line change
`@@ -882,6 +882,7 @@ void f(A a, B b, C c) {`
`882`	`882`	`}`
`883`	`883`
`884`	`884`	`Future<void> test_label() async {`
	`885`	`+ await setPriorityFiles2([testFile]);`
`885`	`886`	`addTestFile('''`
`886`	`887`	`void f() {`
`887`	`888`	`myLabel:`
`@@ -901,6 +902,7 @@ myLabel:`
`901`	`902`	`}`
`902`	`903`
`903`	`904`	`Future<void> test_localVariable() async {`
	`905`	`+ await setPriorityFiles2([testFile]);`
`904`	`906`	`addTestFile('''`
`905`	`907`	`void f() {`
`906`	`908`	`var vvv = 1;`
`@@ -1300,6 +1302,7 @@ void f(({int foo}) x, num ^a) {`
`1300`	`1302`	`}`
`1301`	`1303`
`1302`	`1304`	`Future<void> test_pattern_relational_variable() async {`
	`1305`	`+ await setPriorityFiles2([testFile]);`
`1303`	`1306`	`await assertReferences(`
`1304`	`1307`	`kind: ElementKind.LOCAL_VARIABLE,`
`1305`	`1308`	`resultKinds: {0: SearchResultKind.READ},`
`@@ -1562,6 +1565,7 @@ class A<T> {`
`1562`	`1565`	`}`
`1563`	`1566`
`1564`	`1567`	`Future<void> test_variable_forEachElement_block() async {`
	`1568`	`+ await setPriorityFiles2([testFile]);`
`1565`	`1569`	`addTestFile('''`
`1566`	`1570`	`void f(List<int> values) {`
`1567`	`1571`	`{`
`@@ -1575,6 +1579,7 @@ void f(List<int> values) {`
`1575`	`1579`	`}`
`1576`	`1580`
`1577`	`1581`	`Future<void> test_variable_forEachElement_expressionBody() async {`
	`1582`	`+ await setPriorityFiles2([testFile]);`
`1578`	`1583`	`addTestFile('''`
`1579`	`1584`	`Object f() => [for (final value in []) value * 2];`
`1580`	`1585`	`''');`
`@@ -1584,6 +1589,7 @@ Object f() => [for (final value in []) value * 2];`
`1584`	`1589`	`}`
`1585`	`1590`
`1586`	`1591`	`Future<void> test_variable_forEachElement_functionBody() async {`
	`1592`	`+ await setPriorityFiles2([testFile]);`
`1587`	`1593`	`addTestFile('''`
`1588`	`1594`	`void f(List<int> values) {`
`1589`	`1595`	`[for (final value in values) value * 2];`
`@@ -1595,6 +1601,7 @@ void f(List<int> values) {`
`1595`	`1601`	`}`
`1596`	`1602`
`1597`	`1603`	`Future<void> test_variable_forEachElement_topLevelVariable() async {`
	`1604`	`+ await setPriorityFiles2([testFile]);`
`1598`	`1605`	`addTestFile('''`
`1599`	`1606`	`final a = [for (final value in []) value * 2];`
`1600`	`1607`	`''');`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,11 @@ abstract class RefactoringTest extends AbstractSingleUnitTest {`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`Future<void> indexTestUnit(String code) async {`
	`148`	`+ // Make it priority, so the resolved unit stays in memory.`
	`149`	`+ // So, when we get a local element, and search for it, we use this unit.`
	`150`	`+ // This is important when local elements equality is identity.`
	`151`	`+ makeFilePriority(testFile);`
	`152`	`+`
`148`	`153`	`await resolveTestCode(code);`
`149`	`154`	`}`
`150`	`155`