firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2234 from Hixie/analyzer

Browse Source 
Handle lines getting shorter during analysis
This commit is contained in:
Ian Hickson 2016-02-26 17:47:21 -08:00
commit b18047bfb3
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/flutter_tools/lib/src/commands/analyze.dart
View File

@ -76,6 +76,8 @@ bool _addPackage(String directoryPath, List<String> dartFiles, Set<String> pubSp
return false; return false;
} }
class FileChanged { }
class AnalyzeCommand extends FlutterCommand { class AnalyzeCommand extends FlutterCommand {
String get name => 'analyze'; String get name => 'analyze';
String get description => 'Analyze the project\'s Dart code.'; String get description => 'Analyze the project\'s Dart code.';
@ -360,6 +362,8 @@ linter:
RegExp ignorePattern = new RegExp(r'// analyzer says "([^"]+)"'); RegExp ignorePattern = new RegExp(r'// analyzer says "([^"]+)"');
RegExp conflictingNamesPattern = new RegExp('^The imported libraries \'([^\']+)\' and \'([^\']+)\' cannot have the same name \'([^\']+)\'\$'); RegExp conflictingNamesPattern = new RegExp('^The imported libraries \'([^\']+)\' and \'([^\']+)\' cannot have the same name \'([^\']+)\'\$');
Set<String> changedFiles = new Set<String>(); // files about which we've complained that they changed
List<String> errorLines = output.toString().split('\n'); List<String> errorLines = output.toString().split('\n');
for (String errorLine in errorLines) { for (String errorLine in errorLines) {
if (patternsToSkip.every((Pattern pattern) => pattern.allMatches(errorLine).isEmpty)) { if (patternsToSkip.every((Pattern pattern) => pattern.allMatches(errorLine).isEmpty)) {
@ -372,7 +376,20 @@ linter:
int colNumber = int.parse(groups[5]); int colNumber = int.parse(groups[5]);
File source = new File(filename); File source = new File(filename);
List<String> sourceLines = source.readAsLinesSync(); List<String> sourceLines = source.readAsLinesSync();
String sourceLine = (lineNumber < sourceLines.length) ? sourceLines[lineNumber-1] : ''; String sourceLine;
try {
if (lineNumber > sourceLines.length)
throw new FileChanged();
sourceLine = sourceLines[lineNumber-1];
if (colNumber > sourceLine.length)
throw new FileChanged();
} on FileChanged {
if (changedFiles.add(filename))
printError('[warning] File shrank during analysis ($filename)');
sourceLine = '';
lineNumber = 1;
colNumber = 1;
}
bool shouldIgnore = false; bool shouldIgnore = false;
if (filename == mainFile.path) { if (filename == mainFile.path) {
Match libs = conflictingNamesPattern.firstMatch(errorMessage); Match libs = conflictingNamesPattern.firstMatch(errorMessage);
@ -423,3 +440,4 @@ linter:
return 0; return 0;
} }
} }