Migrate the diagnostic pages

Change-Id: I8f3255bf07154ddc32c89535579dbbaa64351414
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/394821
Commit-Queue: Brian Wilkerson <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>

Author: bwilkerson

pkg/analysis_server/analyzer_use_new_elements.txt

@@ -91,10 +91,6 @@ lib/src/services/search/element_visitors.dart
 lib/src/services/search/hierarchy.dart
 lib/src/services/search/search_engine.dart
 lib/src/services/search/search_engine_internal.dart
-lib/src/status/ast_writer.dart
-lib/src/status/diagnostics.dart
-lib/src/status/element_writer.dart
-lib/src/status/tree_writer.dart
 lib/src/utilities/extensions/ast.dart
 lib/src/utilities/extensions/completion_request.dart
 lib/src/utilities/extensions/element.dart

pkg/analysis_server/lib/src/status/ast_writer.dart

@@ -34,34 +34,35 @@ class AstWriter extends UnifyingAstVisitor<void> with TreeWriter {
 
     properties['name'] = _getName(node);
     if (node is ArgumentListImpl) {
-      properties['static parameter types'] = node.correspondingStaticParameters;
+      properties['corresponding static parameters'] =
+          node.correspondingStaticParameters2;
     } else if (node is Annotation) {
-      properties['element'] = node.element;
+      properties['element'] = node.element2;
       properties['element annotation'] = node.elementAnnotation;
     } else if (node is BinaryExpression) {
-      properties['static element'] = node.staticElement;
+      properties['element'] = node.element;
       properties['static type'] = node.staticType;
     } else if (node is ClassDeclaration) {
-      properties['declaredElement'] = node.declaredElement;
+      properties['declared fragment'] = node.declaredFragment;
       properties['abstract keyword'] = node.abstractKeyword;
     } else if (node is ClassTypeAlias) {
-      properties['declaredElement'] = node.declaredElement;
+      properties['declared fragment'] = node.declaredFragment;
       properties['abstract keyword'] = node.abstractKeyword;
     } else if (node is CompilationUnit) {
-      properties['declaredElement'] = node.declaredElement;
+      properties['declared fragment'] = node.declaredFragment;
     } else if (node is Configuration) {
       properties['uriSource'] = node.resolvedUri;
     } else if (node is ConstructorName) {
-      properties['static element'] = node.staticElement;
+      properties['element'] = node.element;
     } else if (node is DeclaredIdentifier) {
-      properties['element'] = node.declaredElement;
+      properties['element'] = node.declaredElement2;
       properties['keyword'] = node.keyword;
     } else if (node is ExportDirective) {
-      properties['element'] = node.element;
+      properties['library export'] = node.libraryExport;
     } else if (node is FieldDeclaration) {
       properties['static keyword'] = node.staticKeyword;
     } else if (node is FormalParameter) {
-      properties['declaredElement'] = node.declaredElement;
+      properties['declared fragment'] = node.declaredFragment;
       if (node.isRequiredPositional) {
         properties['kind'] = 'required-positional';
       } else if (node.isRequiredNamed) {
@@ -74,26 +75,26 @@ class AstWriter extends UnifyingAstVisitor<void> with TreeWriter {
         properties['kind'] = 'unknown kind';
       }
     } else if (node is FunctionDeclaration) {
-      properties['declaredElement'] = node.declaredElement;
+      properties['declared fragment'] = node.declaredFragment;
       properties['external keyword'] = node.externalKeyword;
       properties['property keyword'] = node.propertyKeyword;
     } else if (node is FunctionExpressionInvocation) {
-      properties['static element'] = node.staticElement;
+      properties['element'] = node.element;
       properties['static invoke type'] = node.staticInvokeType;
       properties['static type'] = node.staticType;
     } else if (node is GenericFunctionType) {
       properties['type'] = node.type;
     } else if (node is ImportDirective) {
-      properties['element'] = node.element;
+      properties['library import'] = node.libraryImport;
     } else if (node is IndexExpression) {
-      properties['static element'] = node.staticElement;
+      properties['element'] = node.element;
       properties['static type'] = node.staticType;
     } else if (node is InstanceCreationExpression) {
       properties['static type'] = node.staticType;
     } else if (node is LibraryDirective) {
-      properties['element'] = node.element;
+      properties['element'] = node.element2;
     } else if (node is MethodDeclaration) {
-      properties['declaredElement'] = node.declaredElement;
+      properties['declared fragment'] = node.declaredFragment;
       properties['external keyword'] = node.externalKeyword;
       properties['modifier keyword'] = node.modifierKeyword;
       properties['operator keyword'] = node.operatorKeyword;
@@ -102,37 +103,35 @@ class AstWriter extends UnifyingAstVisitor<void> with TreeWriter {
       properties['static invoke type'] = node.staticInvokeType;
       properties['static type'] = node.staticType;
     } else if (node is PartDirective) {
-      properties['element'] = node.element;
-    } else if (node is PartOfDirective) {
-      properties['element'] = node.element;
+      properties['fragment include'] = node.fragmentInclude;
     } else if (node is PostfixExpression) {
-      properties['static element'] = node.staticElement;
+      properties['element'] = node.element;
       properties['static type'] = node.staticType;
     } else if (node is PrefixExpression) {
-      properties['static element'] = node.staticElement;
+      properties['element'] = node.element;
       properties['static type'] = node.staticType;
     } else if (node is RedirectingConstructorInvocation) {
-      properties['static element'] = node.staticElement;
+      properties['element'] = node.element;
     } else if (node is SimpleIdentifier) {
-      properties['static element'] = node.staticElement;
+      properties['element'] = node.element;
       properties['static type'] = node.staticType;
     } else if (node is SimpleStringLiteral) {
       properties['value'] = node.value;
     } else if (node is SuperConstructorInvocation) {
-      properties['static element'] = node.staticElement;
+      properties['element'] = node.element;
     } else if (node is TypeAnnotation) {
       properties['type'] = node.type;
     } else if (node is VariableDeclarationList) {
       properties['keyword'] = node.keyword;
     } else if (node is Declaration) {
-      properties['declaredElement'] = node.declaredElement;
+      properties['declared fragment'] = node.declaredFragment;
     } else if (node is Expression) {
       properties['static type'] = node.staticType;
     } else if (node is FunctionBody) {
-      properties['isAsynchronous'] = node.isAsynchronous;
-      properties['isGenerator'] = node.isGenerator;
+      properties['is asynchronous'] = node.isAsynchronous;
+      properties['is generator'] = node.isGenerator;
     } else if (node is Identifier) {
-      properties['static element'] = node.staticElement;
+      properties['element'] = node.element;
       properties['static type'] = node.staticType;
     }
 

pkg/analysis_server/lib/src/status/diagnostics.dart

@@ -24,7 +24,6 @@ import 'package:analysis_server/src/status/pages.dart';
 import 'package:analysis_server/src/utilities/profiling.dart';
 import 'package:analyzer/dart/analysis/context_root.dart';
 import 'package:analyzer/dart/analysis/results.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/context/source.dart';
 import 'package:analyzer/src/dart/analysis/analysis_options_map.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
@@ -1306,13 +1305,17 @@ class ElementModelPage extends DiagnosticPageWithNav {
       return;
     }
     var result = await driver.getResolvedUnit(filePath);
-    CompilationUnitElement? compilationUnitElement;
-    if (result is ResolvedUnitResult) {
-      compilationUnitElement = result.unit.declaredElement;
+    if (result is! ResolvedUnitResult) {
+      p(
+        'The file <code>${escape(filePath)}</code> could not be resolved.',
+        raw: true,
+      );
+      return;
     }
-    if (compilationUnitElement != null) {
+    var libraryFragment = result.unit.declaredFragment;
+    if (libraryFragment != null) {
       var writer = ElementWriter(buf);
-      compilationUnitElement.accept(writer);
+      writer.write(libraryFragment.element);
     } else {
       p(
         'An element model could not be produced for the file '