From 3e475708477b22316202087fe8d7d93e6a4f799b Mon Sep 17 00:00:00 2001 From: Natalie Weizenbaum Date: Mon, 10 Feb 2020 16:30:00 -0800 Subject: [PATCH] Properly check for double-forwarded functions and mixins (#951) See #946 See sass/sass#2820 --- lib/src/async_environment.dart | 6 +++--- lib/src/environment.dart | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/src/async_environment.dart b/lib/src/async_environment.dart index 45e6418e..246e2426 100644 --- a/lib/src/async_environment.dart +++ b/lib/src/async_environment.dart @@ -314,9 +314,9 @@ class AsyncEnvironment { for (var name in smaller.keys) { if (!larger.containsKey(name)) continue; - if (type == "variable" && - newModule.variableIdentity(name) == - oldModule.variableIdentity(name)) { + if (type == "variable" + ? newModule.variableIdentity(name) == oldModule.variableIdentity(name) + : larger[name] == smaller[name]) { continue; } diff --git a/lib/src/environment.dart b/lib/src/environment.dart index d664146b..6b4ec1d9 100644 --- a/lib/src/environment.dart +++ b/lib/src/environment.dart @@ -5,7 +5,7 @@ // DO NOT EDIT. This file was generated from async_environment.dart. // See tool/grind/synchronize.dart for details. // -// Checksum: 90df4751419f38332128857f9e02d481cbd7e5a7 +// Checksum: db31838dbc5c44989803274acb581263e98b488d // // ignore_for_file: unused_import @@ -321,9 +321,9 @@ class Environment { for (var name in smaller.keys) { if (!larger.containsKey(name)) continue; - if (type == "variable" && - newModule.variableIdentity(name) == - oldModule.variableIdentity(name)) { + if (type == "variable" + ? newModule.variableIdentity(name) == oldModule.variableIdentity(name) + : larger[name] == smaller[name]) { continue; }