Bump flutter version to 3.38.1

- support analyzer 8.0
- support dot shorthands

Author: charlescyt

lib/models/ast_node_info.dart

@@ -145,8 +145,6 @@ class AstNodeInfo {
       final AssertStatement node => AstNodeInfo._fromAssertStatement(node),
       final AssignedVariablePattern node => AstNodeInfo._fromAssignedVariablePattern(node),
       final AssignmentExpression node => AstNodeInfo._fromAssignmentExpression(node),
-      final AugmentedExpression node => AstNodeInfo._fromAugmentedExpression(node),
-      final AugmentedInvocation node => AstNodeInfo._fromAugmentedInvocation(node),
       final AwaitExpression node => AstNodeInfo._fromAwaitExpression(node),
       final BinaryExpression node => AstNodeInfo._fromBinaryExpression(node),
       final Block node => AstNodeInfo._fromBlock(node),
@@ -176,6 +174,7 @@ class AstNodeInfo {
       final DeclaredVariablePattern node => AstNodeInfo._fromDeclaredVariablePattern(node),
       final DefaultFormalParameter node => AstNodeInfo._fromDefaultFormalParameter(node),
       final DoStatement node => AstNodeInfo._fromDoStatement(node),
+      final DotShorthandConstructorInvocation node => AstNodeInfo._fromDotShorthandConstructorInvocation(node),
       final DotShorthandInvocation node => AstNodeInfo._fromDotShorthandInvocation(node),
       final DotShorthandPropertyAccess node => AstNodeInfo._fromDotShorthandPropertyAccess(node),
       final DottedName node => AstNodeInfo._fromDottedName(node),
@@ -431,29 +430,6 @@ class AstNodeInfo {
     );
   }
 
-  factory AstNodeInfo._fromAugmentedExpression(AugmentedExpression node) {
-    return AstNodeInfo(
-      node: node,
-    );
-  }
-
-  factory AstNodeInfo._fromAugmentedInvocation(AugmentedInvocation node) {
-    return AstNodeInfo(
-      node: node,
-      nodeEntries: [
-        SingleNodeEntry('arguments', node.arguments),
-        SingleNodeEntry('typeArguments', node.typeArguments),
-      ],
-      tokenEntries: [
-        TokenEntry('augmentedKeyword', node.augmentedKeyword),
-      ],
-      propertyEntries: [
-        PropertyEntry('inConstantContext', node.inConstantContext),
-        PropertyEntry('isAssignable', node.isAssignable),
-      ],
-    );
-  }
-
   factory AstNodeInfo._fromAwaitExpression(AwaitExpression node) {
     return AstNodeInfo(
       node: node,
@@ -925,6 +901,20 @@ class AstNodeInfo {
     );
   }
 
+  factory AstNodeInfo._fromDotShorthandConstructorInvocation(DotShorthandConstructorInvocation node) {
+    return AstNodeInfo(
+      node: node,
+      nodeEntries: [
+        SingleNodeEntry('typeArguments', node.typeArguments),
+        SingleNodeEntry('argumentList', node.argumentList),
+        SingleNodeEntry('constructorName', node.constructorName),
+      ],
+      tokenEntries: [
+        TokenEntry('period', node.period),
+      ],
+    );
+  }
+
   factory AstNodeInfo._fromDotShorthandInvocation(DotShorthandInvocation node) {
     return AstNodeInfo(
       node: node,
@@ -1779,7 +1769,7 @@ class AstNodeInfo {
       nodeEntries: [
         SingleNodeEntry('documentationComment', node.documentationComment),
         NodeListEntry('metadata', node.metadata),
-        SingleNodeEntry('name2', node.name2),
+        SingleNodeEntry('name', node.name),
       ],
       tokenEntries: [
         TokenEntry('firstTokenAfterCommentAndMetadata', node.firstTokenAfterCommentAndMetadata),
@@ -2015,7 +2005,7 @@ class AstNodeInfo {
         SingleNodeEntry('typeArguments', node.typeArguments),
       ],
       tokenEntries: [
-        TokenEntry('name2', node.name2),
+        TokenEntry('name', node.name),
         TokenEntry('question', node.question),
       ],
       propertyEntries: [

lib/models/ast_node_kind.dart

@@ -170,7 +170,8 @@ enum AstNodeKind {
   whileStatement(whileStatementExample),
   wildcardPattern(wildcardPatternExample),
   withClause(withClauseExample),
-  yieldStatement(yieldStatementExample);
+  yieldStatement(yieldStatementExample)
+  ;
 
   final String example;
 

lib/pages/home_page.dart

@@ -1,7 +1,7 @@
 import 'package:analyzer/dart/analysis/results.dart' show ParseStringResult;
 import 'package:analyzer/dart/ast/ast.dart' show AstNode;
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
-import 'package:analyzer/error/error.dart' show AnalysisError;
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/source/line_info.dart' show LineInfo;
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -36,7 +36,7 @@ class _HomePageState extends State<HomePage> {
   String _content = demoCode;
   late final CodeLineEditingController _controller;
   SyntacticEntity? _selectedSyntacticEntity;
-  AnalysisError? _selectedError;
+  Diagnostic? _selectedError;
   late ParseStringResult _parsedResult;
   late TreeNode<AstNode> _treeNode;
 
@@ -92,7 +92,7 @@ class _HomePageState extends State<HomePage> {
   }
 
   void _onAnalysisErrorChanged({
-    required AnalysisError? error,
+    required Diagnostic? error,
     required LineInfo lineInfo,
   }) {
     if (_selectedError == error) return;

lib/themes/code_theme.dart

@@ -90,7 +90,8 @@ enum LightCodeTheme {
   stackoverflowLight('stackoverflow-light', stackoverflowLightTheme),
   tokyoNightLight('tokyo-night-light', tokyoNightLightTheme),
   vs('vs', vsTheme),
-  xcode('xcode', xcodeTheme);
+  xcode('xcode', xcodeTheme)
+  ;
 
   final String label;
   final Map<String, TextStyle> value;
@@ -152,7 +153,8 @@ enum DarkCodeTheme {
   tomorrowNightBlue('tomorrow-night-blue', tomorrowNightBlueTheme),
   tomorrowNightBright('tomorrow-night-bright', tomorrowNightBrightTheme),
   vs2015('vs2015', vs2015Theme),
-  xt256('xt256', xt256Theme);
+  xt256('xt256', xt256Theme)
+  ;
 
   final String label;
   final Map<String, TextStyle> value;

lib/utils/utils.dart

@@ -1,9 +1,11 @@
+import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/utilities.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/source/line_info.dart';
+import 'package:pub_semver/pub_semver.dart';
 import 'package:re_editor/re_editor.dart';
 
 import '../models/tree_node.dart';
@@ -13,6 +15,12 @@ ParseStringResult parseCode(String content) {
   final result = parseString(
     content: content,
     throwIfDiagnostics: false,
+    featureSet: FeatureSet.fromEnableFlags2(
+      sdkLanguageVersion: Version(3, 10, 0),
+      flags: [
+        Feature.dot_shorthands.enableString,
+      ]
+    ),
   );
 
   return result;
@@ -47,11 +55,11 @@ CodeLineSelection getCodeLineSelectionFromSyntacticEntity({
   );
 }
 
-/// Get [CodeLineSelection] from [AnalysisError].
+/// Get [CodeLineSelection] from [Diagnostic].
 ///
 /// [LineInfo] is required to calculate the line number and column number
 CodeLineSelection getCodeLineSelectionFromAnalysisError({
-  required AnalysisError error,
+  required Diagnostic error,
   required LineInfo lineInfo,
 }) {
   return getCodeLineSelectionFromOffsetAndLength(
@@ -97,8 +105,6 @@ String getAstNodeTypeName(AstNode node) {
     final AssertStatement _ => 'AssertStatement',
     final AssignedVariablePattern _ => 'AssignedVariablePattern',
     final AssignmentExpression _ => 'AssignmentExpression',
-    final AugmentedExpression _ => 'AugmentedExpression',
-    final AugmentedInvocation _ => 'AugmentedInvocation',
     final AwaitExpression _ => 'AwaitExpression',
     final BinaryExpression _ => 'BinaryExpression',
     final Block _ => 'Block',
@@ -128,6 +134,7 @@ String getAstNodeTypeName(AstNode node) {
     final DeclaredVariablePattern _ => 'DeclaredVariablePattern',
     final DefaultFormalParameter _ => 'DefaultFormalParameter',
     final DoStatement _ => 'DoStatement',
+    final DotShorthandConstructorInvocation _ => 'DotShorthandConstructorInvocation',
     final DotShorthandInvocation _ => 'DotShorthandInvocation',
     final DotShorthandPropertyAccess _ => 'DotShorthandPropertyAccess',
     final DottedName _ => 'DottedName',

lib/utils/visitor.dart

@@ -120,32 +120,6 @@ class AstTreeNodeVisitor extends SimpleAstVisitor<TreeNode<AstNode>> {
     );
   }
 
-  @override
-  TreeNode<AstNode>? visitAugmentedExpression(AugmentedExpression node) {
-    final unParenthesized = _visitNode(node.unParenthesized);
-
-    return TreeNode<AstNode>(
-      node,
-      children: [
-        ?unParenthesized,
-      ],
-    );
-  }
-
-  @override
-  TreeNode<AstNode>? visitAugmentedInvocation(AugmentedInvocation node) {
-    final arguments = _visitNode(node.arguments);
-    final typeArguments = _visitNode(node.typeArguments);
-
-    return TreeNode<AstNode>(
-      node,
-      children: [
-        ?arguments,
-        ?typeArguments,
-      ],
-    );
-  }
-
   @override
   TreeNode<AstNode>? visitAwaitExpression(AwaitExpression node) {
     final expression = _visitNode(node.expression);
@@ -556,6 +530,22 @@ class AstTreeNodeVisitor extends SimpleAstVisitor<TreeNode<AstNode>> {
     );
   }
 
+  @override
+  TreeNode<AstNode>? visitDotShorthandConstructorInvocation(DotShorthandConstructorInvocation node) {
+    final constructorName = _visitNode(node.constructorName);
+    final typeArguments = _visitNode(node.typeArguments);
+    final argumentList = _visitNode(node.argumentList);
+
+    return TreeNode<AstNode>(
+      node,
+      children: [
+        ?constructorName,
+        ?typeArguments,
+        ?argumentList,
+      ],
+    );
+  }
+
   @override
   TreeNode<AstNode>? visitDotShorthandInvocation(DotShorthandInvocation node) {
     final memberName = _visitNode(node.memberName);
@@ -1332,14 +1322,14 @@ class AstTreeNodeVisitor extends SimpleAstVisitor<TreeNode<AstNode>> {
   TreeNode<AstNode>? visitLibraryDirective(LibraryDirective node) {
     final documentationComment = _visitNode(node.documentationComment);
     final metadata = _visitNodeList(node.metadata);
-    final name2 = _visitNode(node.name2);
+    final name = _visitNode(node.name);
 
     return TreeNode<AstNode>(
       node,
       children: [
         ?documentationComment,
         if (metadata != null) ...metadata,
-        ?name2,
+        ?name,
       ],
     );
   }

lib/widgets/analysis_error_list_view.dart

@@ -1,9 +1,9 @@
-import 'package:analyzer/error/error.dart' show AnalysisError;
+import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:flutter/material.dart';
 
 import 'app_decorated_box.dart';
 
-typedef AnalysisErrorCallback = void Function(AnalysisError error);
+typedef AnalysisErrorCallback = void Function(Diagnostic error);
 
 class AnalysisErrorListView extends StatelessWidget {
   const AnalysisErrorListView({
@@ -13,8 +13,8 @@ class AnalysisErrorListView extends StatelessWidget {
     required this.onErrorSelected,
   });
 
-  final List<AnalysisError> errors;
-  final AnalysisError? selectedError;
+  final List<Diagnostic> errors;
+  final Diagnostic? selectedError;
   final AnalysisErrorCallback onErrorSelected;
 
   @override
@@ -42,13 +42,13 @@ class _AnalysisErrorCard extends StatelessWidget {
     required this.onErrorSelected,
   });
 
-  final AnalysisError error;
+  final Diagnostic error;
   final bool selected;
   final AnalysisErrorCallback onErrorSelected;
 
   @override
   Widget build(BuildContext context) {
-    final correctionMessage = error.errorCode.correctionMessage;
+    final correctionMessage = error.diagnosticCode.correctionMessage;
 
     return Card(
       child: ListTile(

mise.toml

@@ -1,2 +1,2 @@
 [tools]
-flutter = "3.35.3-stable"
+flutter = "3.38.1-stable"