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

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

Issue 1213613017: Add support for .sdkext file to analysis server (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « no previous file | pkg/analysis_server/lib/src/sdk_ext.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6d8be8a38557f97449360be10b12b59bdfd1e46b..c6b499985a6bb3b6700d8881b79dbe65d74f9bf6 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -18,6 +18,7 @@ import 'package:analysis_server/src/operation/operation_analysis.dart';
import 'package:analysis_server/src/operation/operation_queue.dart';
import 'package:analysis_server/src/plugin/server_plugin.dart';
import 'package:analysis_server/src/protocol.dart' hide Element;
+import 'package:analysis_server/src/sdk_ext.dart';
import 'package:analysis_server/src/services/correction/namespace.dart';
import 'package:analysis_server/src/services/index/index.dart';
import 'package:analysis_server/src/services/search/search_engine.dart';
@@ -25,6 +26,7 @@ import 'package:analysis_server/src/source/optimizing_pub_package_map_provider.d
import 'package:analysis_server/uri/resolver_provider.dart';
import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/instrumentation/instrumentation.dart';
+import 'package:analyzer/source/package_map_resolver.dart';
import 'package:analyzer/src/generated/ast.dart';
import 'package:analyzer/src/generated/element.dart';
import 'package:analyzer/src/generated/engine.dart';
@@ -1429,9 +1431,17 @@ class ServerContextManager extends ContextManager {
SourceFactory _createSourceFactory(UriResolver packageUriResolver) {
UriResolver dartResolver = new DartUriResolver(analysisServer.defaultSdk);
UriResolver resourceResolver = new ResourceUriResolver(resourceProvider);
- List<UriResolver> resolvers = packageUriResolver != null
- ? <UriResolver>[dartResolver, packageUriResolver, resourceResolver]
- : <UriResolver>[dartResolver, resourceResolver];
+ List<UriResolver> resolvers = [];
+ resolvers.add(dartResolver);
+ if (packageUriResolver is PackageMapUriResolver) {
+ UriResolver sdkExtResolver =
+ new SdkExtUriResolver(packageUriResolver.packageMap);
+ resolvers.add(sdkExtResolver);
+ }
+ if (packageUriResolver != null) {
+ resolvers.add(packageUriResolver);
+ }
+ resolvers.add(resourceResolver);
return new SourceFactory(resolvers);
}
}
« no previous file with comments | « no previous file | pkg/analysis_server/lib/src/sdk_ext.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698