DeCo. Stop using isSynthetic in analysis_server/, analyzer_plugin/, linter/.

scheglov · Commit Queue · commit a13592905065 · 2025-12-03T14:42:54.000-08:00
Change-Id: I0764ad0bde41d97a98d9eb5b088b50b4eb69155f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/465982 Reviewed-by: Samuel Rawlins <srawlins@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/lib/src/computer/computer_call_hierarchy.dart b/pkg/analysis_server/lib/src/computer/computer_call_hierarchy.dart
@@ -121,7 +121,7 @@ class CallHierarchyItem {
   static SourceRange _codeRangeForElement(Element element) {
     // For synthetic items (like implicit constructors), use the nonSynthetic
     // element for the location.
-    element = _nonSynthetic(element);
+    element = element.nonSynthetic;
     var fragment = element.firstFragment as FragmentImpl;
 
     // Non-synthetic elements should always have code locations.
@@ -134,7 +134,7 @@ class CallHierarchyItem {
   static SourceRange _nameRangeForElement(Element element) {
     // For synthetic items (like implicit constructors), use the nonSynthetic
     // element for the location.
-    element = _nonSynthetic(element);
+    element = element.nonSynthetic;
     var fragment = element.firstFragment as FragmentImpl;
 
     var nameOffset = fragment.nameOffset;
@@ -154,14 +154,6 @@ class CallHierarchyItem {
 
     return SourceRange(0, 0);
   }
-
-  static Element _nonSynthetic(Element element) {
-    element = element.nonSynthetic;
-    if (element.isSynthetic) {
-      element = element.enclosingElement ?? element;
-    }
-    return element;
-  }
 }
 
 /// Kinds of [CallHierarchyItem] that can make calls to other
diff --git a/pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart b/pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart
@@ -53,7 +53,7 @@ class ImplementedComputer {
   }
 
   void _addMemberIfImplemented(Element element) {
-    if (element.isSynthetic || _isStatic(element)) {
+    if (_isStatic(element)) {
       return;
     }
     if (_hasOverride(element)) {
@@ -76,9 +76,15 @@ class ImplementedComputer {
     subtypeMembers = await searchEngine.membersOfSubtypes(element);
     if (subtypeMembers != null) {
       _addImplementedClass(element);
-      element.getters.forEach(_addMemberIfImplemented);
-      element.setters.forEach(_addMemberIfImplemented);
-      element.fields.forEach(_addMemberIfImplemented);
+      element.getters
+          .where((e) => e.isOriginDeclaration)
+          .forEach(_addMemberIfImplemented);
+      element.setters
+          .where((e) => e.isOriginDeclaration)
+          .forEach(_addMemberIfImplemented);
+      element.fields
+          .where((e) => e.isOriginDeclaration)
+          .forEach(_addMemberIfImplemented);
       element.methods.forEach(_addMemberIfImplemented);
     }
   }
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_summary.dart b/pkg/analysis_server/lib/src/lsp/handlers/custom/handler_summary.dart
@@ -80,16 +80,20 @@ class SummaryWriter {
     // Write a summary of the declarations in the export namespace.
     var definedNames = libraryElement.exportNamespace.definedNames2;
     var needsSeparator = false;
+    var uniqueElements = <Element>{};
     for (var element in definedNames.values) {
-      if (element.isSynthetic) {
-        if (element is GetterElement) {
-          element = element.variable;
-        } else if (element is SetterElement &&
-            element.correspondingGetter == null) {
-          element = element.variable;
-        } else {
-          continue;
-        }
+      switch (element) {
+        case PropertyAccessorElement():
+          if (element.isOriginVariable) {
+            element = element.variable;
+          }
+        case PropertyInducingElement():
+          if (element.isOriginGetterSetter) {
+            continue;
+          }
+      }
+      if (!uniqueElements.add(element)) {
+        continue;
       }
       if (needsSeparator) {
         buffer.writeln();
diff --git a/pkg/analysis_server/lib/src/lsp/mapping.dart b/pkg/analysis_server/lib/src/lsp/mapping.dart
@@ -523,8 +523,8 @@ lsp.Location? fragmentToLocation(
   int? nameOffset;
   int? nameLength;
   if (fragment case PropertyAccessorFragmentImpl(
-    :var isSynthetic,
-  ) when isSynthetic) {
+    :var isOriginDeclaration,
+  ) when !isOriginDeclaration) {
     var element = fragment.element.nonSynthetic;
     nameOffset = element.firstFragment.nameOffset;
     nameLength = element.firstFragment.name?.length;
diff --git a/pkg/analysis_server/lib/src/services/correction/executable_parameters.dart b/pkg/analysis_server/lib/src/services/correction/executable_parameters.dart
@@ -86,13 +86,25 @@ class ExecutableParameters {
     } else if (invocation is ConstructorReferenceNode) {
       element = invocation.element;
     }
-    var firstFragment = element?.firstFragment;
-    if (element is ExecutableElement &&
-        !element.isSynthetic &&
-        firstFragment is ExecutableFragment) {
-      return ExecutableParameters._(sessionHelper, element, firstFragment);
-    } else {
+
+    // Must be executable to have formal parameters.
+    if (element is! ExecutableElement) {
       return null;
     }
+
+    // Must be from a declaration.
+    switch (element) {
+      case ConstructorElement():
+        if (!element.isOriginDeclaration) {
+          return null;
+        }
+      case PropertyAccessorElement():
+        if (!element.isOriginDeclaration) {
+          return null;
+        }
+    }
+
+    var firstFragment = element.firstFragment;
+    return ExecutableParameters._(sessionHelper, element, firstFragment);
   }
 }
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart
@@ -497,7 +497,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
     if (element is! ExecutableElement) {
       return fatalStatus;
     }
-    if (element.isSynthetic) {
+    if (element is PropertyAccessorElement && !element.isOriginDeclaration) {
       return fatalStatus;
     }
     // maybe operator
@@ -578,7 +578,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
     if (element is! ExecutableElement) {
       return fatalStatus;
     }
-    if (element.isSynthetic) {
+    if (element is PropertyAccessorElement && !element.isOriginDeclaration) {
       return fatalStatus;
     }
     _methodElement = element;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart
@@ -98,7 +98,7 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
     var processor = RenameProcessor(workspace, sessionHelper, change, newName);
     // update declarations
     for (var renameElement in _validator.elements) {
-      if (renameElement.isSynthetic && renameElement is FieldElement) {
+      if (renameElement is FieldElement && renameElement.isOriginGetterSetter) {
         processor.addDeclarationEdit(renameElement.getter);
         processor.addDeclarationEdit(renameElement.setter);
       } else {
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_extension_member.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_extension_member.dart
@@ -80,7 +80,7 @@ class RenameExtensionMemberRefactoringImpl extends RenameRefactoringImpl {
 
     // Update the declaration.
     var renameElement = element;
-    if (renameElement.isSynthetic && renameElement is FieldElement) {
+    if (renameElement is FieldElement && renameElement.isOriginGetterSetter) {
       processor.addDeclarationEdit(renameElement.getter);
       processor.addDeclarationEdit(renameElement.setter);
     } else {
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_unit_member.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/rename_unit_member.dart
@@ -129,18 +129,22 @@ class RenameUnitMemberRefactoringImpl extends RenameRefactoringImpl {
   Future<void> fillChange() async {
     // prepare elements
     var elements = <Element>[];
-    if (element is PropertyInducingElement && element.isSynthetic) {
-      var property = element as PropertyInducingElement;
-      var getter = property.getter;
-      var setter = property.setter;
-      if (getter != null) {
-        elements.add(getter);
-      }
-      if (setter != null) {
-        elements.add(setter);
-      }
-    } else {
-      elements.add(element);
+    switch (element) {
+      case PropertyInducingElement element:
+        if (element.isOriginGetterSetter) {
+          var getter = element.getter;
+          var setter = element.setter;
+          if (getter != null) {
+            elements.add(getter);
+          }
+          if (setter != null) {
+            elements.add(setter);
+          }
+        } else {
+          elements.add(element);
+        }
+      default:
+        elements.add(element);
     }
 
     // Rename each element and references to it.
diff --git a/pkg/analysis_server/lib/src/services/search/hierarchy.dart b/pkg/analysis_server/lib/src/services/search/hierarchy.dart
@@ -78,23 +78,14 @@ Future<Set<InterfaceElement>> getDirectSubClasses(
 /// Return the non-synthetic children of the given [extension]. This includes
 /// fields, accessors and methods, but excludes synthetic elements.
 List<Element> getExtensionMembers(ExtensionElement extension, [String? name]) {
-  var members = <Element>[];
-  visitChildren(extension, (element) {
-    if (element.isSynthetic) {
-      return false;
-    }
-    if (name != null && element.displayName != name) {
-      return false;
-    }
-    if (element is ExecutableElement) {
-      members.add(element);
-    }
-    if (element is FieldElement) {
-      members.add(element);
-    }
-    return false;
-  });
-  return members;
+  return [
+    ...extension.fields.where((e) => e.isOriginDeclaration),
+    ...extension.getters.where((e) => e.isOriginDeclaration),
+    ...extension.setters.where((e) => e.isOriginDeclaration),
+    ...extension.methods,
+  ].where((element) {
+    return name == null || element.displayName == name;
+  }).toList();
 }
 
 /// Returns all implementations of the given [member], including in its
diff --git a/pkg/analysis_server/lib/src/status/utilities/element_writer.dart b/pkg/analysis_server/lib/src/status/utilities/element_writer.dart
@@ -133,11 +133,22 @@ class ElementWriter with TreeWriter {
   /// Write a representation of the given [element] to the buffer.
   void _writeElement(Element element) {
     indent();
-    if (element.isSynthetic) {
+
+    var showItalic = false;
+    switch (element) {
+      case ConstructorElement():
+        showItalic = !element.isOriginDeclaration;
+      case PropertyAccessorElement():
+        showItalic = !element.isOriginDeclaration;
+      case PropertyInducingElement():
+        showItalic = !element.isOriginDeclaration;
+    }
+
+    if (showItalic) {
       buffer.write('<i>');
     }
     buffer.write(htmlEscape.convert(element.toString()));
-    if (element.isSynthetic) {
+    if (showItalic) {
       buffer.write('</i>');
     }
     buffer.write(' <span style="color:gray">(');
diff --git a/pkg/analysis_server/test/analysis/notification_navigation_test.dart b/pkg/analysis_server/test/analysis/notification_navigation_test.dart
@@ -841,6 +841,62 @@ int V = 42;
     expect(target.startColumn, greaterThan(0));
   }
 
+  Future<void> test_class_getter_originDeclaration() async {
+    addTestFile('''
+class A {
+  int get foo => 0;
+  void bar() {
+    foo;
+  }
+}
+''');
+    await prepareNavigation();
+
+    assertHasRegionTarget('foo;', 'foo =>');
+  }
+
+  Future<void> test_class_getter_originField() async {
+    addTestFile('''
+class A {
+  final int foo = 0;
+  void bar() {
+    foo;
+  }
+}
+''');
+    await prepareNavigation();
+
+    assertHasRegionTarget('foo;', 'foo = 0;');
+  }
+
+  Future<void> test_class_setter_originDeclaration() async {
+    addTestFile('''
+class A {
+  set foo(int _)
+  void bar() {
+    foo = 0;
+  }
+}
+''');
+    await prepareNavigation();
+
+    assertHasRegionTarget('foo = 0;', 'foo(int _)');
+  }
+
+  Future<void> test_class_setter_originField() async {
+    addTestFile('''
+class A {
+  int foo = 42;
+  void bar() {
+    foo = 0;
+  }
+}
+''');
+    await prepareNavigation();
+
+    assertHasRegionTarget('foo = 0;', 'foo = 42;');
+  }
+
   Future<void> test_enum_constant() async {
     addTestFile('''
 enum E { a, b }
diff --git a/pkg/analysis_server/test/services/refactoring/legacy/inline_method_test.dart b/pkg/analysis_server/test/services/refactoring/legacy/inline_method_test.dart
@@ -332,6 +332,19 @@ void f(A a) {
     return _assertInvalidSelection();
   }
 
+  Future<void> test_bad_propertyAccessor_topLevel_synthetic() async {
+    await indexTestUnit(r'''
+int fff = 0;
+
+void f() {
+  print(^fff);
+}
+''');
+    _createRefactoring();
+    // error
+    return _assertInvalidSelection();
+  }
+
   Future<void> test_bad_reference_toClassMethod() async {
     await indexTestUnit(r'''
 class A {
diff --git a/pkg/analyzer_plugin/lib/src/utilities/completion/element_suggestion_builder.dart b/pkg/analyzer_plugin/lib/src/utilities/completion/element_suggestion_builder.dart
@@ -62,7 +62,7 @@ mixin ElementSuggestionBuilder {
       relevance: relevance,
     );
     if (suggestion != null) {
-      if (element.isSynthetic && element is PropertyAccessorElement) {
+      if (element is PropertyAccessorElement && element.isOriginVariable) {
         var cacheKey = element.name;
         if (cacheKey != null) {
           var existingSuggestion = _syntheticMap[cacheKey];
diff --git a/pkg/analyzer_plugin/lib/src/utilities/navigation/navigation_dart.dart b/pkg/analyzer_plugin/lib/src/utilities/navigation/navigation_dart.dart
diff --git a/pkg/linter/lib/src/extensions.dart b/pkg/linter/lib/src/extensions.dart
diff --git a/pkg/linter/lib/src/rules/null_closures.dart b/pkg/linter/lib/src/rules/null_closures.dart
diff --git a/pkg/linter/lib/src/rules/overridden_fields.dart b/pkg/linter/lib/src/rules/overridden_fields.dart

Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl`
`497`	`497`	`if (element is! ExecutableElement) {`
`498`	`498`	`return fatalStatus;`
`499`	`499`	`}`
`500`		`- if (element.isSynthetic) {`
	`500`	`+ if (element is PropertyAccessorElement && !element.isOriginDeclaration) {`
`501`	`501`	`return fatalStatus;`
`502`	`502`	`}`
`503`	`503`	`// maybe operator`
`@@ -578,7 +578,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl`
`578`	`578`	`if (element is! ExecutableElement) {`
`579`	`579`	`return fatalStatus;`
`580`	`580`	`}`
`581`		`- if (element.isSynthetic) {`
	`581`	`+ if (element is PropertyAccessorElement && !element.isOriginDeclaration) {`
`582`	`582`	`return fatalStatus;`
`583`	`583`	`}`
`584`	`584`	`_methodElement = element;`