From 6d57712fca8f15c4f9d2edf0d3c02f0776daae92 Mon Sep 17 00:00:00 2001
From: Gediminas Petrikas <gedas18@gmail.com>
Date: Sun, 25 Mar 2018 14:13:19 +0300
Subject: [PATCH 1/3] Add fold gutters

---
 browser/components/CodeEditor.js |  5 +++++
 browser/main/global.styl         | 16 ++++++++++++++++
 lib/main.html                    |  5 +++++
 3 files changed, 26 insertions(+)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index eeb1a930..2b653eb6 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -109,8 +109,13 @@ export default class CodeEditor extends React.Component {
       scrollPastEnd: this.props.scrollPastEnd,
       inputStyle: 'textarea',
       dragDrop: false,
+      foldGutter: true,
+      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
       autoCloseBrackets: true,
       extraKeys: {
+        'Ctrl-G': function (cm) {
+          cm.foldCode(cm.getCursor())
+        },
         Tab: function (cm) {
           const cursor = cm.getCursor()
           const line = cm.getLine(cursor.line)
diff --git a/browser/main/global.styl b/browser/main/global.styl
index 1b40587c..8d0e3e37 100644
--- a/browser/main/global.styl
+++ b/browser/main/global.styl
@@ -108,6 +108,22 @@ body[data-theme="dark"]
   background #B1D7FE
 ::selection
   background #B1D7FE
+.CodeMirror-foldmarker
+  font-family: arial
+
+.CodeMirror-foldgutter
+  width: .7em
+
+//.CodeMirror-foldgutter-open,
+//.CodeMirror-foldgutter-folded
+//  color: #555
+//  cursor: pointer
+
+.CodeMirror-foldgutter-open:after
+  content: "\25BE"
+
+.CodeMirror-foldgutter-folded:after
+  content: "\25B8"
 
 .sortableItemHelper
   z-index modalZIndex + 5
diff --git a/lib/main.html b/lib/main.html
index 830d3b48..538fd8ec 100644
--- a/lib/main.html
+++ b/lib/main.html
@@ -92,6 +92,11 @@
   <script src="../node_modules/codemirror/addon/scroll/scrollpastend.js"></script>
   <script src="../node_modules/codemirror/addon/search/matchesonscrollbar.js"></script>
   <script src="../node_modules/codemirror/addon/search/jump-to-line.js"></script>
+
+  <script src="../node_modules/codemirror/addon/fold/brace-fold.js"></script>
+  <script src="../node_modules/codemirror/addon/fold/foldgutter.js"></script>
+  <script src="../node_modules/codemirror/addon/fold/foldcode.js"></script>
+
   <script src="../node_modules/codemirror/addon/dialog/dialog.js"></script>
   <script src="../node_modules/codemirror/addon/display/rulers.js"></script>
 

From 9d6dbc1a6f1c9bb804c8f01aef44a96ba5622485 Mon Sep 17 00:00:00 2001
From: Gediminas Petrikas <gedas18@gmail.com>
Date: Sun, 25 Mar 2018 14:55:06 +0300
Subject: [PATCH 2/3] Remove folding keyboard shortcut

---
 browser/components/CodeEditor.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 2b653eb6..8b729f24 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -113,9 +113,6 @@ export default class CodeEditor extends React.Component {
       gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
       autoCloseBrackets: true,
       extraKeys: {
-        'Ctrl-G': function (cm) {
-          cm.foldCode(cm.getCursor())
-        },
         Tab: function (cm) {
           const cursor = cm.getCursor()
           const line = cm.getLine(cursor.line)

From cd405d1df9a0be4c0c622b40a2cdb804065d1f9a Mon Sep 17 00:00:00 2001
From: Gediminas Petrikas <gedas18@gmail.com>
Date: Sun, 25 Mar 2018 14:55:33 +0300
Subject: [PATCH 3/3] Add cursor pointer when hovering fold gutter

---
 browser/main/global.styl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/browser/main/global.styl b/browser/main/global.styl
index 8d0e3e37..613c7611 100644
--- a/browser/main/global.styl
+++ b/browser/main/global.styl
@@ -114,10 +114,9 @@ body[data-theme="dark"]
 .CodeMirror-foldgutter
   width: .7em
 
-//.CodeMirror-foldgutter-open,
-//.CodeMirror-foldgutter-folded
-//  color: #555
-//  cursor: pointer
+.CodeMirror-foldgutter-open,
+.CodeMirror-foldgutter-folded
+  cursor: pointer
 
 .CodeMirror-foldgutter-open:after
   content: "\25BE"