Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit bf8530e

Browse files
authored
Add back unnecessary_parenthesis lint (#55931)
Follow-up from #55927
1 parent 31aaaaa commit bf8530e

File tree

3 files changed

+44
-56
lines changed

3 files changed

+44
-56
lines changed

analysis_options.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,7 @@ linter:
212212
- unnecessary_null_in_if_null_operators
213213
- unnecessary_nullable_for_final_variable_declarations
214214
- unnecessary_overrides
215-
# TODO(zanderso): Temporarily disabling to unblock a Dart -> Engine roll.
216-
# https://github.com/flutter/engine/pull/55927.
217-
# - unnecessary_parenthesis
215+
- unnecessary_parenthesis
218216
# - unnecessary_raw_strings # what's "necessary" is a matter of opinion; consistency across strings can help readability more than this lint
219217
- unnecessary_statements
220218
- unnecessary_string_escapes

ci/licenses_golden/tool_signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: 8859e172e060ecb45aa665c3119d5d25
1+
Signature: dbe5e49be0f842a35b32e2e3ecfff7a6
22

tools/licenses/lib/patterns.dart

Lines changed: 42 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,13 +1012,11 @@ final List<RegExp> csTemplateLicenses = <RegExp>[
10121012
// Seen in Mesa, among others.
10131013
RegExp(
10141014
kIndent +
1015-
(
1016-
r'(?:' // this bit is optional
1017-
r'Licensed under the MIT license:\n' // seen in expat
1018-
r'\1\2? *\n' // blank line
1019-
r'\1\2' // this is the prefix for the next block (handled by kIndent if this optional bit is skipped)
1020-
r')?' // end of optional bit
1021-
)
1015+
r'(?:' // this bit is optional
1016+
r'Licensed under the MIT license:\n' // seen in expat
1017+
r'\1\2? *\n' // blank line
1018+
r'\1\2' // this is the prefix for the next block (handled by kIndent if this optional bit is skipped)
1019+
r')?' // end of optional bit
10221020
+
10231021
(
10241022
r'Permission is hereby granted, free of charge, to any person obtaining '
@@ -1270,40 +1268,36 @@ final List<RegExp> csTemplateLicenses = <RegExp>[
12701268
// freetype2.
12711269
RegExp(
12721270
kIndent +
1273-
(
1274-
r'Permission to use, copy, modify, distribute, and sell this software and its '
1275-
r'documentation for any purpose is hereby granted without fee, provided that '
1276-
r'the above copyright notice appear in all copies and that both that '
1277-
r'copyright notice and this permission notice appear in supporting '
1278-
r'documentation\. '
1279-
r'The above copyright notice and this permission notice shall be included in '
1280-
r'all copies or substantial portions of the Software\. '
1281-
r'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR '
1282-
r'IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, '
1283-
r'FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\. IN NO EVENT SHALL THE '
1284-
r'OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN '
1285-
r'AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN '
1286-
r'CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE\. '
1287-
r'Except as contained in this notice, the name of The Open Group shall not be '
1288-
r'used in advertising or otherwise to promote the sale, use or other dealings '
1289-
r'in this Software without prior written authorization from The Open Group\. '
1290-
.replaceAll(' ', _linebreak)
1291-
),
1271+
r'Permission to use, copy, modify, distribute, and sell this software and its '
1272+
r'documentation for any purpose is hereby granted without fee, provided that '
1273+
r'the above copyright notice appear in all copies and that both that '
1274+
r'copyright notice and this permission notice appear in supporting '
1275+
r'documentation\. '
1276+
r'The above copyright notice and this permission notice shall be included in '
1277+
r'all copies or substantial portions of the Software\. '
1278+
r'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR '
1279+
r'IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, '
1280+
r'FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\. IN NO EVENT SHALL THE '
1281+
r'OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN '
1282+
r'AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN '
1283+
r'CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE\. '
1284+
r'Except as contained in this notice, the name of The Open Group shall not be '
1285+
r'used in advertising or otherwise to promote the sale, use or other dealings '
1286+
r'in this Software without prior written authorization from The Open Group\. '
1287+
.replaceAll(' ', _linebreak),
12921288
multiLine: true,
12931289
),
12941290

12951291
// libjpeg-turbo
12961292
RegExp(
12971293
kIndent +
1298-
(
1299-
r'Permission to use, copy, modify, and distribute this software and its '
1300-
r'documentation for any purpose and without fee is hereby granted, provided '
1301-
r'that the above copyright notice appear in all copies and that both that '
1302-
r'copyright notice and this permission notice appear in supporting '
1303-
r'documentation\. This software is provided "as is" without express or '
1304-
r'implied warranty\.'
1305-
.replaceAll(' ', _linebreak)
1306-
),
1294+
r'Permission to use, copy, modify, and distribute this software and its '
1295+
r'documentation for any purpose and without fee is hereby granted, provided '
1296+
r'that the above copyright notice appear in all copies and that both that '
1297+
r'copyright notice and this permission notice appear in supporting '
1298+
r'documentation\. This software is provided "as is" without express or '
1299+
r'implied warranty\.'
1300+
.replaceAll(' ', _linebreak),
13071301
multiLine: true,
13081302
),
13091303
];
@@ -1357,17 +1351,15 @@ final List<RegExp> csNoticeLicenses = <RegExp>[
13571351
// Freetype
13581352
RegExp(
13591353
kIndent +
1360-
(
1361-
r'This software was written by Alexander Peslyak in 2001\. No copyright is '
1362-
r'claimed, and the software is hereby placed in the public domain\. In case '
1363-
r'this attempt to disclaim copyright and place the software in the public '
1364-
r'domain is deemed null and void, then the software is Copyright \(c\) 2001 '
1365-
r'Alexander Peslyak and it is hereby released to the general public under the '
1366-
r'following terms: Redistribution and use in source and binary forms, with or '
1367-
r"without modification, are permitted\. There\'s ABSOLUTELY NO WARRANTY, "
1368-
r'express or implied\.(?: \(This is a heavily cut-down "BSD license"\.\))?'
1369-
.replaceAll(' ', _linebreak)
1370-
),
1354+
r'This software was written by Alexander Peslyak in 2001\. No copyright is '
1355+
r'claimed, and the software is hereby placed in the public domain\. In case '
1356+
r'this attempt to disclaim copyright and place the software in the public '
1357+
r'domain is deemed null and void, then the software is Copyright \(c\) 2001 '
1358+
r'Alexander Peslyak and it is hereby released to the general public under the '
1359+
r'following terms: Redistribution and use in source and binary forms, with or '
1360+
r"without modification, are permitted\. There\'s ABSOLUTELY NO WARRANTY, "
1361+
r'express or implied\.(?: \(This is a heavily cut-down "BSD license"\.\))?'
1362+
.replaceAll(' ', _linebreak),
13711363
multiLine: true,
13721364
),
13731365

@@ -1469,12 +1461,10 @@ final List<RegExp> csNoticeLicenses = <RegExp>[
14691461
// Seen in libjpeg-turbo (with a copyright), zlib.h
14701462
RegExp(
14711463
kIndent +
1472-
(
1473-
r" This software is provided 'as-is', without any express or implied "
1474-
r'warranty\. In no event will the authors be held liable for any damages '
1475-
r'arising from the use of this software\.'
1476-
.replaceAll(' ', _linebreak)
1477-
)
1464+
r" This software is provided 'as-is', without any express or implied "
1465+
r'warranty\. In no event will the authors be held liable for any damages '
1466+
r'arising from the use of this software\.'
1467+
.replaceAll(' ', _linebreak)
14781468
+
14791469
(
14801470
r' Permission is granted to anyone to use this software for any purpose, '

0 commit comments

Comments
 (0)