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

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

Issue 987663002: Fix for subscribing for notifications for files in packages. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Fixes for review comments. Created 5 years, 9 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/domain_execution.dart
diff --git a/pkg/analysis_server/lib/src/domain_execution.dart b/pkg/analysis_server/lib/src/domain_execution.dart
index d3323c70a15467550085d3505c1b407bba2bb508..08ff54e41f22a592e918d4d53510d70683519f7e 100644
--- a/pkg/analysis_server/lib/src/domain_execution.dart
+++ b/pkg/analysis_server/lib/src/domain_execution.dart
@@ -114,7 +114,8 @@ class ExecutionDomainHandler implements RequestHandler {
return new Response.invalidParameter(
request, 'file', 'Must not refer to a directory');
}
- Source source = server.getSource(file);
+ ContextSourcePair contextSource = server.getContextSourcePair(file);
+ Source source = contextSource.source;
uri = context.sourceFactory.restoreUri(source).toString();
return new ExecutionMapUriResult(uri: uri).toResponse(request.id);
} else if (uri != null) {
@@ -157,6 +158,9 @@ class ExecutionDomainHandler implements RequestHandler {
return;
}
AnalysisContext context = server.getAnalysisContext(filePath);
+ if (context == null) {
+ return;
+ }
if (AnalysisEngine.isDartFileName(filePath)) {
ExecutableKind kind = ExecutableKind.NOT_EXECUTABLE;
if (context.isClientLibrary(source)) {
« no previous file with comments | « pkg/analysis_server/lib/src/domain_completion.dart ('k') | pkg/analysis_server/lib/src/edit/edit_domain.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698