From b72c03222c2d108795b7ae015f62df43bb262b9b Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Mon, 18 Apr 2016 15:53:55 -0400
Subject: [PATCH] InlineEdit: Add Sublime Text keymap

Sublime Text keymap has been available since CodeMirror 4.0. This change
enables using it in the EditScreen.

Change-Id: I34e82fceb9502405d8d03a6c6117d4900d08248e
---
 Documentation/rest-api-accounts.txt                            | 2 +-
 .../java/com/google/gerrit/extensions/client/KeyMapType.java   | 1 +
 .../com/google/gerrit/client/editor/EditPreferencesBox.java    | 3 +++
 lib/codemirror/cm.defs                                         | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Documentation/rest-api-accounts.txt b/Documentation/rest-api-accounts.txt
index 0cfda24e42..06520e4923 100644
--- a/Documentation/rest-api-accounts.txt
+++ b/Documentation/rest-api-accounts.txt
@@ -1814,7 +1814,7 @@ CodeMirror themes are supported. Light themes `DEFAULT`, `ECLIPSE`,
 `ELEGANT`, `NEAT`. Dark themes `MIDNIGHT`, `NIGHT`, `TWILIGHT`.
 |`key_map_type`                ||
 The CodeMirror key map. Currently only a subset of key maps are
-supported: `DEFAULT`, `EMACS`, `VIM`.
+supported: `DEFAULT`, `EMACS`, `SUBLIME`, `VIM`.
 |`tab_size`                    ||
 Number of spaces that should be used to display one tab.
 |`line_length`                 ||
diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/KeyMapType.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/KeyMapType.java
index 261168ddee..66641b0225 100644
--- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/KeyMapType.java
+++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/client/KeyMapType.java
@@ -17,5 +17,6 @@ package com.google.gerrit.extensions.client;
 public enum KeyMapType {
   DEFAULT,
   EMACS,
+  SUBLIME,
   VIM
 }
\ No newline at end of file
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.java
index 0e28162701..b9bd7f418c 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditPreferencesBox.java
@@ -321,6 +321,9 @@ public class EditPreferencesBox extends Composite {
     keyMap.addItem(
         KeyMapType.EMACS.name().toLowerCase(),
         KeyMapType.EMACS.name());
+    keyMap.addItem(
+        KeyMapType.SUBLIME.name().toLowerCase(),
+        KeyMapType.SUBLIME.name());
     keyMap.addItem(
         KeyMapType.VIM.name().toLowerCase(),
         KeyMapType.VIM.name());
diff --git a/lib/codemirror/cm.defs b/lib/codemirror/cm.defs
index 9a80a30316..a3db79fb07 100644
--- a/lib/codemirror/cm.defs
+++ b/lib/codemirror/cm.defs
@@ -8,8 +8,9 @@ CM_CSS = [
 CM_JS = [
   'lib/codemirror.js',
   'mode/meta.js',
-  'keymap/vim.js',
   'keymap/emacs.js',
+  'keymap/sublime.js',
+  'keymap/vim.js',
 ]
 
 CM_ADDONS = [