Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: pkg/analysis_server/lib/src/analysis_server.dart

Issue 449583003: Fix for opening SDK sources. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/lib/src/analysis_server.dart
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
index 280105c93a32eea70220f4bd9d05e6c60d82b8ab..22151d424a7f50434e8138bc71338963377e1aa9 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -29,6 +29,7 @@ import 'package:analysis_services/constants.dart';
import 'package:analysis_services/index/index.dart';
import 'package:analysis_services/search/search_engine.dart';
import 'package:analyzer/src/generated/element.dart';
+import 'package:path/path.dart';
class AnalysisServerContextDirectoryManager extends ContextDirectoryManager {
@@ -536,11 +537,22 @@ class AnalysisServer {
* Return `null` if there is no such context.
*/
AnalysisContext getAnalysisContext(String path) {
+ // try to find a containing context
for (Folder folder in folderMap.keys) {
if (path.startsWith(folder.path)) {
return folderMap[folder];
}
}
+ // check if there is a context that analyzed this source
+ {
+ Source source = getSource(path);
+ for (AnalysisContext context in folderMap.values) {
+ SourceKind kind = context.getKindOf(source);
+ if (kind != null) {
+ return context;
+ }
+ }
+ }
return null;
}
@@ -548,6 +560,15 @@ class AnalysisServer {
* Return the [Source] of the Dart file with the given [path].
*/
Source getSource(String path) {
+ // try SDK
+ {
+ Uri uri = toUri(path);
+ Source sdkSource = defaultSdk.fromFileUri(uri);
+ if (sdkSource != null) {
+ return sdkSource;
+ }
+ }
+ // file-based source
File file = contextDirectoryManager.resourceProvider.getResource(path);
return file.createSource();
}

Powered by Google App Engine
This is Rietveld 408576698