Version 2.19.0-371.0.dev

Merge 2794cb9 into dev

Author: Dart CI

.github/ISSUE_TEMPLATE/2_cherry_pick.yml

@@ -13,21 +13,28 @@ body:
     id: commit_hash
     attributes:
       label: Commit(s) to merge
-      description: What are the shortened commit hash(es) that have been merged to main?
+      description: What are the commit hash(es) that have been merged to main?
     validations:
       required: true
   - type: input
     id: target
     attributes:
       label: Target
-      description: Should this be cherry-picked to beta, stable or both??
+      description: Should this be cherry-picked to beta, stable or both?
+    validations:
+      required: true
+  - type: input
+    id: changelist
+    attributes:
+      label: Prepared changelist for beta/stable
+      description: Gerrit changelist against beta/stable per https://github.com/dart-lang/sdk/wiki/Cherry-picks-to-a-release-channel
     validations:
       required: true
   - type: textarea
     id: issue_description
     attributes:
       label: Issue Description
-      description: Brief description of the issue.  What is the issue? What platforms are the problems occurring on?
+      description: Brief description of the issue. What is the issue? What platforms are the problems occurring on?
     validations:
       required: true
   - type: textarea
@@ -59,7 +66,7 @@ body:
     id: original_issue
     attributes:
       label: Issue link(s)
-      description: Add links to the original issues fixed by this cp
+      description: Add links to the original issues fixed by this cherry-pick
     validations:
       required: true
   - type: textarea

pkg/analysis_server/lib/src/lsp/handlers/handler_folding.dart

@@ -90,13 +90,13 @@ class FoldingHandler
   /// that another starts. In this case, we shrink the previous range (and if
   /// this makes it a single line, remove it).
   void _compensateForLineFolding(List<FoldingRange> foldingRanges) {
-    // Loop over items expect last (`-1`). We can skip the last item because
+    // Loop over items except last (`-1`). We can skip the last item because
     // it has no next item.
     for (var i = 0; i < foldingRanges.length - 1; i++) {
       final range = foldingRanges[i];
       final next = foldingRanges[i + 1];
-      // If this item runs into the next...
-      if (range.endLine >= next.startLine) {
+      // If this item runs into the next but does not completely enclose it...
+      if (range.endLine >= next.startLine && range.endLine <= next.endLine) {
         // Truncate it to end on the line before.
         final newEndLine = next.startLine - 1;
 

pkg/analysis_server/test/lsp/folding_test.dart

@@ -242,6 +242,45 @@ class FoldingTest extends AbstractLspAnalysisServerTest {
     });
   }
 
+  Future<void> test_nested() async {
+    final content = '''
+    class MyClass2 {/*[0*/
+      void f() {/*[1*/
+        void g() {/*[2*/
+          //
+        /*2]*/}
+      /*1]*/}
+    /*0]*/}
+    ''';
+
+    await computeRanges(content);
+    expectRanges({
+      0: noFoldingKind,
+      1: noFoldingKind,
+      2: noFoldingKind,
+    });
+  }
+
+  Future<void> test_nested_lineFoldingOnly() async {
+    lineFoldingOnly = true;
+    final content = '''
+    class MyClass2 {/*[0*/
+      void f() {/*[1*/
+        void g() {/*[2*/
+          //
+        /*2]*/}
+      /*1]*/}
+    /*0]*/}
+    ''';
+
+    await computeRanges(content);
+    expectRanges({
+      0: noFoldingKind,
+      1: noFoldingKind,
+      2: noFoldingKind,
+    });
+  }
+
   Future<void> test_nonDartFile() async {
     await computeRanges(simplePubspecContent, uri: pubspecFileUri);
     expectNoRanges();

pkg/compiler/lib/src/inferrer/abstract_value_domain.dart

@@ -634,5 +634,5 @@ abstract class AbstractValueDomain {
   /// Serializes this [value] for this domain to [sink].
   // TODO(48820): Remove covariant when DataSinkWriter is migrated.
   void writeAbstractValueToDataSink(
-      covariant DataSinkWriter sink, AbstractValue value);
+      covariant DataSinkWriter sink, AbstractValue? value);
 }

pkg/compiler/lib/src/inferrer/builder.dart

@@ -27,7 +27,7 @@ import '../options.dart';
 import '../universe/selector.dart';
 import '../universe/side_effects.dart';
 import '../util/util.dart';
-import 'engine_interfaces.dart';
+import 'engine.dart';
 import 'locals_handler.dart';
 import 'type_graph_nodes.dart';
 import 'type_system.dart';
@@ -1076,7 +1076,7 @@ class KernelTypeGraphBuilder extends ir.Visitor<TypeInformation?>
 
   TypeInformation _handleDynamic(
       CallType callType,
-      ir.Node node,
+      ir.TreeNode node,
       Selector selector,
       AbstractValue? mask,
       TypeInformation receiverType,
@@ -1107,7 +1107,7 @@ class KernelTypeGraphBuilder extends ir.Visitor<TypeInformation?>
   }
 
   TypeInformation handleDynamicGet(
-      ir.Node node,
+      ir.TreeNode node,
       Selector selector,
       AbstractValue? mask,
       TypeInformation receiverType,
@@ -1117,7 +1117,7 @@ class KernelTypeGraphBuilder extends ir.Visitor<TypeInformation?>
   }
 
   TypeInformation handleDynamicSet(
-      ir.Node node,
+      ir.TreeNode node,
       Selector selector,
       AbstractValue? mask,
       TypeInformation receiverType,
@@ -1130,7 +1130,7 @@ class KernelTypeGraphBuilder extends ir.Visitor<TypeInformation?>
 
   TypeInformation handleDynamicInvoke(
       CallType callType,
-      ir.Node node,
+      ir.TreeNode node,
       Selector selector,
       AbstractValue? mask,
       TypeInformation receiverType,

pkg/compiler/lib/src/inferrer/closure_tracer.dart

@@ -7,7 +7,7 @@ library compiler.src.inferrer.closure_tracer;
 import '../common/names.dart' show Identifiers, Names;
 import '../elements/entities.dart';
 import 'debug.dart' as debug;
-import 'engine_interfaces.dart';
+import 'engine.dart';
 import 'node_tracer.dart';
 import 'type_graph_nodes.dart';