2 files changed, 8 insertions, 3 deletions
diff --git a/BuildTools/EmojisGenerator/EmojiMapper.cpp b/BuildTools/EmojisGenerator/EmojiMapper.cpp
index be1c811..b93a191 100644
--- a/BuildTools/EmojisGenerator/EmojiMapper.cpp
+++ b/BuildTools/EmojisGenerator/EmojiMapper.cpp
@@ -42,38 +42,36 @@ namespace Swift {
         }
     }
 
     std::vector<std::string> EmojiMapper::categoryNameToEmojis(const std::string& categoryName) {
         auto emojiIterator = emojisInCategory.find(categoryName);
         if (emojiIterator != emojisInCategory.end()) {
             return emojiIterator->second;
         }
         else {
             return std::vector<std::string>();
         }
     }
 
     std::string EmojiMapper::categoryToFlagshipUnicodeEmoji(const std::string& category) {
         if (category == "recent") {
             return shortnameToUnicode(":clock3:");
         } else if (category == "people") {
             return shortnameToUnicode(":smiley:");
         } else if (category == "nature" ) {
             return shortnameToUnicode(":dog:");
         } else if (category == "food") {
             return shortnameToUnicode(":apple:");
         } else if (category == "activity") {
             return shortnameToUnicode(":soccer:");
         } else if (category == "travel") {
             return shortnameToUnicode(":red_car:");
         } else if (category == "objects") {
             return shortnameToUnicode(":bulb:");
         } else if (category == "symbols") {
             return shortnameToUnicode(":heavy_division_sign:");
-        } else if (category == "regional") {
-            return shortnameToUnicode(":regional_indicator_a:");
         } else if (category == "flags") {
             return shortnameToUnicode(":flag_white:");
         }
         return std::string();
     }
 }
diff --git a/BuildTools/EmojisGenerator/generate.js b/BuildTools/EmojisGenerator/generate.js
index 2b5541f..177e26e 100644
--- a/BuildTools/EmojisGenerator/generate.js
+++ b/BuildTools/EmojisGenerator/generate.js
@@ -1,90 +1,97 @@
 var util = require("util"),
     fs   = require("fs"),
     _    = require("underscore");
 
 // Load emojis
 var emojis = require("./emoji.json");
 
 var unicodeCodepointToByteArray = function (codepoint) {
     var utf8 = unescape(encodeURIComponent(String.fromCodePoint(parseInt(codepoint, 16))));
 
     var arr = [];
     for (var i = 0; i < utf8.length; i++) {
         arr.push(utf8.charCodeAt(i));
     }
     return arr;
 }
 
 var byteArrayToCStringLiteral = function (byteArray) {
     var literalString = "";
     for (var i = 0; i < byteArray.length; i++) {
         literalString += "\\x" + byteArray[i].toString(16);
     }
     return literalString;
 }
 
 var mapping = '';
 // Generate C++ mapping for shortnameUnicode_
-mapping += 'const std::unordered_map<std::string, std::string> EmojiMapper::shortnameUnicode = std::unordered_map<std::string, std::string>{' + _(emojis).filter(function(data) {
+mapping += 'const std::unordered_map<std::string, std::string> EmojiMapper::shortnameUnicode = std::unordered_map<std::string, std::string>{';
+mapping += _(emojis).filter(function(data) {
+    // Filter out regional category.
+    return data.category != 'regional';
+}).filter(function(data) {
     // Only use emojis with 2 or less codepoints, as Qt's harfbuzz version
     // has issues rendering those as a single glyph.
     return data.unicode.split("-").length < 3;
 }).map(function(data) {
     var shortname = data.shortname;
     // Get codepoints
     var codepoints = _(data.unicode.split("-")).map(function (code) {
         //return "\\U" + "0".repeat(8-code.length) + code;
         return byteArrayToCStringLiteral(unicodeCodepointToByteArray(code));
     });
 
     // .join('\\U0000200D') -> join characters with a zero width joiner, required by
     // some emojis pattern (:family_mwg: for example)
     // Currently do no join them by a ZWJ as it breaks rendering of a lot simple emojis
     // like $EMOJI followed by skin tone modifier.
     //return '{"' + shortname + '", "' + codepoints.join(byteArrayToCStringLiteral(unicodeCodepointToByteArray('200D'))) + '"}';
     return '{"' + shortname + '", "' + codepoints.join("") + '"}';
 }).join(", ") + '};\n\n';
 
 // Generate C++ code for the reverse mapping (i.e. unicodeShortname_ )
 mapping += '    const std::unordered_map<std::string, std::string> EmojiMapper::unicodeShortname = [](){\n' +
            '        std::unordered_map<std::string, std::string> unicodeSequenceToShortname;\n' +
            '        const auto& shortnameToUnicodeMap = EmojiMapper::shortnameUnicode;\n' +
            '        for (const auto& shortnameToUnicode : shortnameToUnicodeMap) {\n' +
            '            unicodeSequenceToShortname[shortnameToUnicode.second] = shortnameToUnicode.first;\n' +
            '        }\n' +
            '        return unicodeSequenceToShortname;\n' +
            '    }();\n\n';
 
 // Generate C++ mapping for categories
 var CategoryMapping = new Map();
 _(emojis).filter(function(data) {
+    // Filter out regional category.
+    return data.category != 'regional';
+}).filter(function(data) {
     // Only use emojis with 2 or less codepoints, as Qt's harfbuzz version
     // has issues rendering those as a single glyph.
     return data.unicode.split("-").length < 3;
 }).map(function(data, category) {
     // Get codepoints
     var codepoints = _(data.unicode.split("-")).map(function (code) {
         //return "\\U" + "0".repeat(8-code.length) + code;
         return byteArrayToCStringLiteral(unicodeCodepointToByteArray(code));
     });
     if (!CategoryMapping.has(data.category)) {
         CategoryMapping = CategoryMapping.set(data.category, []);
     }
     //CategoryMapping.get(data.category).push(codepoints.join(byteArrayToCStringLiteral(unicodeCodepointToByteArray('200D'))));
     // Currently do no join them by a ZWJ as it breaks rendering of a lot simple emojis
     // like $EMOJI followed by skin tone modifier.
     CategoryMapping.get(data.category).push(codepoints.join(""));
     //return 'categories_["' + data.category + '"].push_back("' + codepoints.join('\\U0000200D') + '");';
 });
 
 mapping += '    const std::unordered_map<std::string, std::vector<std::string>> EmojiMapper::emojisInCategory = std::unordered_map<std::string, std::vector<std::string>>{';
 categoryMappings = [];
 for (var category of CategoryMapping.keys()) {
     categoryMappings.push('{"' + category + '", {' + CategoryMapping.get(category).map(function (literal) {
         return '"' + literal + '"';
     }).join(', ') + '}}')
 }
 mapping += categoryMappings.join(', ');
 mapping += '};\n'
 
 mapping.replace(/^\s*\n/gm, '');