[_fe_analyzer_shared] Rename StringJuxtaposition to AdjacentStringLiterals

Change-Id: I2ed9172f51f9a9011ca9dff59c62c42ffb56f05e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/391605
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>
Reviewed-by: Jens Johansen <[email protected]>

Author: johnniwinther

pkg/_fe_analyzer_shared/lib/src/metadata/expressions.dart

@@ -162,20 +162,20 @@ class StringLiteral extends Expression {
   }
 }
 
-class StringJuxtaposition extends Expression {
+class AdjacentStringLiterals extends Expression {
   final List<Expression> expressions;
 
-  StringJuxtaposition(this.expressions);
+  AdjacentStringLiterals(this.expressions);
 
   @override
-  String toString() => 'StringJuxtaposition($expressions)';
+  String toString() => 'AdjacentStringLiterals($expressions)';
 
   @override
   Expression? resolve() {
     List<Expression>? newExpressions = expressions.resolve((e) => e.resolve());
     return newExpressions == null
         ? null
-        : new StringJuxtaposition(newExpressions);
+        : new AdjacentStringLiterals(newExpressions);
   }
 }
 

pkg/_fe_analyzer_shared/lib/src/metadata/parser.dart

@@ -666,15 +666,15 @@ class AnnotationsListener extends StackListener {
   }
 
   @override
-  void handleStringJuxtaposition(Token startToken, int literalCount) {
+  void handleAdjacentStringLiterals(Token startToken, int literalCount) {
     assert(
         checkState(startToken, repeatedKind(_ValueKinds._Proto, literalCount)));
     List<Expression> expressions =
         new List.filled(literalCount, _dummyExpression);
     while (--literalCount >= 0) {
       expressions[literalCount] = _popExpression();
     }
-    push(new ExpressionProto(new StringJuxtaposition(expressions)));
+    push(new ExpressionProto(new AdjacentStringLiterals(expressions)));
   }
 
   @override

pkg/_fe_analyzer_shared/lib/src/parser/forwarding_listener.dart

@@ -1991,8 +1991,8 @@ class ForwardingListener implements Listener {
   }
 
   @override
-  void handleStringJuxtaposition(Token startToken, int literalCount) {
-    listener?.handleStringJuxtaposition(startToken, literalCount);
+  void handleAdjacentStringLiterals(Token startToken, int literalCount) {
+    listener?.handleAdjacentStringLiterals(startToken, literalCount);
   }
 
   @override

pkg/_fe_analyzer_shared/lib/src/parser/listener.dart

@@ -1141,8 +1141,8 @@ class Listener implements UnescapeErrorListener {
     logEvent("LiteralString");
   }
 
-  void handleStringJuxtaposition(Token startToken, int literalCount) {
-    logEvent("StringJuxtaposition");
+  void handleAdjacentStringLiterals(Token startToken, int literalCount) {
+    logEvent("AdjacentStringLiterals");
   }
 
   /// Called for class-like members (class, mixin, extension), but each member

pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart

@@ -7564,7 +7564,7 @@ class Parser {
       count++;
     }
     if (count > 1) {
-      listener.handleStringJuxtaposition(startToken, count);
+      listener.handleAdjacentStringLiterals(startToken, count);
     }
     mayParseFunctionExpressions = old;
     return token;

pkg/_fe_analyzer_shared/lib/src/testing/metadata_helper.dart

@@ -144,8 +144,8 @@ class Writer {
         _write('StringLiteral(');
         _stringPartsToText(expression.parts);
         _write(')');
-      case StringJuxtaposition():
-        _write('StringJuxtaposition(');
+      case AdjacentStringLiterals():
+        _write('AdjacentStringLiterals(');
         _incIndent(addNewLine: false);
         _expressionsToText(expression.expressions, delimiter: '');
         _decIndent();

pkg/_fe_analyzer_shared/test/metadata/data/literal/main.dart

@@ -84,10 +84,10 @@ void literal9() {}
 /*member: literal10:
 unresolved=UnresolvedExpression(UnresolvedInvoke(
   UnresolvedIdentifier(Helper)
-  (StringJuxtaposition(
+  (AdjacentStringLiterals(
       StringLiteral('a')
       StringLiteral('b')))))
-resolved=StringJuxtaposition(
+resolved=AdjacentStringLiterals(
     StringLiteral('a')
     StringLiteral('b'))*/
 void literal10() {}
@@ -96,11 +96,11 @@ void literal10() {}
 /*member: literal11:
 unresolved=UnresolvedExpression(UnresolvedInvoke(
   UnresolvedIdentifier(Helper)
-  (StringJuxtaposition(
+  (AdjacentStringLiterals(
       StringLiteral('a')
       StringLiteral('b')
       StringLiteral('c')))))
-resolved=StringJuxtaposition(
+resolved=AdjacentStringLiterals(
     StringLiteral('a')
     StringLiteral('b')
     StringLiteral('c'))*/

pkg/_fe_analyzer_shared/test/metadata/data/unresolved/main.dart

@@ -388,11 +388,11 @@ void literals2() {}
 /*member: literals3:
 unresolved=UnresolvedExpression(UnresolvedInvoke(
   UnresolvedIdentifier(Helper)
-  (StringJuxtaposition(
+  (AdjacentStringLiterals(
       StringLiteral('a')
       StringLiteral('b${UnresolvedExpression(UnresolvedIdentifier(constInt))}')
       StringLiteral('c')))))
-resolved=StringJuxtaposition(
+resolved=AdjacentStringLiterals(
     StringLiteral('a')
     StringLiteral('b${UnresolvedExpression(UnresolvedIdentifier(constInt))}')
     StringLiteral('c'))*/

pkg/analyzer/lib/src/fasta/ast_builder.dart

@@ -3709,6 +3709,14 @@ class AstBuilder extends StackListener {
     );
   }
 
+  @override
+  void handleAdjacentStringLiterals(Token startToken, int literalCount) {
+    debugEvent("AdjacentStringLiterals");
+
+    var strings = popTypedList2<StringLiteralImpl>(literalCount);
+    push(AdjacentStringsImpl(strings: strings));
+  }
+
   @override
   void handleAsOperator(Token asOperator) {
     assert(optional('as', asOperator));
@@ -5535,14 +5543,6 @@ class AstBuilder extends StackListener {
     );
   }
 
-  @override
-  void handleStringJuxtaposition(Token startToken, int literalCount) {
-    debugEvent("StringJuxtaposition");
-
-    var strings = popTypedList2<StringLiteralImpl>(literalCount);
-    push(AdjacentStringsImpl(strings: strings));
-  }
-
   @override
   void handleStringPart(Token literalString) {
     assert(identical(literalString.kind, STRING_TOKEN));

pkg/front_end/lib/src/kernel/body_builder.dart

@@ -3499,8 +3499,8 @@ class BodyBuilder extends StackListenerImpl
   }
 
   @override
-  void handleStringJuxtaposition(Token startToken, int literalCount) {
-    debugEvent("StringJuxtaposition");
+  void handleAdjacentStringLiterals(Token startToken, int literalCount) {
+    debugEvent("AdjacentStringLiterals");
     List<Expression> parts = popListForValue(literalCount);
     List<Expression>? expressions;
     // Flatten string juxtapositions of string interpolation.