Version 2.12.0-175.0.dev

Merge commit '4245ca05a9d1c4851b7accc080624b48f5e9fc4f' into 'dev'

Author: Dart CI

DEPS

@@ -149,7 +149,7 @@ vars = {
   "source_span_rev": "49ff31eabebed0da0ae6634124f8ba5c6fbf57f1",
   "sse_tag": "9a486d058a17e880afa9cc1c3c0dd8bad726bcbc",
   "stack_trace_tag": "6788afc61875079b71b3d1c3e65aeaa6a25cbc2f",
-  "stagehand_tag": "v3.3.11",
+  "stagehand_rev": "e64ac90cac508981011299c4ceb819149e71f1bd",
   "stream_channel_tag": "d7251e61253ec389ee6e045ee1042311bced8f1d",
   "string_scanner_rev": "1b63e6e5db5933d7be0a45da6e1129fe00262734",
   "sync_http_rev": "a85d7ec764ea485cbbc49f3f3e7f1b43f87a1c74",
@@ -421,7 +421,7 @@ deps = {
   Var("dart_root") + "/third_party/pkg/stack_trace":
       Var("dart_git") + "stack_trace.git" + "@" + Var("stack_trace_tag"),
   Var("dart_root") + "/third_party/pkg/stagehand":
-      Var("dart_git") + "stagehand.git" + "@" + Var("stagehand_tag"),
+      Var("dart_git") + "stagehand.git" + "@" + Var("stagehand_rev"),
   Var("dart_root") + "/third_party/pkg/stream_channel":
       Var("dart_git") + "stream_channel.git" +
       "@" + Var("stream_channel_tag"),

pkg/analysis_server/lib/src/lsp/semantic_tokens/encoder.dart

@@ -95,6 +95,39 @@ class SemanticTokenEncoder {
     return SemanticTokens(data: encodedTokens);
   }
 
+  /// Sorted for highlight regions that ensures tokens are sorted in offset order
+  /// then longest first, then by priority, and finally by name. This ensures
+  /// the order is always stable.
+  int _regionOffsetLengthPrioritySorter(
+      HighlightRegion r1, HighlightRegion r2) {
+    const priorities = {
+      // Ensure boolean comes above keyword.
+      HighlightRegionType.LITERAL_BOOLEAN: 1,
+    };
+
+    // First sort by offset.
+    if (r1.offset != r2.offset) {
+      return r1.offset.compareTo(r2.offset);
+    }
+
+    // Then length (so longest are first).
+    if (r1.length != r2.length) {
+      return -r1.length.compareTo(r2.length);
+    }
+
+    // Next sort by priority (if different).
+    final priority1 = priorities[r1.type] ?? 0;
+    final priority2 = priorities[r2.type] ?? 0;
+    if (priority1 != priority2) {
+      return priority1.compareTo(priority2);
+    }
+
+    // If the tokens had the same offset and length, sort by name. This
+    // is completely arbitrary but it's only important that it is consistent
+    // between regions and the sort is stable.
+    return r1.type.name.compareTo(r2.type.name);
+  }
+
   /// Splits multiline regions into multiple regions for clients that do not support
   /// multiline tokens.
   Iterable<HighlightRegion> _splitMultilineRegions(
@@ -143,12 +176,10 @@ class SemanticTokenEncoder {
       return;
     }
 
-    // When tokens have the same offset, the longest should come first so
-    // the nested token "overwrites" it during the flattening.
+    // Sort tokens so by offset, shortest length, priority then name to ensure
+    // tne sort is always stable.
     final sortedRegions = regions.toList()
-      ..sort((r1, r2) => r1.offset != r2.offset
-          ? r1.offset.compareTo(r2.offset)
-          : -r1.length.compareTo(r2.length));
+      ..sort(_regionOffsetLengthPrioritySorter);
 
     final firstRegion = sortedRegions.first;
     final stack = ListQueue<HighlightRegion>()..add(firstRegion);
@@ -194,7 +225,8 @@ class SemanticTokenInfo {
   SemanticTokenInfo(
       this.line, this.column, this.length, this.type, this.modifiers);
 
-  static int offsetSort(t1, t2) => t1.line == t2.line
-      ? t1.column.compareTo(t2.column)
-      : t1.line.compareTo(t2.line);
+  static int offsetSort(SemanticTokenInfo t1, SemanticTokenInfo t2) =>
+      t1.line == t2.line
+          ? t1.column.compareTo(t2.column)
+          : t1.line.compareTo(t2.line);
 }

pkg/analysis_server/test/lsp/semantic_tokens_test.dart

@@ -429,6 +429,61 @@ class SemanticTokensTest extends AbstractLspAnalysisServerTest {
     expect(decoded, equals(expected));
   }
 
+  Future<void> test_manyBools_bug() async {
+    // Similar to test_manyImports_sortBug, this code triggered inconsistent tokens
+    // for "false" because tokens were sorted incorrectly (because both boolean and
+    // keyword had the same offset and length, which is all that were sorted by).
+    final content = '''
+class MyTestClass {
+  /// test
+  /// test
+  bool test1 = false;
+
+  /// test
+  /// test
+  bool test2 = false;
+
+  /// test
+  /// test
+  bool test3 = false;
+
+  /// test
+  /// test
+  bool test4 = false;
+
+  /// test
+  /// test
+  bool test5 = false;
+
+  /// test
+  /// test
+  bool test6 = false;
+}
+    ''';
+
+    final expected = [
+      _Token('class', SemanticTokenTypes.keyword),
+      _Token('MyTestClass', SemanticTokenTypes.class_),
+      for (var i = 1; i <= 6; i++) ...[
+        _Token('/// test', SemanticTokenTypes.comment,
+            [SemanticTokenModifiers.documentation]),
+        _Token('/// test', SemanticTokenTypes.comment,
+            [SemanticTokenModifiers.documentation]),
+        _Token('bool', SemanticTokenTypes.class_),
+        _Token('test$i', SemanticTokenTypes.variable,
+            [SemanticTokenModifiers.declaration]),
+        _Token('false', CustomSemanticTokenTypes.boolean),
+      ],
+    ];
+
+    await initialize();
+    await openFile(mainFileUri, withoutMarkers(content));
+
+    final tokens = await getSemanticTokens(mainFileUri);
+    final decoded = decodeSemanticTokens(content, tokens);
+    expect(decoded, equals(expected));
+  }
+
   Future<void> test_manyImports_sortBug() async {
     // This test is for a bug where some "import" tokens would not be highlighted
     // correctly. Imports are made up of a DIRECTIVE token that spans a

pkg/compiler/lib/src/common/codegen.dart

@@ -489,8 +489,13 @@ class CodegenResult {
   final Iterable<ModularName> modularNames;
   final Iterable<ModularExpression> modularExpressions;
 
-  CodegenResult(
-      this.code, this.impact, this.modularNames, this.modularExpressions);
+  CodegenResult(this.code, this.impact, List<ModularName> modularNames,
+      List<ModularExpression> modularExpressions)
+      : this.modularNames =
+            modularNames.isEmpty ? const [] : List.unmodifiable(modularNames),
+        this.modularExpressions = modularExpressions.isEmpty
+            ? const []
+            : List.unmodifiable(modularExpressions);
 
   /// Reads a [CodegenResult] object from [source].
   ///
@@ -505,7 +510,7 @@ class CodegenResult {
     js.Fun code = source.readJsNodeOrNull();
     CodegenImpact impact = CodegenImpact.readFromDataSource(source);
     source.end(tag);
-    return new CodegenResult(code, impact, modularNames, modularExpressions);
+    return CodegenResult(code, impact, modularNames, modularExpressions);
   }
 
   /// Writes the [CodegenResult] object to [sink].