Version 3.2.0-79.0.dev

Merge fd913bf into dev
dart-lang · Aug 16, 2023 · 92c32df · 92c32df
2 parents d6e1fca + fd913bf
commit 92c32df
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,12 @@
 
 ### Libraries
 
+#### `dart:developer`
+
+- Deprecated the `Service.getIsolateID` method.
+- Added `getIsolateId` method to `Service`.
+- Added `getObjectId` method to `Service`.
+
 #### `dart:io`
 
 - **Breaking change** [#53005][]: The headers returned by

diff --git a/DEPS b/DEPS
@@ -53,7 +53,7 @@ vars = {
 
   # co19 is a cipd package. Use update.sh in tests/co19[_2] to update these
   # hashes.
-  "co19_rev": "bbb3feb38db0a9c4489736229ea9b06215a1706b",
+  "co19_rev": "c7f412ab8b0ad444eea4d6dbd7616b475e050fab",
   # This line prevents conflicts when both packages are rolled simultaneously.
   "co19_2_rev": "3756b19f79b85b7640a6805dd2c819792a13041c",
 

diff --git a/pkg/analyzer/lib/src/generated/error_detection_helpers.dart b/pkg/analyzer/lib/src/generated/error_detection_helpers.dart
@@ -141,12 +141,14 @@ mixin ErrorDetectionHelpers {
           expression,
           [staticType, fieldType],
           messages);
+    } else {
+      errorReporter.reportErrorForNode(
+          CompileTimeErrorCode.FIELD_INITIALIZER_NOT_ASSIGNABLE,
+          expression,
+          [staticType, fieldType],
+          messages);
     }
-    errorReporter.reportErrorForNode(
-        CompileTimeErrorCode.FIELD_INITIALIZER_NOT_ASSIGNABLE,
-        expression,
-        [staticType, fieldType],
-        messages);
+
     // TODO(brianwilkerson) Define a hint corresponding to these errors and
     // report it if appropriate.
 //        // test the propagated type of the expression

diff --git a/pkg/analyzer/test/src/diagnostics/const_field_initializer_not_assignable_test.dart b/pkg/analyzer/test/src/diagnostics/const_field_initializer_not_assignable_test.dart
@@ -5,6 +5,7 @@
 import 'package:analyzer/src/error/codes.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
+import '../../generated/test_support.dart';
 import '../dart/resolution/context_collection_resolution.dart';
 
 main() {
@@ -24,14 +25,35 @@ class A {
 ''');
   }
 
+  test_enum_unrelated() async {
+    await assertErrorsInCode('''
+enum E {
+  v;
+  final int x;
+  const E() : x = '';
+}
+''', [
+      error(
+        CompileTimeErrorCode.CONST_EVAL_THROWS_EXCEPTION,
+        11,
+        1,
+        contextMessages: [
+          ExpectedContextMessage(testFile.path, 47, 2,
+              text:
+                  "The exception is 'In a const constructor, a value of type 'String' can't be assigned to the field 'x', which has type 'int'.' and occurs here."),
+        ],
+      ),
+      error(CompileTimeErrorCode.CONST_FIELD_INITIALIZER_NOT_ASSIGNABLE, 47, 2),
+    ]);
+  }
+
   test_notAssignable_unrelated() async {
     await assertErrorsInCode(r'''
 class A {
   final int x;
   const A() : x = '';
 }
 ''', [
-      error(CompileTimeErrorCode.FIELD_INITIALIZER_NOT_ASSIGNABLE, 43, 2),
       error(CompileTimeErrorCode.CONST_FIELD_INITIALIZER_NOT_ASSIGNABLE, 43, 2),
     ]);
   }

diff --git a/pkg/analyzer/test/src/diagnostics/field_initializer_not_assignable_test.dart b/pkg/analyzer/test/src/diagnostics/field_initializer_not_assignable_test.dart
@@ -5,7 +5,6 @@
 import 'package:analyzer/src/error/codes.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import '../../generated/test_support.dart';
 import '../dart/resolution/context_collection_resolution.dart';
 
 main() {
@@ -53,29 +52,6 @@ class A {
       error(CompileTimeErrorCode.FIELD_INITIALIZER_NOT_ASSIGNABLE, 31, 2),
     ]);
   }
-
-  test_enum_unrelated() async {
-    await assertErrorsInCode('''
-enum E {
-  v;
-  final int x;
-  const E() : x = '';
-}
-''', [
-      error(
-        CompileTimeErrorCode.CONST_EVAL_THROWS_EXCEPTION,
-        11,
-        1,
-        contextMessages: [
-          ExpectedContextMessage(testFile.path, 47, 2,
-              text:
-                  "The exception is 'In a const constructor, a value of type 'String' can't be assigned to the field 'x', which has type 'int'.' and occurs here."),
-        ],
-      ),
-      error(CompileTimeErrorCode.FIELD_INITIALIZER_NOT_ASSIGNABLE, 47, 2),
-      error(CompileTimeErrorCode.CONST_FIELD_INITIALIZER_NOT_ASSIGNABLE, 47, 2),
-    ]);
-  }
 }
 
 @reflectiveTest

diff --git a/pkg/vm_service/test/developer_service_get_isolate_id_test.dart b/pkg/vm_service/test/developer_service_get_isolate_id_test.dart
@@ -26,7 +26,9 @@ Future testeeMain() async {
   childIsolate = await iso.Isolate.spawn(spawnEntry, 0);
   // Assign the id for this isolate and it's child to strings so they can
   // be read by the tester.
+  // ignore: sdk_version_since
   selfId = Service.getIsolateId(iso.Isolate.current)!;
+  // ignore: sdk_version_since
   childId = Service.getIsolateId(childIsolate)!;
   debugger();
 }

diff --git a/sdk/lib/developer/developer.dart b/sdk/lib/developer/developer.dart
@@ -73,7 +73,7 @@
 /// {@category Core}
 library dart.developer;
 
-import 'dart:_internal' show checkNotNullable;
+import 'dart:_internal' show checkNotNullable, Since;
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';

diff --git a/sdk/lib/developer/service.dart b/sdk/lib/developer/service.dart
@@ -102,6 +102,7 @@ final class Service {
   ///
   /// Returns null if the running Dart environment does not support the service
   /// protocol.
+  @Since('3.2')
   static String? getIsolateId(Isolate isolate) {
     // TODO: When NNBD is complete, delete the following line.
     ArgumentError.checkNotNull(isolate, 'isolate');

diff --git a/tests/language/compile_time_constant/static2_test.dart b/tests/language/compile_time_constant/static2_test.dart
@@ -7,7 +7,6 @@ class A {
   const A.a1() : x = 'foo';
   //                 ^^^^^
   // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
-  // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
   // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
   const A.a2(this.x);
   const A.a3([this.x = 'foo']);
@@ -22,7 +21,6 @@ class A {
   const A.a5(String x) : this.x = x;
   //                              ^
   // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
-  // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
   // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
   const A.a6(int x) : this.x = x;
 }

diff --git a/tests/language/compile_time_constant/static3_test.dart b/tests/language/compile_time_constant/static3_test.dart
@@ -7,7 +7,6 @@ class A {
   const A.a1() : x = 'foo';
   //                 ^^^^^
   // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
-  // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
   // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
   const A.a2(this.x);
   const A.a3([this.x = 'foo']);
@@ -22,7 +21,6 @@ class A {
   const A.a5(String x) : this.x = x;
   //                              ^
   // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
-  // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
   // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
   const A.a6(int x) : this.x = x;
 }

diff --git a/tests/language_2/compile_time_constant/static2_test.dart b/tests/language_2/compile_time_constant/static2_test.dart
@@ -9,7 +9,6 @@ class A {
   const A.a1() : x = 'foo';
   //                 ^^^^^
   // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
-  // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
   // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
   const A.a2(this.x);
   const A.a3([this.x = 'foo']);
@@ -24,7 +23,6 @@ class A {
   const A.a5(String x) : this.x = x;
   //                              ^
   // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
-  // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
   // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
   const A.a6(int x) : this.x = x;
 }

diff --git a/tests/language_2/compile_time_constant/static3_test.dart b/tests/language_2/compile_time_constant/static3_test.dart
@@ -9,7 +9,6 @@ class A {
   const A.a1() : x = 'foo';
   //                 ^^^^^
   // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
-  // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
   // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
   const A.a2(this.x);
   const A.a3([this.x = 'foo']);
@@ -24,7 +23,6 @@ class A {
   const A.a5(String x) : this.x = x;
   //                              ^
   // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
-  // [analyzer] COMPILE_TIME_ERROR.FIELD_INITIALIZER_NOT_ASSIGNABLE
   // [cfe] A value of type 'String' can't be assigned to a variable of type 'int'.
   const A.a6(int x) : this.x = x;
 }

diff --git a/tools/VERSION b/tools/VERSION
@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 2
 PATCH 0
-PRERELEASE 78
+PRERELEASE 79
 PRERELEASE_PATCH 0