Version 3.9.0-234.0.dev

Merge 0070331 into dev

Author: Dart CI

.gitattributes

@@ -16,20 +16,13 @@
 
 # File that should not be converted.
 tests/web/eof_line_ending_test.dart -text
-tests/web/string_interpolation_test.dart -text
-tests/web/string_interpolation_dynamic_test.dart -text
-tests/web/literal_string_juxtaposition_test.dart -text
-tests/language/string/raw_string_test.dart -text
-tests/language/string/multiline_strings_test.dart -text
 tests/language/string/multiline_newline_cr.dart -text
 tests/language/string/multiline_newline_crlf.dart -text
 tests/language/string/multiline_newline_lf.dart -text
 tests/lib/mirrors/method_mirror_source_line_ending_cr.dart -text
 tests/lib/mirrors/method_mirror_source_line_ending_crlf.dart -text
 tests/lib/mirrors/method_mirror_source_line_ending_lf.dart -text
-tests/lib/mirrors/method_mirror_source_line_ending_test.dart -text
 tests/lib/mirrors/method_mirror_source_other.dart -text
-tests/lib/mirrors/method_mirror_source_test.dart -text
 
 # Files to leave alone and not diff.
 *.png binary

DEPS

@@ -139,15 +139,15 @@ vars = {
   "leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # rolled manually
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
   "native_rev": "5eadfaf3b732bc512d327ac284b6f294bf05e4c2", # rolled manually while native assets are experimental
-  "protobuf_rev": "32d53dad4565fc6ccd69196b8fd213454f3e8ed5",
+  "protobuf_rev": "0bfff0ca150959c92dac525474d73bde946f3391",
   "pub_rev": "818f10b4bf9249bd0b2c212dd8709675eeb14cd2", # rolled manually
   "shelf_rev": "082d3ac2d13a98700d8148e8fad8f3e12a6fd0e1",
   "sync_http_rev": "dc54465f07d9652875deeade643256dafa2fbc6c",
   "tar_rev": "5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a",
   "test_rev": "0793a2b3262ac900558c49c76e9bbe4f29f91ea4",
-  "tools_rev": "e84cbd9e1b111d80763ae8b3e04685bd66866f08",
+  "tools_rev": "72e6cc871a0dcb7e6b92c01a96503d1b6aebb5e3",
   "vector_math_rev": "13f185f7e97d559e003f5ac79201da12f9a01049",
-  "web_rev": "de6b3e40826bde1653573d5c8e36aec3df2f4927",
+  "web_rev": "c8c1c2852ace3bb78026dddc64b111051a7e855a",
   "webdev_rev": "661dafd4a050e4325253155af092d2243721ab28",
   "webdriver_rev": "b8f511d7719e2ae2c21eb4d94f68564eee32cbe2",
   "webkit_inspection_protocol_rev": "effa75205516757795683d527c3dea9546eb0c32",

sdk/lib/js_interop/js_interop.dart

@@ -1388,11 +1388,14 @@ extension JSAnyOperatorExtension on JSAny? {
 /// For example:
 ///
 /// ```
+/// library;
+///
 /// @JS()
 /// external String get name;
 /// ```
 ///
-/// Reading `name` will execute JavaScript code like `globalContext.name`.
+/// Reading the top-level member `name` will execute JavaScript code like
+/// `<globalContext>.name`.
 ///
 /// There are subtle differences depending on the compiler, but in general,
 /// [globalContext] can be treated like JavaScript's `globalThis`.

tests/language/string/multiline_newline_cr.dart

@@ -2,24 +2,16 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library multiline_newline_cr;
+// Test depends on specific line endings,
+// and requires an entry in the .gitattributes file.
 
-const constantMultilineString = """
-a
-b
-""";
+// dart format off
 
-var nonConstantMultilineString = """
-a
-b
-""";
+// All line endings inside string literals are Carriage Return, U+000D
+const constantMultilineString = """ab""";
 
-const constantRawMultilineString = r"""
-\a
-\b
-""";
+var nonConstantMultilineString = """ab""";
 
-var nonConstantRawMultilineString = r"""
-\a
-\b
-""";
+const constantRawMultilineString = r"""\a\b""";
+
+var nonConstantRawMultilineString = r"""\a\b""";

tests/language/string/multiline_strings_test.dart

@@ -2,24 +2,29 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// Note: This test relies on LF line endings in the source file.
-
 import "package:expect/expect.dart";
 
-main() {
+void main() {
+  // Spaces after '''.
   Expect.equals('foo', '''  
 foo''');
 
+  // Tab characters after '''.
+  Expect.equals('foo', '''		
+foo''');
+
   Expect.equals('\\\nfoo', '''\\
 foo''');
 
   Expect.equals('\t\nfoo', '''\t
 foo''');
 
+  // Backslash just before newline.
   Expect.equals('foo', '''\
 foo''');
 
-  Expect.equals('foo', '''\ \
+  // Backslash before space, tab and newline.
+  Expect.equals('foo', '''\ \	\
 foo''');
 
   Expect.equals(' \nfoo', '''\x20
@@ -29,18 +34,25 @@ foo''');
   Expect.equals(' \nfoo', '''$x
 foo''');
 
+  /// Spaces after '''.
   Expect.equals('foo', r'''  
 foo''');
 
+  /// Tab characters after '''.
+  Expect.equals('foo', r'''		
+foo''');
+
   Expect.equals('\\\\\nfoo', r'''\\
 foo''');
 
   Expect.equals('\\t\nfoo', r'''\t
 foo''');
 
+  // Backslash before newline.
   Expect.equals('foo', r'''\
 foo''');
 
-  Expect.equals('foo', r'''\ \
+  // Backslash before space, tab and newline.
+  Expect.equals('foo', r'''\ \	\
 foo''');
 }

tests/language/string/raw_string_test.dart

@@ -2,48 +2,40 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// Note: This test relies on LF line endings in the source file.
-
 import "package:expect/expect.dart";
 
-class RawStringTest {
-  static testMain() {
-    Expect.equals("abcd", r"abcd");
-    Expect.equals("", r"");
-    Expect.equals("", r'');
-    Expect.equals("", r"""""");
-    Expect.equals("", r'''''');
-    Expect.equals("''''", r"''''");
-    Expect.equals('""""', r'""""');
-    Expect.equals("1\n2\n3", r"""1
+void main() {
+  Expect.equals("abcd", r"abcd");
+  Expect.equals("", r"");
+  Expect.equals("", r'');
+  Expect.equals("", r"""""");
+  Expect.equals("", r'''''');
+  Expect.equals("''''", r"''''");
+  Expect.equals('""""', r'""""');
+  Expect.equals("1\n2\n3", r"""1
 2
 3""");
-    Expect.equals("1\n2\n3", r'''1
+  Expect.equals("1\n2\n3", r'''1
 2
 3''');
-    Expect.equals("1", r"""
+  Expect.equals("1", r"""
 1""");
-    Expect.equals("1", r'''
+  Expect.equals("1", r'''
 1''');
-    Expect.equals("'", r"'");
-    Expect.equals('"', r'"');
-    Expect.equals("1", r"1");
-    Expect.equals("1", r"1");
-    Expect.equals("\$", r"$");
-    Expect.equals("\\", r"\");
-    Expect.equals("\\", r'\');
-    Expect.equals("\${12}", r"${12}");
-    Expect.equals(
-      "\\a\\b\\c\\d\\e\\f\\g\\h\\i\\j\\k\\l\\m",
-      r"\a\b\c\d\e\f\g\h\i\j\k\l\m",
-    );
-    Expect.equals(
-      "\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z",
-      r"\n\o\p\q\r\s\t\u\v\w\x\y\z",
-    );
-  }
-}
-
-main() {
-  RawStringTest.testMain();
+  Expect.equals("'", r"'");
+  Expect.equals('"', r'"');
+  Expect.equals("1", r"1");
+  Expect.equals("1", r"1");
+  Expect.equals("\$", r"$");
+  Expect.equals("\\", r"\");
+  Expect.equals("\\", r'\');
+  Expect.equals("\${12}", r"${12}");
+  Expect.equals(
+    "\\a\\b\\c\\d\\e\\f\\g\\h\\i\\j\\k\\l\\m",
+    r"\a\b\c\d\e\f\g\h\i\j\k\l\m",
+  );
+  Expect.equals(
+    "\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z",
+    r"\n\o\p\q\r\s\t\u\v\w\x\y\z",
+  );
 }