NotificationsYou must be signed in to change notification settings
Fork2
Star0

Commit3d3ab7b

authored

[tool] Allow blank lines in federated package changes (flutter#8468)

Currently the special-casing for allowing comment-only changes to other packages in a plugin group as part of a single PR, which is necessary for some changes to add `// ignore` directives, allows comment lines, but not blank lines. Blank lines should be allowed since they are safe, and are expected for certain changes (notably, temporary file-level ignores).

1 parente8f1f63 commit3d3ab7bCopy full SHA for 3d3ab7b

File tree

2 files changed

-3

lines changed

script/tool
- lib/src
  - federation_safety_check_command.dart
- test
  - federation_safety_check_command_test.dart

2 files changed

-3

lines changed

`‎script/tool/lib/src/federation_safety_check_command.dart‎`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -212,18 +212,19 @@ class FederationSafetyCheckCommand extends PackageLoopingCommand {`
`212`	`212`	`Future<bool>_changeIsCommentOnly(`
`213`	`213`	`GitVersionFinder git,String repoPath)async {`
`214`	`214`	`finalList<String> diff=await git.getDiffContents(targetPath: repoPath);`
`215`		`-finalRegExp changeLine=RegExp(r'^[+-]');`
	`215`	`+finalRegExp changeLine=RegExp(r'^[+-]');`
`216`	`216`	`// This will not catch /**/-style comments, but false negatives are fine`
`217`	`217`	`// (and in practice, we almost never use that comment style in Dart code).`
`218`	`218`	`finalRegExp commentLine=RegExp(r'^[+-]\s*//');`
	`219`	`+finalRegExp blankLine=RegExp(r'^[+-]\s*$');`
`219`	`220`	`bool foundComment=false;`
`220`	`221`	`for (finalString linein diff) {`
`221`	`222`	`if (!changeLine.hasMatch(line)\|\|`
`222`	`223`	`line.startsWith('--- ')\|\|`
`223`	`224`	`line.startsWith('+++ ')) {`
`224`	`225`	`continue;`
`225`	`226`	`}`
`226`		`-if (!commentLine.hasMatch(line)) {`
	`227`	`+if (!(commentLine.hasMatch(line)\|\| blankLine.hasMatch(line))) {`
`227`	`228`	`returnfalse;`
`228`	`229`	`}`
`229`	`230`	`foundComment=true;`

`‎script/tool/test/federation_safety_check_command_test.dart‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -446,10 +446,12 @@ diff --git a/packages/foo/foo_bar/lib/foo.dart b/packages/foo/foo_bar/lib/foo.da`
`446`	`446`	`index abc123..def456 100644`
`447`	`447`	`--- a/packages/foo/foo_bar/lib/foo.dart`
`448`	`448`	`+++ b/packages/foo/foo_bar/lib/foo.dart`
`449`		`-@@ -51,6 +51,7 @@ Future<bool> launchUrl(`
	`449`	`+@@ -51,6 +51,9 @@ Future<bool> launchUrl(`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`void foo() {`
	`453`	`++ // blank lines should also be allowed as part of comment changes.`
	`454`	`++`
`453`	`455`	`+ // ignore: exhaustive_cases`
`454`	`456`	`switch(a_foo) {`
`455`	`457`	`case a:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit3d3ab7b

File tree

2 files changed

2 files changed

`‎script/tool/lib/src/federation_safety_check_command.dart‎`

`‎script/tool/test/federation_safety_check_command_test.dart‎`

0 commit comments