Version 3.5.0-266.0.dev

Merge ff733cc into dev
dart-lang · Jun 14, 2024 · dca20ab · dca20ab
2 parents bc00e41 + ff733cc
commit dca20ab
Show file tree

Hide file tree

Showing 9 changed files with 492 additions and 427 deletions.
diff --git a/DEPS b/DEPS
@@ -129,7 +129,7 @@ vars = {
   "characters_rev": "7633a16a22c626e19ca750223237396315268a06",
   "cli_util_rev": "c37d5e14f50e72a268c1ad86149cecfa4b58c494",
   "clock_rev": "7cbf08e36a92f14f22132d255846610c1b065324",
-  "collection_rev": "c90b19f07b48391f3b1b4c39dd06ef0177f8e07c",
+  "collection_rev": "9354f386de3c57f5486b01ab4dfa1a2f033307d9",
   "convert_rev": "0c9eab7d4656be97329c4970659afd53a78910e6",
   "crypto_rev": "813e35e913d12e16de67ac57523cd0ff4b07c012",
   "csslib_rev": "23c314bb6b247a71348cfb0987ba0eb29574abb6",
@@ -151,9 +151,9 @@ vars = {
   "flute_rev": "a531c96a8b43d015c6bfbbfe3ab54867b0763b8b",
   "glob_rev": "eaec6a448576048b748475d80bfac2795ad5a267",
   "html_rev": "3bc803d7e655491b243418f19300ef0c6112bcea",
-  "http_rev": "e2e217052e033183f7fc8ae10be124ac3ebe5a3d",
+  "http_rev": "8c325b9ca33d878a86d69c5048a8e6e18379663c",
   "http_multi_server_rev": "25941e260658efb324de857e6022f418faf9bdd1",
-  "http_parser_rev": "53d40416ab5ef41d4605004dde1e43d1d44fd215",
+  "http_parser_rev": "71b4c2c448b333397d5ff3235825d8cea773291c",
   "intl_rev": "5d65e3808ce40e6282e40881492607df4e35669f",
   "json_rpc_2_rev": "5b1cbd679756700d5f319bf10a217da53e98ea52",
   "leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # manually rolled

diff --git a/pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart b/pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart
@@ -429,8 +429,10 @@ class BulkFixProcessor {
           for (var fix in result) {
             fixes.addAll(fix.change.edits);
           }
-          details.add(BulkFix(pubspecFile.path,
-              [BulkFixDetail(PubspecWarningCode.MISSING_DEPENDENCY.name, 1)]));
+          details.add(BulkFix(pubspecFile.path, [
+            BulkFixDetail(
+                PubspecWarningCode.MISSING_DEPENDENCY.name.toLowerCase(), 1)
+          ]));
         }
       }
     }

diff --git a/pkg/analysis_server/test/src/computer/folding_computer_test.dart b/pkg/analysis_server/test/src/computer/folding_computer_test.dart
@@ -519,6 +519,49 @@ main2/*[1*/() {
     });
   }
 
+  Future<void> test_function_expression_underscore_preWildcards() async {
+    var content = '''
+// /*[0*/
+// @dart = 3.4
+// (pre wildcard-variables)/*0]*/
+
+// Content before
+
+void f/*[1*/() {
+  _/*[2*/(){
+  }/*2]*/
+}/*1]*/
+
+// Content after
+''';
+
+    await _computeRegions(content);
+    expectRegions({
+      0: FoldingKind.FILE_HEADER,
+      1: FoldingKind.FUNCTION_BODY,
+      2: FoldingKind.FUNCTION_BODY,
+    });
+  }
+
+  Future<void> test_function_expression_wildcard() async {
+    var content = '''
+// Content before
+
+void f/*[0*/() {
+  _/*[1*/(){
+  }/*1]*/
+}/*0]*/
+
+// Content after
+''';
+
+    await _computeRegions(content);
+    expectRegions({
+      0: FoldingKind.FUNCTION_BODY,
+      1: FoldingKind.FUNCTION_BODY,
+    });
+  }
+
   Future<void> test_function_with_dart_doc() async {
     var content = '''
 // Content before