languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 04:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for duplicate priority sources.

Browse source 
R=brianwilkerson@google.com
BUG=

Review URL: https://codereview.chromium.org/1408163008 .
This commit is contained in:
Konstantin Shcheglov 2015-10-29 17:46:00 -07:00
parent e84f9941e1
commit 03eed1c3c9
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/analysis_server/lib/src/analysis_server.dart
View file

@ -1085,7 +1085,8 @@ class AnalysisServer {
contextFound = true;
}
for (AnalysisContext context in folderMap.values) {
if (context.getKindOf(source) != SourceKind.UNKNOWN) {
if (context != preferredContext &&
context.getKindOf(source) != SourceKind.UNKNOWN) {
sourceMap.putIfAbsent(context, () => <Source>[]).add(source);
contextFound = true;
}

20
pkg/analysis_server/test/analysis/set_priority_files_test.dart
View file

@ -6,6 +6,9 @@ library test.analysis.set_priority_files;
import 'package:analysis_server/plugin/protocol/protocol.dart';
import 'package:analysis_server/src/domain_analysis.dart';
import 'package:analyzer/src/generated/engine.dart'
show InternalAnalysisContext;
import 'package:analyzer/src/generated/source.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import 'package:unittest/unittest.dart';
@ -35,15 +38,30 @@ class SetPriorityFilesTest extends AbstractAnalysisTest {
test_fileInAnalysisRoot() async {
addTestFile('');
// wait for analysis to ensure that the file is known to the context
await server.onAnalysisComplete;
// set priority files
Response response = await _setPriorityFile(testFile);
expect(response, isResponseSuccess('0'));
// verify
InternalAnalysisContext context = server.getContainingContext(testFile);
List<Source> prioritySources = context.prioritySources;
expect(prioritySources, hasLength(1));
expect(prioritySources.first.fullName, testFile);
}
test_fileInSdk() async {
addTestFile('');
await server.onAnalysisComplete;
Response response = await _setPriorityFile('/lib/convert/convert.dart');
// set priority files
String filePath = '/lib/convert/convert.dart';
Response response = await _setPriorityFile(filePath);
expect(response, isResponseSuccess('0'));
// verify
InternalAnalysisContext sdkContext = server.defaultSdk.context;
List<Source> prioritySources = sdkContext.prioritySources;
expect(prioritySources, hasLength(1));
expect(prioritySources.first.fullName, filePath);
}
test_fileNotInAnalysisRoot() async {