Skip to content

Commit f2cbec8

Browse files
scheglovcommit-bot@chromium.org
authored andcommitted
Check for unnecessary_parenthesis in analyzer.
[email protected] Change-Id: I2e8af156a190b51741d60fdb0217101c15306a79 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153622 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 9280712 commit f2cbec8

14 files changed

+28
-27
lines changed

pkg/analyzer/analysis_options.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ linter:
1919
- avoid_unused_constructor_parameters
2020
- empty_statements
2121
- unnecessary_brace_in_string_interps
22+
- unnecessary_parenthesis

pkg/analyzer/lib/file_system/memory_file_system.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ class MemoryResourceProvider implements ResourceProvider {
2828

2929
MemoryResourceProvider(
3030
{pathos.Context context, @deprecated bool isWindows = false})
31-
: _pathContext = (context ??= pathos.style == pathos.Style.windows
31+
: _pathContext = context ??= pathos.style == pathos.Style.windows
3232
// On Windows, ensure that the current drive matches
3333
// the drive inserted by MemoryResourceProvider.convertPath
3434
// so that packages are mapped to the correct drive
3535
? pathos.Context(current: 'C:\\')
36-
: pathos.context);
36+
: pathos.context;
3737

3838
@override
3939
pathos.Context get pathContext => _pathContext;

pkg/analyzer/lib/src/dart/analysis/fletcher16.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ int fletcher16(List<int> data) {
2525
c0 = c0 % 255;
2626
c1 = c1 % 255;
2727

28-
return (c1 << 8 | c0);
28+
return c1 << 8 | c0;
2929
}

pkg/analyzer/lib/src/dart/constant/evaluation.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ class ConstantEvaluationEngine {
355355
if (defaultSuperInvocationNeeded) {
356356
// No explicit superconstructor invocation found, so we need to
357357
// manually insert a reference to the implicit superconstructor.
358-
InterfaceType superclass = (constant.returnType).superclass;
358+
InterfaceType superclass = constant.returnType.superclass;
359359
if (superclass != null && !superclass.isDartCoreObject) {
360360
ConstructorElement unnamedConstructor =
361361
superclass.element.unnamedConstructor?.declaration;

pkg/analyzer/lib/src/dart/constant/value.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,7 @@ class DoubleState extends NumState {
11571157
if (value == null) {
11581158
return UNKNOWN_VALUE;
11591159
}
1160-
return DoubleState(-(value));
1160+
return DoubleState(-value);
11611161
}
11621162

11631163
@override

pkg/analyzer/lib/src/dart/element/generic_inferrer.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ class GenericInferrer {
496496
var prefix = parts[0];
497497
var middle = parts[1];
498498
var prefixPad = ' ' * (prefixMax - prefix.length);
499-
var middlePad = ' ' * (prefixMax);
499+
var middlePad = ' ' * prefixMax;
500500
var end = "";
501501
if (parts.length > 2) {
502502
end = '\n $middlePad ${parts[2]}';

pkg/analyzer/lib/src/dart/element/type_provider.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ abstract class TypeProviderBase implements TypeProvider {
2727
@override
2828
bool isObjectGetter(String id) {
2929
PropertyAccessorElement element = objectType.element.getGetter(id);
30-
return (element != null && !element.isStatic);
30+
return element != null && !element.isStatic;
3131
}
3232

3333
@override
@@ -38,7 +38,7 @@ abstract class TypeProviderBase implements TypeProvider {
3838
@override
3939
bool isObjectMethod(String id) {
4040
MethodElement element = objectType.element.getMethod(id);
41-
return (element != null && !element.isStatic);
41+
return element != null && !element.isStatic;
4242
}
4343
}
4444

pkg/analyzer/lib/src/dart/micro/resolve_file.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class FileResolver {
185185

186186
bytes = CiderUnitErrorsBuilder(
187187
signature: errorsSignature,
188-
errors: errors.map((ErrorEncoding.encode)).toList(),
188+
errors: errors.map(ErrorEncoding.encode).toList(),
189189
).toBuffer();
190190
byteStore.put(errorsKey, errorsSignature, bytes);
191191
}

pkg/analyzer/lib/src/error/correct_override.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class CovariantParametersVerifier {
172172
i,
173173
);
174174
if (superParameter != null) {
175-
var parameterSuperList = (result[parameter] ??= []);
175+
var parameterSuperList = result[parameter] ??= [];
176176
var superType = _superSubstitution(superMember)
177177
.substituteType(superParameter.type);
178178
parameterSuperList.add(

pkg/analyzer/test/generated/parser_fasta_test.dart

+5-5
Original file line numberDiff line numberDiff line change
@@ -1676,7 +1676,7 @@ class ExtensionMethodsParserTest_Fasta extends FastaParserTestCase {
16761676
var extension = unit.declarations[0] as ExtensionDeclaration;
16771677
expect(extension.name.name, 'E');
16781678
expect(extension.onKeyword.lexeme, 'on');
1679-
var namedType = (extension.extendedType as NamedType);
1679+
var namedType = extension.extendedType as NamedType;
16801680
expect(namedType.name.name, 'C');
16811681
expect(namedType.typeArguments.arguments, hasLength(1));
16821682
expect(extension.members, hasLength(0));
@@ -1688,7 +1688,7 @@ class ExtensionMethodsParserTest_Fasta extends FastaParserTestCase {
16881688
var extension = unit.declarations[0] as ExtensionDeclaration;
16891689
expect(extension.name.name, 'E');
16901690
expect(extension.onKeyword.lexeme, 'on');
1691-
var namedType = (extension.extendedType as NamedType);
1691+
var namedType = extension.extendedType as NamedType;
16921692
expect(namedType.name.name, 'C');
16931693
expect(namedType.typeArguments.arguments, hasLength(1));
16941694
expect(extension.members, hasLength(0));
@@ -1700,7 +1700,7 @@ class ExtensionMethodsParserTest_Fasta extends FastaParserTestCase {
17001700
var extension = unit.declarations[0] as ExtensionDeclaration;
17011701
expect(extension.name, isNull);
17021702
expect(extension.onKeyword.lexeme, 'on');
1703-
var namedType = (extension.extendedType as NamedType);
1703+
var namedType = extension.extendedType as NamedType;
17041704
expect(namedType.name.name, 'C');
17051705
expect(namedType.typeArguments.arguments, hasLength(1));
17061706
expect(extension.members, hasLength(0));
@@ -1799,7 +1799,7 @@ class C {}
17991799
expect(extension.name.name, 'E');
18001800
expect(extension.onKeyword.lexeme, 'on');
18011801
expect((extension.extendedType as NamedType).name.name, 'C');
1802-
var namedType = (extension.extendedType as NamedType);
1802+
var namedType = extension.extendedType as NamedType;
18031803
expect(namedType.name.name, 'C');
18041804
expect(namedType.typeArguments, isNull);
18051805
expect(extension.members, hasLength(0));
@@ -1836,7 +1836,7 @@ class C {}
18361836
expect(extension.name, isNull);
18371837
expect(extension.onKeyword.lexeme, 'on');
18381838
expect((extension.extendedType as NamedType).name.name, 'C');
1839-
var namedType = (extension.extendedType as NamedType);
1839+
var namedType = extension.extendedType as NamedType;
18401840
expect(namedType.name.name, 'C');
18411841
expect(namedType.typeArguments, isNull);
18421842
expect(extension.members, hasLength(0));

pkg/analyzer/test/generated/parser_test.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -4416,8 +4416,8 @@ class Wrong<T> {
44164416
]);
44174417
FunctionDeclaration declaration = unit.declarations.first;
44184418
BlockFunctionBody blockBody = declaration.functionExpression.body;
4419-
ExpressionStatement statement = (blockBody).block.statements.first;
4420-
Expression expression = (statement).expression;
4419+
ExpressionStatement statement = blockBody.block.statements.first;
4420+
Expression expression = statement.expression;
44214421
expect(expression, isSuperExpression);
44224422
SuperExpression superExpression = expression;
44234423
expect(superExpression.superKeyword, isNotNull);
@@ -11450,7 +11450,7 @@ class C {
1145011450

1145111451
void test_missing_commaInArgumentList() {
1145211452
MethodInvocation expression = parseExpression("f(x: 1 y: 2)",
11453-
errors: ([expectedError(ParserErrorCode.EXPECTED_TOKEN, 7, 1)]));
11453+
errors: [expectedError(ParserErrorCode.EXPECTED_TOKEN, 7, 1)]);
1145411454
NodeList<Expression> arguments = expression.argumentList.arguments;
1145511455
expect(arguments, hasLength(2));
1145611456
}

pkg/analyzer/test/generated/strong_mode_test.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -1263,9 +1263,9 @@ void _mergeSort<T>(T Function(T) list, int compare(T a, T b), T Function(T) targ
12631263
assertNoErrors(source);
12641264
verify([source]);
12651265
var unit = analysisResult.unit;
1266-
var body = (AstFinder.getTopLevelFunction(unit, '_mergeSort')
1266+
var body = AstFinder.getTopLevelFunction(unit, '_mergeSort')
12671267
.functionExpression
1268-
.body as BlockFunctionBody);
1268+
.body as BlockFunctionBody;
12691269
var stmts = body.block.statements;
12701270
for (ExpressionStatement stmt in stmts) {
12711271
MethodInvocation invoke = stmt.expression;
@@ -1290,9 +1290,9 @@ void _mergeSort<T>(List<T> list, int compare(T a, T b), List<T> target) {
12901290
assertNoErrors(source);
12911291
verify([source]);
12921292
var unit = analysisResult.unit;
1293-
var body = (AstFinder.getTopLevelFunction(unit, '_mergeSort')
1293+
var body = AstFinder.getTopLevelFunction(unit, '_mergeSort')
12941294
.functionExpression
1295-
.body as BlockFunctionBody);
1295+
.body as BlockFunctionBody;
12961296
var stmts = body.block.statements;
12971297
for (ExpressionStatement stmt in stmts) {
12981298
MethodInvocation invoke = stmt.expression;
@@ -1317,9 +1317,9 @@ void _mergeSort<T>(T list, int compare(T a, T b), T target) {
13171317
assertNoErrors(source);
13181318
verify([source]);
13191319
var unit = analysisResult.unit;
1320-
var body = (AstFinder.getTopLevelFunction(unit, '_mergeSort')
1320+
var body = AstFinder.getTopLevelFunction(unit, '_mergeSort')
13211321
.functionExpression
1322-
.body as BlockFunctionBody);
1322+
.body as BlockFunctionBody;
13231323
var stmts = body.block.statements;
13241324
for (ExpressionStatement stmt in stmts) {
13251325
MethodInvocation invoke = stmt.expression;

pkg/analyzer/test/src/dart/element/element_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -2240,7 +2240,7 @@ class TypeParameterTypeImplTest extends AbstractTypeTest {
22402240
void test_resolveToBound_bound_nullableInner() {
22412241
ClassElementImpl classS = class_(name: 'A');
22422242
TypeParameterElementImpl element = TypeParameterElementImpl('E', -1);
2243-
element.bound = (interfaceTypeQuestion(classS));
2243+
element.bound = interfaceTypeQuestion(classS);
22442244
TypeParameterTypeImpl type = typeParameterTypeStar(element);
22452245
expect(type.resolveToBound(null), same(element.bound));
22462246
}

pkg/analyzer/test/utils.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class TypeAssertions {
220220
Asserter<DartType> isFunction2Of(
221221
Asserter<DartType> argType, Asserter<DartType> returnType) =>
222222
(DartType type) {
223-
FunctionType fType = (type as FunctionType);
223+
FunctionType fType = type as FunctionType;
224224
argType(fType.normalParameterTypes[0]);
225225
returnType(fType.returnType);
226226
};
@@ -230,7 +230,7 @@ class TypeAssertions {
230230
AsserterBuilder<List<Asserter<DartType>>, DartType> isInstantiationOf(
231231
Asserter<DartType> baseAssert) =>
232232
(List<Asserter<DartType>> argAsserts) => (DartType type) {
233-
InterfaceType t = (type as InterfaceType);
233+
InterfaceType t = type as InterfaceType;
234234
baseAssert(t);
235235
List<DartType> typeArguments = t.typeArguments;
236236
expect(typeArguments, hasLength(argAsserts.length));

0 commit comments

Comments
 (0)