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

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

Issue 2612783004: processOptionsForDriver() is never called with 'optionsRemoved'. (Closed)
Patch Set: Created 3 years, 11 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 | no next file » | 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 b16e78201c69cdf26d8840764337e3080c0144ea..dc318fcb44d1afa3d2d4b590951da4e4c4f6a139 100644
--- a/pkg/analysis_server/lib/src/context_manager.dart
+++ b/pkg/analysis_server/lib/src/context_manager.dart
@@ -716,38 +716,20 @@ class ContextManagerImpl implements ContextManager {
/**
* Process [options] for the given context [info].
*/
- void processOptionsForDriver(ContextInfo info, Map<String, Object> options,
- {bool optionsRemoved: false}) {
- if (options == null && !optionsRemoved) {
+ void processOptionsForDriver(ContextInfo info, Map<String, Object> options) {
+ if (options == null) {
return;
}
AnalysisOptionsImpl analysisOptions = info.analysisDriver.analysisOptions;
- // In case options files are removed, revert to defaults.
- if (optionsRemoved) {
- // Start with defaults.
- analysisOptions.resetToDefaults();
-
- // Apply inherited options.
- options = _toStringMap(_getEmbeddedOptions(info));
- if (options != null) {
- applyToAnalysisOptions(analysisOptions, options);
- }
- } else {
- // Check for embedded options.
- Map embeddedOptions = _getEmbeddedOptions(info);
- if (embeddedOptions != null) {
- options = _toStringMap(new Merger().merge(embeddedOptions, options));
- }
+ // Check for embedded options.
+ Map embeddedOptions = _getEmbeddedOptions(info);
+ if (embeddedOptions != null) {
+ options = _toStringMap(new Merger().merge(embeddedOptions, options));
}
applyToAnalysisOptions(analysisOptions, options);
- // Nothing more to do.
- if (options == null) {
- return;
- }
-
var analyzer = options[AnalyzerOptions.analyzer];
if (analyzer is Map) {
// Set ignore patterns.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698