From 1e6bf61c1067b2a4e45fe2dd09caf613a2bc2dd7 Mon Sep 17 00:00:00 2001
From: Sigmund Cherem <sigmund@google.com>
Date: Tue, 11 Feb 2020 23:45:10 +0000
Subject: [PATCH] [dart2js] migrate dart:isolate patch

Change-Id: I0387a28c3793431046d7e82c0375117e0f367a1f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/135354
Reviewed-by: Joshua Litt <joshualitt@google.com>
Commit-Queue: Sigmund Cherem <sigmund@google.com>
---
 .../_internal/js_runtime/lib/isolate_patch.dart    | 14 +++++++-------
 sdk_nnbd/lib/dart2js_migration_libraries.json      |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sdk_nnbd/lib/_internal/js_runtime/lib/isolate_patch.dart b/sdk_nnbd/lib/_internal/js_runtime/lib/isolate_patch.dart
index ea6b3936e17..4c7f5c5f395 100644
--- a/sdk_nnbd/lib/_internal/js_runtime/lib/isolate_patch.dart
+++ b/sdk_nnbd/lib/_internal/js_runtime/lib/isolate_patch.dart
@@ -2,14 +2,12 @@
 // 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.
 
-// @dart = 2.5
-
 // Patch file for the dart:isolate library.
 
 import "dart:async";
 import 'dart:_foreign_helper' show JS;
 import 'dart:_js_helper' show patch;
-import "dart:typed_data" show ByteData, TypedData, Uint8List;
+import "dart:typed_data" show TypedData;
 
 @patch
 class Isolate {
@@ -55,7 +53,7 @@ class Isolate {
       bool errorsAreFatal = true,
       bool? checked,
       Map<String, String>? environment,
-      Uri packageRoot,
+      Uri? packageRoot,
       Uri? packageConfig,
       bool automaticPackageResolution = false,
       String? debugName}) {
@@ -94,7 +92,7 @@ class Isolate {
 
   @patch
   void ping(SendPort responsePort,
-      {Object response, int priority = immediate}) {
+      {Object? response, int priority = immediate}) {
     throw new UnsupportedError("Isolate.ping");
   }
 
@@ -121,8 +119,10 @@ class ReceivePort {
 }
 
 class _ReceivePortImpl extends Stream implements ReceivePort {
-  StreamSubscription listen(void onData(var event)?,
-      {Function? onError, void Function()? onDone, bool cancelOnError = true}) {
+  StreamSubscription listen(void Function(dynamic)? onData,
+      {Function? onError,
+      void Function()? onDone,
+      bool? cancelOnError = true}) {
     throw new UnsupportedError("ReceivePort.listen");
   }
 
diff --git a/sdk_nnbd/lib/dart2js_migration_libraries.json b/sdk_nnbd/lib/dart2js_migration_libraries.json
index ba8865ffd72..29a8bf6e0c9 100644
--- a/sdk_nnbd/lib/dart2js_migration_libraries.json
+++ b/sdk_nnbd/lib/dart2js_migration_libraries.json
@@ -41,8 +41,8 @@
         "supported": false
       },
       "isolate": {
-        "uri": "../../sdk/lib/isolate/isolate.dart",
-        "patches": "../../sdk/lib/_internal/js_runtime/lib/isolate_patch.dart",
+        "uri": "isolate/isolate.dart",
+        "patches": "_internal/js_runtime/lib/isolate_patch.dart",
         "supported": false
       },
       "js": {