[migration] diagnostic_factory.dart

Change-Id: I45da294d218329f312f3f30bfa64d4089b7017fc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/411181
Commit-Queue: Brian Wilkerson <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: bwilkerson

pkg/analyzer/lib/src/diagnostic/diagnostic_factory.dart

@@ -2,19 +2,15 @@
 // 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.
 
-// ignore_for_file: analyzer_use_new_elements
-
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/ast/token.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/source/source.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/diagnostic/diagnostic.dart';
 import 'package:analyzer/src/error/codes.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// A factory used to create diagnostics.
 class DiagnosticFactory {
@@ -49,22 +45,24 @@ class DiagnosticFactory {
 
   /// Return a diagnostic indicating that [duplicateElement] reuses a name
   /// already used by [originalElement].
-  AnalysisError duplicateDefinition(ErrorCode code, Element duplicateElement,
-      Element originalElement, List<Object> arguments) {
-    var duplicate = duplicateElement.nonSynthetic;
-    var original = originalElement.nonSynthetic;
+  AnalysisError duplicateDefinition(ErrorCode code, Element2 duplicateElement,
+      Element2 originalElement, List<Object> arguments) {
+    var duplicate = duplicateElement.nonSynthetic2;
+    var duplicateFragment = duplicate.firstFragment;
+    var original = originalElement.nonSynthetic2;
+    var originalFragment = original.firstFragment;
     return AnalysisError.tmp(
-      source: duplicate.source!,
-      offset: duplicate.nameOffset,
-      length: duplicate.nameLength,
+      source: duplicateFragment.libraryFragment!.source,
+      offset: duplicateFragment.nameOffset2 ?? -1,
+      length: duplicate.name3!.length,
       errorCode: code,
       arguments: arguments,
       contextMessages: [
         DiagnosticMessageImpl(
-          filePath: original.source!.fullName,
+          filePath: originalFragment.libraryFragment!.source.fullName,
           message: "The first definition of this name.",
-          offset: original.nameOffset,
-          length: original.nameLength,
+          offset: originalFragment.nameOffset2 ?? -1,
+          length: original.name3!.length,
           url: null,
         ),
       ],
@@ -301,6 +299,7 @@ class DiagnosticFactory {
     // Elements enclosing members that can participate in overrides are always
     // named, so we can safely assume `_thisMember.enclosingElement3.name` and
     // `superMember.enclosingElement3.name` are non-`null`.
+    var superFragment = superMember.nonSynthetic2.firstFragment;
     return AnalysisError.tmp(
       source: source,
       offset: errorNode.offset,
@@ -321,18 +320,18 @@ class DiagnosticFactory {
         // concrete).
         if (errorCode == CompileTimeErrorCode.INVALID_OVERRIDE)
           DiagnosticMessageImpl(
-            filePath: superMember.asElement.source.fullName,
+            filePath: superFragment.libraryFragment!.source.fullName,
             message: "The member being overridden.",
-            offset: superMember.asElement.nonSynthetic.nameOffset,
-            length: superMember.asElement.nonSynthetic.nameLength,
+            offset: superFragment.nameOffset2 ?? -1,
+            length: superFragment.name2!.length,
             url: null,
           ),
         if (errorCode == CompileTimeErrorCode.INVALID_OVERRIDE_SETTER)
           DiagnosticMessageImpl(
-            filePath: superMember.asElement.source.fullName,
+            filePath: superFragment.libraryFragment!.source.fullName,
             message: "The setter being overridden.",
-            offset: superMember.asElement.nonSynthetic.nameOffset,
-            length: superMember.asElement.nonSynthetic.nameLength,
+            offset: superFragment.nameOffset2 ?? -1,
+            length: superFragment.name2!.length,
             url: null,
           )
       ],
@@ -346,17 +345,16 @@ class DiagnosticFactory {
     required Token nameToken,
     required Element2 element2,
   }) {
-    var element = element2.asElement!;
     String name = nameToken.lexeme;
     List<DiagnosticMessage>? contextMessages;
-    int declarationOffset = element.nameOffset;
+    int declarationOffset = element2.firstFragment.nameOffset2 ?? -1;
     if (declarationOffset >= 0) {
       contextMessages = [
         DiagnosticMessageImpl(
             filePath: source.fullName,
             message: "The declaration of '$name' is here.",
             offset: declarationOffset,
-            length: element.nameLength,
+            length: name.length,
             url: null)
       ];
     }

pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart

@@ -170,8 +170,8 @@ class DuplicateDefinitionVerifier {
         _errorReporter.reportError(
           _diagnosticFactory.duplicateDefinition(
             CompileTimeErrorCode.PREFIX_COLLIDES_WITH_TOP_LEVEL_MEMBER,
-            importPrefix,
-            existing.asElement!,
+            importPrefix.asElement2,
+            existing,
             [name],
           ),
         );
@@ -260,8 +260,8 @@ class DuplicateDefinitionVerifier {
       if (!_isGetterSetterPair(element, previous)) {
         _errorReporter.reportError(_diagnosticFactory.duplicateDefinition(
           getError(previous, element),
-          element,
-          previous,
+          element.asElement2!,
+          previous.asElement2!,
           [name],
         ));
       }
@@ -275,8 +275,8 @@ class DuplicateDefinitionVerifier {
         if (previous != null) {
           _errorReporter.reportError(_diagnosticFactory.duplicateDefinition(
             getError(previous, element),
-            element,
-            previous,
+            element.asElement2,
+            previous.asElement2!,
             [name],
           ));
         } else {
@@ -545,8 +545,8 @@ class MemberDuplicateDefinitionVerifier {
         _errorReporter.reportError(
           _diagnosticFactory.duplicateDefinition(
             CompileTimeErrorCode.DUPLICATE_DEFINITION,
-            element,
-            previous,
+            element.asElement2!,
+            previous.asElement2!,
             [name],
           ),
         );
@@ -562,8 +562,8 @@ class MemberDuplicateDefinitionVerifier {
           _errorReporter.reportError(
             _diagnosticFactory.duplicateDefinition(
               CompileTimeErrorCode.DUPLICATE_DEFINITION,
-              element,
-              previous,
+              element.asElement2,
+              previous.asElement2!,
               [name],
             ),
           );