| 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 6d75ff6c1d8e63d041ae1688f7c9afd9af50ddf4..03c593699047a48d7d901fc68be86aed5900beff 100644
|
| --- a/pkg/analysis_server/lib/src/context_manager.dart
|
| +++ b/pkg/analysis_server/lib/src/context_manager.dart
|
| @@ -1014,7 +1014,8 @@ class ContextManagerImpl implements ContextManager {
|
| String contextRoot = info.folder.path;
|
| ContextBuilder builder =
|
| callbacks.createContextBuilder(info.folder, defaultContextOptions);
|
| - AnalysisOptions options = builder.getAnalysisOptions(contextRoot);
|
| + AnalysisOptions options = builder.getAnalysisOptions(contextRoot,
|
| + contextRoot: driver.contextRoot);
|
| SourceFactory factory =
|
| builder.createSourceFactory(contextRoot, options);
|
| driver.configure(analysisOptions: options, sourceFactory: factory);
|
| @@ -1042,7 +1043,8 @@ class ContextManagerImpl implements ContextManager {
|
| String contextRoot = info.folder.path;
|
| ContextBuilder builder =
|
| callbacks.createContextBuilder(info.folder, defaultContextOptions);
|
| - AnalysisOptions options = builder.getAnalysisOptions(contextRoot);
|
| + AnalysisOptions options = builder.getAnalysisOptions(contextRoot,
|
| + contextRoot: info.analysisDriver.contextRoot);
|
| SourceFactory factory = builder.createSourceFactory(contextRoot, options);
|
| if (enableNewAnalysisDriver) {
|
| AnalysisDriver driver = info.analysisDriver;
|
|
|