Skip to content
This repository was archived by the owner on Nov 20, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions lib/src/rules/unnecessary_parenthesis.dart
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,7 @@ class _Visitor extends SimpleAstVisitor<void> {
void visitParenthesizedExpression(ParenthesizedExpression node) {
var parent = node.parent;
var expression = node.expression;
if (expression is SimpleIdentifier ||
(expression is CascadeExpression && expression.isNullAware) ||
(expression is PropertyAccess && expression.isNullAware) ||
(expression is MethodInvocation && expression.isNullAware) ||
(expression is IndexExpression && expression.isNullAware)) {
if (expression is SimpleIdentifier || _isNullAware(expression)) {
if (parent is PropertyAccess) {
var name = parent.propertyName.name;
if (name == 'hashCode' || name == 'runtimeType') {
Expand Down Expand Up @@ -238,6 +234,25 @@ class _Visitor extends SimpleAstVisitor<void> {
node.accept(containsFunctionExpressionVisitor);
return containsFunctionExpressionVisitor.hasFunctionExpression;
}

/// Return `true` if the expression is null aware, or if one of its recursive
/// targets is null aware.
bool _isNullAware(Expression? expression) {
if (expression is CascadeExpression) {
// No need to check the target.
return expression.isNullAware;
} else if (expression is PropertyAccess) {
if (expression.isNullAware) return true;
return _isNullAware(expression.target);
} else if (expression is MethodInvocation) {
if (expression.isNullAware) return true;
return _isNullAware(expression.target);
} else if (expression is IndexExpression) {
if (expression.isNullAware) return true;
return _isNullAware(expression.target);
}
return false;
}
}

extension on ParenthesizedExpression {
Expand Down
5 changes: 5 additions & 0 deletions test_data/rules/unnecessary_parenthesis.dart
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ main() async {
(a?..abs()).hashCode;
(a?[0]).hashCode;

(a?.sign.sign).hashCode;
(a?.abs().abs()).hashCode;
(a?..abs()..abs()).hashCode;
(a?[0][1]).hashCode;

(a?.sign)!;
(a?.abs())!;
(a?..abs())!;
Expand Down