Skip to content

Commit

Permalink
Check for unnecessary_parenthesis in analyzer.
Browse files Browse the repository at this point in the history
R=brianwilkerson@google.com

Change-Id: I2e8af156a190b51741d60fdb0217101c15306a79
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153622
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
  • Loading branch information
scheglov authored and commit-bot@chromium.org committed Jul 8, 2020
1 parent 9280712 commit f2cbec8
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 27 deletions.
1 change: 1 addition & 0 deletions pkg/analyzer/analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ linter:
- avoid_unused_constructor_parameters
- empty_statements
- unnecessary_brace_in_string_interps
- unnecessary_parenthesis
4 changes: 2 additions & 2 deletions pkg/analyzer/lib/file_system/memory_file_system.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ class MemoryResourceProvider implements ResourceProvider {

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

@override
pathos.Context get pathContext => _pathContext;
Expand Down
2 changes: 1 addition & 1 deletion pkg/analyzer/lib/src/dart/analysis/fletcher16.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ int fletcher16(List<int> data) {
c0 = c0 % 255;
c1 = c1 % 255;

return (c1 << 8 | c0);
return c1 << 8 | c0;
}
2 changes: 1 addition & 1 deletion pkg/analyzer/lib/src/dart/constant/evaluation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ class ConstantEvaluationEngine {
if (defaultSuperInvocationNeeded) {
// No explicit superconstructor invocation found, so we need to
// manually insert a reference to the implicit superconstructor.
InterfaceType superclass = (constant.returnType).superclass;
InterfaceType superclass = constant.returnType.superclass;
if (superclass != null && !superclass.isDartCoreObject) {
ConstructorElement unnamedConstructor =
superclass.element.unnamedConstructor?.declaration;
Expand Down
2 changes: 1 addition & 1 deletion pkg/analyzer/lib/src/dart/constant/value.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,7 @@ class DoubleState extends NumState {
if (value == null) {
return UNKNOWN_VALUE;
}
return DoubleState(-(value));
return DoubleState(-value);
}

@override
Expand Down
2 changes: 1 addition & 1 deletion pkg/analyzer/lib/src/dart/element/generic_inferrer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ class GenericInferrer {
var prefix = parts[0];
var middle = parts[1];
var prefixPad = ' ' * (prefixMax - prefix.length);
var middlePad = ' ' * (prefixMax);
var middlePad = ' ' * prefixMax;
var end = "";
if (parts.length > 2) {
end = '\n $middlePad ${parts[2]}';
Expand Down
4 changes: 2 additions & 2 deletions pkg/analyzer/lib/src/dart/element/type_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ abstract class TypeProviderBase implements TypeProvider {
@override
bool isObjectGetter(String id) {
PropertyAccessorElement element = objectType.element.getGetter(id);
return (element != null && !element.isStatic);
return element != null && !element.isStatic;
}

@override
Expand All @@ -38,7 +38,7 @@ abstract class TypeProviderBase implements TypeProvider {
@override
bool isObjectMethod(String id) {
MethodElement element = objectType.element.getMethod(id);
return (element != null && !element.isStatic);
return element != null && !element.isStatic;
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/analyzer/lib/src/dart/micro/resolve_file.dart
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class FileResolver {

bytes = CiderUnitErrorsBuilder(
signature: errorsSignature,
errors: errors.map((ErrorEncoding.encode)).toList(),
errors: errors.map(ErrorEncoding.encode).toList(),
).toBuffer();
byteStore.put(errorsKey, errorsSignature, bytes);
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/analyzer/lib/src/error/correct_override.dart
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class CovariantParametersVerifier {
i,
);
if (superParameter != null) {
var parameterSuperList = (result[parameter] ??= []);
var parameterSuperList = result[parameter] ??= [];
var superType = _superSubstitution(superMember)
.substituteType(superParameter.type);
parameterSuperList.add(
Expand Down
10 changes: 5 additions & 5 deletions pkg/analyzer/test/generated/parser_fasta_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1676,7 +1676,7 @@ class ExtensionMethodsParserTest_Fasta extends FastaParserTestCase {
var extension = unit.declarations[0] as ExtensionDeclaration;
expect(extension.name.name, 'E');
expect(extension.onKeyword.lexeme, 'on');
var namedType = (extension.extendedType as NamedType);
var namedType = extension.extendedType as NamedType;
expect(namedType.name.name, 'C');
expect(namedType.typeArguments.arguments, hasLength(1));
expect(extension.members, hasLength(0));
Expand All @@ -1688,7 +1688,7 @@ class ExtensionMethodsParserTest_Fasta extends FastaParserTestCase {
var extension = unit.declarations[0] as ExtensionDeclaration;
expect(extension.name.name, 'E');
expect(extension.onKeyword.lexeme, 'on');
var namedType = (extension.extendedType as NamedType);
var namedType = extension.extendedType as NamedType;
expect(namedType.name.name, 'C');
expect(namedType.typeArguments.arguments, hasLength(1));
expect(extension.members, hasLength(0));
Expand All @@ -1700,7 +1700,7 @@ class ExtensionMethodsParserTest_Fasta extends FastaParserTestCase {
var extension = unit.declarations[0] as ExtensionDeclaration;
expect(extension.name, isNull);
expect(extension.onKeyword.lexeme, 'on');
var namedType = (extension.extendedType as NamedType);
var namedType = extension.extendedType as NamedType;
expect(namedType.name.name, 'C');
expect(namedType.typeArguments.arguments, hasLength(1));
expect(extension.members, hasLength(0));
Expand Down Expand Up @@ -1799,7 +1799,7 @@ class C {}
expect(extension.name.name, 'E');
expect(extension.onKeyword.lexeme, 'on');
expect((extension.extendedType as NamedType).name.name, 'C');
var namedType = (extension.extendedType as NamedType);
var namedType = extension.extendedType as NamedType;
expect(namedType.name.name, 'C');
expect(namedType.typeArguments, isNull);
expect(extension.members, hasLength(0));
Expand Down Expand Up @@ -1836,7 +1836,7 @@ class C {}
expect(extension.name, isNull);
expect(extension.onKeyword.lexeme, 'on');
expect((extension.extendedType as NamedType).name.name, 'C');
var namedType = (extension.extendedType as NamedType);
var namedType = extension.extendedType as NamedType;
expect(namedType.name.name, 'C');
expect(namedType.typeArguments, isNull);
expect(extension.members, hasLength(0));
Expand Down
6 changes: 3 additions & 3 deletions pkg/analyzer/test/generated/parser_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4416,8 +4416,8 @@ class Wrong<T> {
]);
FunctionDeclaration declaration = unit.declarations.first;
BlockFunctionBody blockBody = declaration.functionExpression.body;
ExpressionStatement statement = (blockBody).block.statements.first;
Expression expression = (statement).expression;
ExpressionStatement statement = blockBody.block.statements.first;
Expression expression = statement.expression;
expect(expression, isSuperExpression);
SuperExpression superExpression = expression;
expect(superExpression.superKeyword, isNotNull);
Expand Down Expand Up @@ -11450,7 +11450,7 @@ class C {

void test_missing_commaInArgumentList() {
MethodInvocation expression = parseExpression("f(x: 1 y: 2)",
errors: ([expectedError(ParserErrorCode.EXPECTED_TOKEN, 7, 1)]));
errors: [expectedError(ParserErrorCode.EXPECTED_TOKEN, 7, 1)]);
NodeList<Expression> arguments = expression.argumentList.arguments;
expect(arguments, hasLength(2));
}
Expand Down
12 changes: 6 additions & 6 deletions pkg/analyzer/test/generated/strong_mode_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1263,9 +1263,9 @@ void _mergeSort<T>(T Function(T) list, int compare(T a, T b), T Function(T) targ
assertNoErrors(source);
verify([source]);
var unit = analysisResult.unit;
var body = (AstFinder.getTopLevelFunction(unit, '_mergeSort')
var body = AstFinder.getTopLevelFunction(unit, '_mergeSort')
.functionExpression
.body as BlockFunctionBody);
.body as BlockFunctionBody;
var stmts = body.block.statements;
for (ExpressionStatement stmt in stmts) {
MethodInvocation invoke = stmt.expression;
Expand All @@ -1290,9 +1290,9 @@ void _mergeSort<T>(List<T> list, int compare(T a, T b), List<T> target) {
assertNoErrors(source);
verify([source]);
var unit = analysisResult.unit;
var body = (AstFinder.getTopLevelFunction(unit, '_mergeSort')
var body = AstFinder.getTopLevelFunction(unit, '_mergeSort')
.functionExpression
.body as BlockFunctionBody);
.body as BlockFunctionBody;
var stmts = body.block.statements;
for (ExpressionStatement stmt in stmts) {
MethodInvocation invoke = stmt.expression;
Expand All @@ -1317,9 +1317,9 @@ void _mergeSort<T>(T list, int compare(T a, T b), T target) {
assertNoErrors(source);
verify([source]);
var unit = analysisResult.unit;
var body = (AstFinder.getTopLevelFunction(unit, '_mergeSort')
var body = AstFinder.getTopLevelFunction(unit, '_mergeSort')
.functionExpression
.body as BlockFunctionBody);
.body as BlockFunctionBody;
var stmts = body.block.statements;
for (ExpressionStatement stmt in stmts) {
MethodInvocation invoke = stmt.expression;
Expand Down
2 changes: 1 addition & 1 deletion pkg/analyzer/test/src/dart/element/element_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2240,7 +2240,7 @@ class TypeParameterTypeImplTest extends AbstractTypeTest {
void test_resolveToBound_bound_nullableInner() {
ClassElementImpl classS = class_(name: 'A');
TypeParameterElementImpl element = TypeParameterElementImpl('E', -1);
element.bound = (interfaceTypeQuestion(classS));
element.bound = interfaceTypeQuestion(classS);
TypeParameterTypeImpl type = typeParameterTypeStar(element);
expect(type.resolveToBound(null), same(element.bound));
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/analyzer/test/utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class TypeAssertions {
Asserter<DartType> isFunction2Of(
Asserter<DartType> argType, Asserter<DartType> returnType) =>
(DartType type) {
FunctionType fType = (type as FunctionType);
FunctionType fType = type as FunctionType;
argType(fType.normalParameterTypes[0]);
returnType(fType.returnType);
};
Expand All @@ -230,7 +230,7 @@ class TypeAssertions {
AsserterBuilder<List<Asserter<DartType>>, DartType> isInstantiationOf(
Asserter<DartType> baseAssert) =>
(List<Asserter<DartType>> argAsserts) => (DartType type) {
InterfaceType t = (type as InterfaceType);
InterfaceType t = type as InterfaceType;
baseAssert(t);
List<DartType> typeArguments = t.typeArguments;
expect(typeArguments, hasLength(argAsserts.length));
Expand Down

0 comments on commit f2cbec8

Please sign in to comment.