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

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

Issue 1686613002: Use different SDKs based on option settings (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 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/context_manager.dart
diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart
index efd0301684742fc234eb481141274444cb604d55..cfeb73c250d3e134741fb1c181902cd215f67941 100644
--- a/pkg/analysis_server/lib/src/context_manager.dart
+++ b/pkg/analysis_server/lib/src/context_manager.dart
@@ -306,10 +306,18 @@ abstract class ContextManager {
*/
abstract class ContextManagerCallbacks {
/**
- * Create and return a new analysis context, allowing [disposition] to govern
- * details of how the context is to be created.
+ * Return the default analysis options to be used when creating an analysis
+ * context.
*/
- AnalysisContext addContext(Folder folder, FolderDisposition disposition);
+ AnalysisOptions get defaultAnalysisOptions;
+
+ /**
+ * Create and return a new analysis context rooted at the given [folder], with
+ * the given analysis [options], allowing [disposition] to govern details of
+ * how the context is to be created.
+ */
+ AnalysisContext addContext(
+ Folder folder, AnalysisOptions options, FolderDisposition disposition);
/**
* Called when the set of files associated with a context have changed (or
@@ -549,15 +557,8 @@ class ContextManagerImpl implements ContextManager {
/**
* Process [options] for the given context [info].
*/
- void processOptionsForContext(ContextInfo info, Folder folder,
+ void processOptionsForContext(ContextInfo info, Map<String, Object> options,
{bool optionsRemoved: false}) {
- Map<String, Object> options;
- try {
- options = analysisOptionsProvider.getOptions(folder);
- } catch (_) {
- // Parse errors are reported by GenerateOptionsErrorsTask.
- }
-
if (options == null && !optionsRemoved) {
return;
}
@@ -612,6 +613,20 @@ class ContextManagerImpl implements ContextManager {
}
}
+ /**
+ * Return the options from the analysis options file in the given [folder], or
+ * `null` if there is no file in the folder or if the contents of the file are
+ * not valid YAML.
+ */
+ Map<String, Object> readOptions(Folder folder) {
+ try {
+ return analysisOptionsProvider.getOptions(folder);
+ } catch (_) {
+ // Parse errors are reported by GenerateOptionsErrorsTask.
+ }
+ return null;
+ }
+
@override
void refresh(List<Resource> roots) {
// Destroy old contexts
@@ -834,7 +849,11 @@ class ContextManagerImpl implements ContextManager {
if (AnalysisEngine.isAnalysisOptionsFileName(path, pathContext)) {
var analysisContext = info.context;
if (analysisContext is context.AnalysisContextImpl) {
- processOptionsForContext(info, info.folder,
+ // TODO(brianwilkerson) This doesn't correctly update the source factory
+ // if the changes necessitate it (such as by changing the setting of the
+ // strong-mode option).
+ Map<String, Object> options = readOptions(info.folder);
+ processOptionsForContext(info, options,
optionsRemoved: changeType == ChangeType.REMOVE);
analysisContext.invalidateCachedResults();
callbacks.applyChangesToContext(info.folder, new ChangeSet());
@@ -975,11 +994,16 @@ class ContextManagerImpl implements ContextManager {
_computeFolderDisposition(folder, dependencies.add, packagespecFile);
}
+ Map<String, Object> optionMap = readOptions(info.folder);
+ AnalysisOptions options =
+ new AnalysisOptionsImpl.from(callbacks.defaultAnalysisOptions);
+ applyToAnalysisOptions(options, optionMap);
+
info.setDependencies(dependencies);
- info.context = callbacks.addContext(folder, disposition);
+ info.context = callbacks.addContext(folder, options, disposition);
info.context.name = folder.path;
- processOptionsForContext(info, folder);
+ processOptionsForContext(info, optionMap);
return info;
}

Powered by Google App Engine
This is Rietveld 408576698