Index: pkg/analysis_server/lib/src/server/driver.dart |
diff --git a/pkg/analysis_server/lib/src/server/driver.dart b/pkg/analysis_server/lib/src/server/driver.dart |
index 45a543cdc2d59a50ff08954456faa49bd4ea8df0..30215da4657b28f4546edd730966b80b0368466c 100644 |
--- a/pkg/analysis_server/lib/src/server/driver.dart |
+++ b/pkg/analysis_server/lib/src/server/driver.dart |
@@ -241,12 +241,6 @@ class Driver implements ServerStarter { |
"incremental-resolution-validation"; |
/** |
- * The name of the option used to disable using the new analysis driver. |
- */ |
- static const String DISABLE_NEW_ANALYSIS_DRIVER = |
- 'disable-new-analysis-driver'; |
- |
- /** |
* The name of the option used to cause instrumentation to also be written to |
* a local file. |
*/ |
@@ -382,8 +376,6 @@ class Driver implements ServerStarter { |
results[ENABLE_INCREMENTAL_RESOLUTION_API]; |
analysisServerOptions.enableIncrementalResolutionValidation = |
results[INCREMENTAL_RESOLUTION_VALIDATION]; |
- analysisServerOptions.enableNewAnalysisDriver = |
- !results[DISABLE_NEW_ANALYSIS_DRIVER]; |
analysisServerOptions.useAnalysisHighlight2 = |
results[USE_ANALYSIS_HIGHLIGHT2]; |
analysisServerOptions.fileReadMode = results[FILE_READ_MODE]; |
@@ -421,12 +413,10 @@ class Driver implements ServerStarter { |
.defaultSdkDirectory(PhysicalResourceProvider.INSTANCE) |
.path; |
} |
- bool useSummaries = analysisServerOptions.fileReadMode == 'as-is' || |
- analysisServerOptions.enableNewAnalysisDriver; |
// TODO(brianwilkerson) It would be nice to avoid creating an SDK that |
// cannot be re-used, but the SDK is needed to create a package map provider |
// in the case where we need to run `pub` in order to get the package map. |
- DartSdk defaultSdk = _createDefaultSdk(defaultSdkPath, useSummaries); |
+ DartSdk defaultSdk = _createDefaultSdk(defaultSdkPath, true); |
// |
// Initialize the instrumentation service. |
// |
@@ -457,7 +447,7 @@ class Driver implements ServerStarter { |
// |
socketServer = new SocketServer( |
analysisServerOptions, |
- new DartSdkManager(defaultSdkPath, useSummaries), |
+ new DartSdkManager(defaultSdkPath, true), |
defaultSdk, |
instrumentationService, |
diagnosticServer, |
@@ -545,10 +535,6 @@ class Driver implements ServerStarter { |
help: "enable validation of incremental resolution results (slow)", |
defaultsTo: false, |
negatable: false); |
- parser.addFlag(DISABLE_NEW_ANALYSIS_DRIVER, |
- help: "disable using new analysis driver", |
- defaultsTo: false, |
- negatable: false); |
parser.addOption(INSTRUMENTATION_LOG_FILE, |
help: |
"the path of the file to which instrumentation data will be written"); |