diff --git a/DEPS b/DEPS
index 15e3e34bf086..6b53741b0a51 100644
--- a/DEPS
+++ b/DEPS
@@ -131,7 +131,7 @@ vars = {
   "clock_rev": "7cbf08e36a92f14f22132d255846610c1b065324",
   "collection_rev": "586a5e841fad5572beae421ef9902ba7ceab1292",
   "convert_rev": "302af1b7d7dffe5bc1f85a6f1b0958b9de920cd7",
-  "crypto_rev": "0a10171a7983cd84b318edf3086f751542500a13",
+  "crypto_rev": "7a9428a78962783f6081dc42465ed580cff225ca",
   "csslib_rev": "23c314bb6b247a71348cfb0987ba0eb29574abb6",
   # Note: Updates to dart_style have to be coordinated with the infrastructure
   # team so that the internal formatter `tools/sdks/dart-sdk/bin/dart format`
@@ -144,21 +144,21 @@ vars = {
   #
   # For more details, see https://github.com/dart-lang/sdk/issues/30164.
   "dart_style_rev": "a6ad7693555a9add6f98ad6fd94de80d35c89415", # disable tools/rev_sdk_deps.dart
-  "dartdoc_rev": "45627f92f7e4d377930925ea1ea6a3ed808b34cd",
+  "dartdoc_rev": "ddb8fb4410797f34d4c2245038f051683dd062a8",
   "ecosystem_rev": "bc25c0cb80415fb711b9413d809c23fad9635616",
   "file_rev": "07cacaed6679a173e29176747e6ce0325742749f",
   "fixnum_rev": "a8157d87f17d5184e210403f2ed63d354b854132",
   "flute_rev": "a531c96a8b43d015c6bfbbfe3ab54867b0763b8b",
   "glob_rev": "eaec6a448576048b748475d80bfac2795ad5a267",
   "html_rev": "3bc803d7e655491b243418f19300ef0c6112bcea",
-  "http_rev": "7bfbeea6324e3dd34b93d3b4756df0c03bf243f4",
+  "http_rev": "a3567f83db01d55c0c8248b7298830410b5b297b",
   "http_multi_server_rev": "25941e260658efb324de857e6022f418faf9bdd1",
   "http_parser_rev": "551e0e470bc7406f5400c55b6f95ee205ad18825",
   "intl_rev": "5d65e3808ce40e6282e40881492607df4e35669f",
   "json_rpc_2_rev": "5b1cbd679756700d5f319bf10a217da53e98ea52",
   "leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # manually rolled
   "lints_rev": "baaaa5616370243c3c8c6a9f67fb83d26bdac552",
-  "logging_rev": "73f043a45b23bb6d397b5ac784cf562e9ccb295b",
+  "logging_rev": "dbd682919708316e9a6d1e2fa472c9ad9225c2b4",
   "markdown_rev": "3d8d7a8f14b74bb646bb6e4ae35e0bf2beb74154",
   "matcher_rev": "0abd4054c47a923486a6c0c04b5c974ba13ad2da",
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
@@ -182,21 +182,21 @@ vars = {
   "sync_http_rev": "7622bdd07501f3f279212e355325b7c84a2b0a08",
   "tar_rev": "b62573f39a4de28f69d9ed82b02fbd96b12b9633",
   "term_glyph_rev": "c86e8171ee7e9f6fc8e775e0be755a603dd0b72d",
-  "test_rev": "2464ad5c5945c98edd33fb69b3616a14771f1c8d",
+  "test_rev": "83c597e58046e60c40efc8095c8e44271c559d61",
   "test_descriptor_rev": "b23d7ccb0f9882e161fb4dea75b2237bf428432b",
   "test_process_rev": "862eaf3b825f5e97b278d84a2afbe81b3e8a1683",
   "test_reflective_loader_rev": "816942eaeeac30cc59d8699f1e94ad779cc53c06",
-  "tools_rev": "86b3661fc4ccbcda5b662ff3075177448eeeba11",
+  "tools_rev": "4321aecf2cb618dceab5d90adf0cb2ef7207169c",
   "typed_data_rev": "d14f9654f7a5d6baa7dcc27691bd0fa56769fb67",
   "vector_math_rev": "3c03ac3b370f6d11d943d3f5a933ba6cf2526d85",
   "watcher_rev": "c00fc2a6cd869cdebbc52e00af3d912d25745729",
   "web_rev": "2fe754fb396cb9b87010f0318cfbfc5408346c48",
-  "web_socket_channel_rev": "45b8ce9ce9fb5194a24d3dff8913c573fbe7896a",
-  "webdev_rev": "a97c2a1f074209584e7a6a4923d2ca029411f718",
+  "web_socket_channel_rev": "bf69990738f173c07e67cf6945551194bc8c2d92",
+  "webdev_rev": "9ada46fc00f4052a02b1816c534f2df67d2efc1b",
   "webdriver_rev": "f85779edd7c9f66198d4391ed3631db1d97a5b11",
   "webkit_inspection_protocol_rev": "5740cc91eaeb13a02007b77b128fccf4b056db6e",
   "yaml_rev": "7873b3fb9f16ec83bc7778fed58615fa91f1f042",
-  "yaml_edit_rev": "963e7a31efc7e2f24e409f239106f1ed1c6fee35",
+  "yaml_edit_rev": "08a146ef8f2c7aba908d2017c9ec840b882c9e51",
 
   # Windows deps
   "crashpad_rev": "bf327d8ceb6a669607b0dbab5a83a275d03f99ed",
diff --git a/pkg/analysis_server/test/src/services/correction/fix/ignore_diagnostic_test.dart b/pkg/analysis_server/test/src/services/correction/fix/ignore_diagnostic_test.dart
index 76214ebccdbb..10a65e31ab33 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/ignore_diagnostic_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/ignore_diagnostic_test.dart
@@ -10,14 +10,14 @@ import 'fix_processor.dart';
 
 void main() {
   defineReflectiveSuite(() {
-    defineReflectiveTests(IgnoreDiagnosticAnaylsisOptionFileTest);
+    defineReflectiveTests(IgnoreDiagnosticAnalysisOptionFileTest);
     defineReflectiveTests(IgnoreDiagnosticLineTest);
     defineReflectiveTests(IgnoreDiagnosticFileTest);
   });
 }
 
 @reflectiveTest
-class IgnoreDiagnosticAnaylsisOptionFileTest extends FixProcessorTest {
+class IgnoreDiagnosticAnalysisOptionFileTest extends FixProcessorTest {
   @override
   FixKind get kind => DartFixKind.IGNORE_ERROR_ANALYSIS_FILE;
 
@@ -171,10 +171,10 @@ include: package:lints/recommended.yaml
   ''');
     await assertHasFix(
       '''
+include: package:lints/recommended.yaml
 analyzer:
   errors:
     unused_local_variable: ignore
-include: package:lints/recommended.yaml
 ''',
       target: analysisOptionsPath,
     );