Clean up visitor and also handle long names with no types.

dart-lang · Jan 17, 2024 · 67e7eae · 67e7eae
1 parent 9b209cf
commit 67e7eae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/lib/src/front_end/ast_node_visitor.dart b/lib/src/front_end/ast_node_visitor.dart
@@ -452,25 +452,14 @@ class AstNodeVisitor extends ThrowingAstVisitor<Piece> with PieceFactory {
 
   @override
   Piece visitDeclaredVariablePattern(DeclaredVariablePattern node) {
-    // We don't need any splitting behavior if we don't have a type.
-    if (node.keyword != null && node.type == null) {
-      return buildPiece((b) {
-        b.modifier(node.keyword);
-        b.visit(node.type, spaceAfter: true);
-        b.token(node.name);
-      });
-    }
-
-    // Build a [VariablePiece] that can split between the type and the variable
-    // name.
     var header = buildPiece((b) {
       b.modifier(node.keyword);
       b.visit(node.type);
     });
     return VariablePiece(
       header,
       [tokenPiece(node.name)],
-      hasType: true,
+      hasType: node.type != null,
     );
   }
 

diff --git a/test/pattern/declared_variable_comment.stmt b/test/pattern/declared_variable_comment.stmt
@@ -35,3 +35,14 @@ if (obj
         x) {
   ;
 }
+>>> Line comment after type, before long name.
+if (obj
+    case final // c
+    thisIsReallyQuiteAVeryLongVariableName) {
+  ;
+}
+<<<
+if (obj case final // c
+        thisIsReallyQuiteAVeryLongVariableName) {
+  ;
+}