From f563b00f4b0ed996ed2d1cbc684c8aa191e89767 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Tue, 29 Oct 2019 20:25:44 +0300
Subject: [PATCH] IDEA-224908 build macOS Keymap plugin

GitOrigin-RevId: 371f4978ff34f451e79493e4a41c0d3c0160416e
---
 .../build/impl/KeymapPluginsBuilder.groovy    | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/KeymapPluginsBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/KeymapPluginsBuilder.groovy
index 828bb2dbe68e..e5003a47fc22 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/KeymapPluginsBuilder.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/KeymapPluginsBuilder.groovy
@@ -7,24 +7,25 @@ import org.jetbrains.intellij.build.BuildContext
 final class KeymapPluginsBuilder {
 
   static List<PluginRepositorySpec> buildKeymapPlugins(BuildContext buildContext, String targetDir) {
-    [["Default for GNOME"],
-     ["Default for KDE"],
-     ["Default for XWin"],
-     ["Eclipse", "Eclipse (Mac OS X)"],
-     ["Emacs"],
-     ["NetBeans 6.5"],
-     ["ReSharper", "ReSharper OSX"],
-     ["Sublime Text", "Sublime Text (Mac OS X)"],
-     ["Visual Studio"],
-     ["Xcode"]].collect {
-      keymapPlugin(buildContext, targetDir, it)
-    }
+    return [
+      keymapPlugin(["Mac OS X", "Mac OS X 10.5+"], buildContext, targetDir),
+      keymapPlugin(["Default for GNOME"], buildContext, targetDir),
+      keymapPlugin(["Default for KDE"], buildContext, targetDir),
+      keymapPlugin(["Default for XWin"], buildContext, targetDir),
+      keymapPlugin(["Eclipse", "Eclipse (Mac OS X)"], buildContext, targetDir),
+      keymapPlugin(["Emacs"], buildContext, targetDir),
+      keymapPlugin(["NetBeans 6.5"], buildContext, targetDir),
+      keymapPlugin(["ReSharper", "ReSharper OSX"], buildContext, targetDir),
+      keymapPlugin(["Sublime Text", "Sublime Text (Mac OS X)"], buildContext, targetDir),
+      keymapPlugin(["Visual Studio"], buildContext, targetDir),
+      keymapPlugin(["Xcode"], buildContext, targetDir)
+    ]
   }
 
-  static PluginRepositorySpec keymapPlugin(BuildContext buildContext, String targetDir, List<String> keymaps) {
+  static PluginRepositorySpec keymapPlugin(List<String> keymaps, BuildContext buildContext, String targetDir) {
     def keymapPath = "$buildContext.paths.communityHome/platform/platform-resources/src/keymaps"
-    def longName = keymaps[0].replaceAll("Default for ", "")
-    def shortName = keymaps[0].replaceAll("[.0-9 ]|Default for ", "")
+    def longName = keymaps[0].replace("Mac OS X", "macOS").replaceAll("Default for |[.0-9]", "").trim()
+    def shortName = longName.replaceAll(" ", "")
     def tempDir = new File(buildContext.paths.temp, "keymap-plugins/${shortName.toLowerCase()}")
     new File(tempDir, "META-INF").mkdirs()
     new File(tempDir, "META-INF/plugin.xml").text = keymapPluginXml(buildContext.buildNumber, shortName.toLowerCase(), longName, keymaps)