development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-14 04:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the whitespace check. (#20059)

Browse source 
I switched to just checking for spaces and tabs, since otherwise it expresses a preference for line endings that I think should be taken care of at the git level (and I think they are).

I also fixed a bug where I was looking for ".yml" instead of "*.yml" files, and clarified an output message.
This commit is contained in:
Greg Spencer 2018-07-31 20:54:37 -07:00 committed by GitHub
parent e816f64bf2
commit 2a66fd34a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dev/bots/test.dart
View file

@ -128,18 +128,18 @@ Future<Null> _checkForTrailingSpaces() async {
? Platform.environment['TEST_COMMIT_RANGE'] ? Platform.environment['TEST_COMMIT_RANGE']
: await _getCommitRange(); : await _getCommitRange();
final List<String> fileTypes = <String>[ final List<String> fileTypes = <String>[
'*.dart', '*.cxx', '*.cpp', '*.cc', '*.c', '*.C', '*.h', '*.java', '*.mm', '*.m', '.yml', '*.dart', '*.cxx', '*.cpp', '*.cc', '*.c', '*.C', '*.h', '*.java', '*.mm', '*.m', '*.yml',
]; ];
final EvalResult changedFilesResult = await _evalCommand( final EvalResult changedFilesResult = await _evalCommand(
'git', <String>['diff', '-U0', '--no-color', '--name-only', commitRange, '--'] + fileTypes, 'git', <String>['diff', '-U0', '--no-color', '--name-only', commitRange, '--'] + fileTypes,
workingDirectory: flutterRoot, workingDirectory: flutterRoot,
); );
if (changedFilesResult.stdout == null) { if (changedFilesResult.stdout == null) {
print('No Results for whitespace check.'); print('No files found that need to be checked for trailing whitespace.');
return; return;
} }
// Only include files that actually exist, so that we don't try and grep for // Only include files that actually exist, so that we don't try and grep for
// nonexistent files (can occur when files are deleted or moved). // nonexistent files, which can occur when files are deleted or moved.
final List<String> changedFiles = changedFilesResult.stdout.split('\n').where((String filename) { final List<String> changedFiles = changedFilesResult.stdout.split('\n').where((String filename) {
return new File(filename).existsSync(); return new File(filename).existsSync();
}).toList(); }).toList();
@ -148,7 +148,7 @@ Future<Null> _checkForTrailingSpaces() async {
<String>[ <String>[
'--line-number', '--line-number',
'--extended-regexp', '--extended-regexp',
r'[[:space:]]+$', r'[[:blank:]]$',
] + changedFiles, ] + changedFiles,
workingDirectory: flutterRoot, workingDirectory: flutterRoot,
failureMessage: '${red}Whitespace detected at the end of source code lines.$reset\nPlease remove:', failureMessage: '${red}Whitespace detected at the end of source code lines.$reset\nPlease remove:',