languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-07-20 05:57:16 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "Do nothing if [changeFile] reported, but the file content is the same."

Browse source 
This reverts commit 1ffda5601b.

There is a bug with reporting changeFile() twice, first time the change
be noticed and the file content hash updated. But the second time the
content hash is the same, and we unschedule the file from analysis :-(

R=brianwilkerson@google.com, paulberry@google.com
BUG=

Review URL: https://codereview.chromium.org/2462743003 .
This commit is contained in:
Konstantin Shcheglov 2016-10-28 18:06:46 -07:00
parent 1ffda5601b
commit 1bdee25bdf
2 changed files with 8 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkg/analyzer/lib/src/dart/analysis/driver.dart
View file

@ -208,6 +208,12 @@ class AnalysisDriver {
* "analyzing" and an analysis result is produced for every added file prior
* to the next time the analysis state transitions to "idle".
*
* At least one analysis result is produced for every file passed to
* [addFile] or [changeFile] prior to the next time the analysis state
* transitions to "idle", unless the file is later removed from analysis
* using [removeFile]. Analysis results for other files are produced only if
* the changes affect analysis results of other files.
*
* More than one result might be produced for the same file, even if the
* client does not change the state of the files.
*
@ -299,11 +305,6 @@ class AnalysisDriver {
* The [path] must be absolute and normalized.
*
* The results of analysis are eventually produced by the [results] stream.
*
* Causes the analysis state to transition to "analyzing" (if it is not in
* that state already). At least one analysis result will be produced the
* file prior to the next time the analysis state transitions to "idle",
* unless the file is later removed from analysis using [removeFile].
*/
void addFile(String path) {
_explicitFiles.add(path);
@ -325,11 +326,6 @@ class AnalysisDriver {
* into the current file state prior to the next time the analysis state
* transitions to "idle".
*
* If the file content is the same, no new results will be produced because
* of this notification, including no result for the file itself. Otherwise,
* one or more results will be produced - for the file itself and other
* files that that change in the file might affect.
*
* Invocation of this method will not prevent a [Future] returned from
* [getResult] from completing with a result, but the result is not
* guaranteed to be consistent with the new current file state after this
@ -685,22 +681,16 @@ class AnalysisDriver {
*/
void _verifyApiSignatureOfChangedFile(String path) {
_logger.run('Verify API signature of $path', () {
String oldContentHash = _fileContentHashMap[path];
String oldSignature = _fileApiSignatureMap[path];
// Compute the new API signature.
// _File.forResolution() also updates the content hash in the cache.
Source source = _sourceForPath(path);
_File newFile = new _File.forResolution(this, source);
// If the file content hash is the same, we don't need analyzing it.
if (newFile.contentHash == oldContentHash) {
_filesToAnalyze.remove(path);
return;
}
String newSignature = newFile.unlinked.apiSignature;
// If the old API signature is not null, then the file was used to
// compute at least one dependency signature. If the new API signature
// is different, then potentially all dependency signatures and
// resolution results are invalid.
String newSignature = newFile.unlinked.apiSignature;
if (oldSignature != null && oldSignature != newSignature) {
_logger.writeln('API signatures mismatch found for $newFile');
_dependencySignatureMap.clear();

26
pkg/analyzer/test/src/dart/analysis/driver_test.dart
View file

@ -77,7 +77,7 @@ class DriverTest {
})
], null, provider),
new AnalysisOptionsImpl()..strongMode = true);
driver.status.listen((status) {
driver.status.lastWhere((status) {
allStatuses.add(status);
if (status.isIdle) {
idleStatusMonitor.notify();
@ -141,30 +141,6 @@ var A = B;
}
}
test_changeFile_noContentChange_noNewResult() async {
_addTestFile('main() {}', priority: true);
// Initial analysis.
await _waitForIdle();
expect(allResults, hasLength(1));
// Update the file, but don't notify the driver.
// Don't update the file in the file system.
// But tell the driver the the file was changed.
// The driver should eventually check the file and ignore.
allStatuses.clear();
allResults.clear();
driver.changeFile(testFile);
// The driver switched to analysis and back to idle.
await _waitForIdle();
expect(allStatuses, hasLength(2));
expect(allStatuses.map((status) => status.isAnalyzing), [true, false]);
// No new results.
expect(allResults, isEmpty);
}
test_changeFile_selfConsistent() async {
var a = _p('/test/lib/a.dart');
var b = _p('/test/lib/b.dart');