From 4436e2814dfb5a206825f62fe751f7d1ca7aad48 Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Wed, 19 May 2021 07:16:03 -0700
Subject: [PATCH] =?UTF-8?q?Use=20localeCompare=E2=80=99s=20case=20insensit?=
 =?UTF-8?q?ivity=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Variables and procedures now sorted using local rules, not Unicode code points.  Verified that ’sensitivity’ survives Closure compiler without quotes.
---
 core/procedures.js     |  2 +-
 core/variable_model.js | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/core/procedures.js b/core/procedures.js
index 59c364719..28d55b0cf 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -87,7 +87,7 @@ Blockly.Procedures.allProcedures = function(root) {
  * @private
  */
 Blockly.Procedures.procTupleComparator_ = function(ta, tb) {
-  return ta[0].toLowerCase().localeCompare(tb[0].toLowerCase());
+  return ta[0].localeCompare(tb[0], undefined, {sensitivity: 'base'});
 };
 
 /**
diff --git a/core/variable_model.js b/core/variable_model.js
index d1e477a3b..eaa3815c5 100644
--- a/core/variable_model.js
+++ b/core/variable_model.js
@@ -87,13 +87,5 @@ Blockly.VariableModel.prototype.getId = function() {
  * @package
  */
 Blockly.VariableModel.compareByName = function(var1, var2) {
-  var name1 = var1.name.toLowerCase();
-  var name2 = var2.name.toLowerCase();
-  if (name1 < name2) {
-    return -1;
-  } else if (name1 == name2) {
-    return 0;
-  } else {
-    return 1;
-  }
+  return var1.name.localeCompare(var2.name, undefined, {sensitivity: 'base'});
 };