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

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

Issue 2075663002: Remove hook for setting a provider for an EmbedderUriResolver (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 4 years, 6 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 | « pkg/analysis_server/lib/src/analysis_server.dart ('k') | pkg/analysis_server/lib/src/server/driver.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/lib/src/context_manager.dart
diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart
index 44c3595a8a48b6a15d2afa89a2c7f2dc5a786f48..630da7d205e5e0421589ae9d2bd72060e90c1fa0 100644
--- a/pkg/analysis_server/lib/src/context_manager.dart
+++ b/pkg/analysis_server/lib/src/context_manager.dart
@@ -12,7 +12,6 @@ import 'dart:core' hide Resource;
import 'package:analysis_server/src/analysis_server.dart';
import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/instrumentation/instrumentation.dart';
-import 'package:analyzer/plugin/embedded_resolver_provider.dart';
import 'package:analyzer/plugin/options.dart';
import 'package:analyzer/plugin/resolver_provider.dart';
import 'package:analyzer/source/analysis_options_provider.dart';
@@ -408,13 +407,6 @@ class ContextManagerImpl implements ContextManager {
pathos.Context pathContext;
/**
- * A function that will return a [UriResolver] that can be used to resolve
- * URI's for embedded libraries within a given folder, or `null` if we should
- * fall back to the standard URI resolver.
- */
- final EmbeddedResolverProvider embeddedUriResolverProvider;
-
- /**
* The list of excluded paths (folders and files) most recently passed to
* [setRoots].
*/
@@ -496,7 +488,6 @@ class ContextManagerImpl implements ContextManager {
this.resourceProvider,
this.sdkManager,
this.packageResolverProvider,
- this.embeddedUriResolverProvider,
this._packageMapProvider,
this.analyzedFilesGlobs,
this._instrumentationService,
@@ -1166,15 +1157,7 @@ class ContextManagerImpl implements ContextManager {
List<UriResolver> packageUriResolvers =
disposition.createPackageUriResolvers(resourceProvider);
- EmbedderUriResolver embedderUriResolver;
-
- // First check for a resolver provider.
- if (embeddedUriResolverProvider != null) {
- embedderUriResolver = embeddedUriResolverProvider(folder);
- }
-
- // If no embedded URI resolver was provided, defer to a locator-backed one.
- embedderUriResolver ??=
+ EmbedderUriResolver embedderUriResolver =
new EmbedderUriResolver(context.embedderYamlLocator.embedderYamls);
if (embedderUriResolver.length == 0) {
// The embedder uri resolver has no mappings. Use the default Dart SDK
« no previous file with comments | « pkg/analysis_server/lib/src/analysis_server.dart ('k') | pkg/analysis_server/lib/src/server/driver.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698