From d854fe1202d14f7639e0cd47687a6d43d4e493b8 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Sun, 14 Apr 2024 16:06:12 -0400 Subject: [PATCH] Clean up redundant code --- .../naturalcrit/codeEditor/autocomplete-emoji.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/shared/naturalcrit/codeEditor/autocomplete-emoji.js b/shared/naturalcrit/codeEditor/autocomplete-emoji.js index 847b15134..f7469108b 100644 --- a/shared/naturalcrit/codeEditor/autocomplete-emoji.js +++ b/shared/naturalcrit/codeEditor/autocomplete-emoji.js @@ -21,20 +21,16 @@ const showEmojiAutocomplete = function(CodeMirror, editor) { const list = Object.keys(emojis).filter(function(emoji) { return emoji.indexOf(currentWord) >= 0; - }).sort((a, b) => { // Sort autocomplete options alphabetically, case-insensitive - let lowerA = a.toLowerCase(); - let lowerB = b.toLowerCase(); - - lowerA = lowerA.replace(/\d+/g, function(match) { // Temporarily convert any numbers in emoji string - return match.padStart(4, '0'); // to 4-digits, left-padded with 0's. To aid in - }); // sorting numbers, i.e., "d6, d10, d20", not "d10, d20, d6" - lowerB = lowerB.replace(/\d+/g, function(match) { + }).sort((a, b) => { + const lowerA = a.replace(/\d+/g, function(match) { // Temporarily convert any numbers in emoji string + return match.padStart(4, '0'); // to 4-digits, left-padded with 0's, to aid in + }).toLowerCase(); // sorting numbers, i.e., "d6, d10, d20", not "d10, d20, d6" + const lowerB = b.replace(/\d+/g, function(match) { // Also make lowercase for case-insensitive alpha sorting return match.padStart(4, '0'); - }); + }).toLowerCase(); if (lowerA < lowerB) return -1; - return 1; }).map(function(emoji) { return {