lint: correct some simple unnecessary_parenthesis cases found internally

Fixes https://github.com/dart-lang/linter/issues/4354

Cq-Include-Trybots: luci.dart.try:flutter-analyze-try,analyzer-win-release-try,pkg-win-release-try
Change-Id: Ie0138093467ff266d4f06c70f280660c4fc0783d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/376540
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>

Author: srawlins

pkg/analyzer/lib/src/lint/pub.dart

@@ -143,7 +143,7 @@ class PSEntry {
   PSEntry(this.key, this.value);
 
   @override
-  String toString() => '${key != null ? ('$key: ') : ''}$value';
+  String toString() => '${key != null ? '$key: ' : ''}$value';
 }
 
 /// Representation of environment in `pubspec.yaml`.

pkg/linter/lib/src/extensions.dart

@@ -100,29 +100,29 @@ extension AstNodeNullableExtension on AstNode? {
     return null;
   }
 
-  bool get isFieldNameShortcut {
-    var node = this;
-    if (node is NullCheckPattern) node = node.parent;
-    if (node is NullAssertPattern) node = node.parent;
-    return node is PatternField && node.name != null && node.name?.name == null;
-  }
-
-  /// Return `true` if the expression is null aware, or if one of its recursive
-  /// targets is null aware.
-  bool containsNullAwareInvocationInChain() {
+  /// Whether the expression is null-aware, or if one of its recursive targets
+  /// is null-aware.
+  bool get containsNullAwareInvocationInChain {
     var node = this;
     if (node is PropertyAccess) {
       if (node.isNullAware) return true;
-      return node.target.containsNullAwareInvocationInChain();
+      return node.target.containsNullAwareInvocationInChain;
     } else if (node is MethodInvocation) {
       if (node.isNullAware) return true;
-      return node.target.containsNullAwareInvocationInChain();
+      return node.target.containsNullAwareInvocationInChain;
     } else if (node is IndexExpression) {
       if (node.isNullAware) return true;
-      return node.target.containsNullAwareInvocationInChain();
+      return node.target.containsNullAwareInvocationInChain;
     }
     return false;
   }
+
+  bool get isFieldNameShortcut {
+    var node = this;
+    if (node is NullCheckPattern) node = node.parent;
+    if (node is NullAssertPattern) node = node.parent;
+    return node is PatternField && node.name != null && node.name?.name == null;
+  }
 }
 
 extension BlockExtension on Block {

pkg/linter/lib/src/rules/avoid_function_literals_in_foreach_calls.dart

@@ -67,7 +67,7 @@ class _Visitor extends SimpleAstVisitor<void> {
         node.argumentList.arguments.isNotEmpty &&
         node.argumentList.arguments.first is FunctionExpression &&
         _isIterable(target.staticType) &&
-        !node.containsNullAwareInvocationInChain() &&
+        !node.containsNullAwareInvocationInChain &&
         !_hasMethodChaining(node) &&
         !_isInsideCascade(node)) {
       rule.reportLint(node.function);

pkg/linter/lib/src/rules/unnecessary_lambdas.dart

@@ -204,7 +204,7 @@ class _Visitor extends SimpleAstVisitor<void> {
       }
 
       var checker = _FinalExpressionChecker(parameters);
-      if (!node.containsNullAwareInvocationInChain() &&
+      if (!node.containsNullAwareInvocationInChain &&
           checker.isFinalNode(node.target) &&
           node.methodName.staticElement.isFinal &&
           node.typeArguments == null) {

pkg/linter/lib/src/rules/unnecessary_parenthesis.dart

@@ -104,8 +104,8 @@ class _Visitor extends SimpleAstVisitor<void> {
     // `(List<int>).toString()` is OK.
     if (expression is TypeLiteral) return;
 
-    if (expression is SimpleIdentifier ||
-        expression.containsNullAwareInvocationInChain()) {
+    if (expression.isOneToken ||
+        expression.containsNullAwareInvocationInChain) {
       if (parent is PropertyAccess) {
         var name = parent.propertyName.name;
         if (name == 'hashCode' || name == 'runtimeType') {
@@ -233,9 +233,10 @@ class _Visitor extends SimpleAstVisitor<void> {
       // inside one of the following nodes, the readability is not affected.
       if (parent is! AssignmentExpression &&
           parent is! ConstructorFieldInitializer &&
-          parent is! VariableDeclaration &&
           parent is! ExpressionFunctionBody &&
+          parent is! RecordLiteral &&
           parent is! ReturnStatement &&
+          parent is! VariableDeclaration &&
           parent is! YieldStatement &&
           !node.isArgument) {
         return;
@@ -350,4 +351,15 @@ extension on Expression {
   bool get isArgument =>
       parent is ArgumentList ||
       (parent is NamedExpression && parent?.parent is ArgumentList);
+
+  /// Whether this expression is a sigle token.
+  ///
+  /// This excludes type literals because they often need to be parenthesized.
+  bool get isOneToken =>
+      this is SimpleIdentifier ||
+      this is StringLiteral ||
+      this is IntegerLiteral ||
+      this is DoubleLiteral ||
+      this is NullLiteral ||
+      this is BooleanLiteral;
 }