From b963fe96192070d922be62219bf419764a780219 Mon Sep 17 00:00:00 2001
From: pathmapper <pathmapper@posteo.de>
Date: Tue, 29 Oct 2019 10:52:06 +0100
Subject: [PATCH 1/2] Add matchbrackets addon

---
 src/codemirror-maputnik.css          | 2 +-
 src/components/layers/JSONEditor.jsx | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/codemirror-maputnik.css b/src/codemirror-maputnik.css
index 83b653b2..ec706b30 100644
--- a/src/codemirror-maputnik.css
+++ b/src/codemirror-maputnik.css
@@ -47,5 +47,5 @@
 }
 
 .cm-s-maputnik .CodeMirror-matchingbracket {
-  text-decoration: underline; color: white !important;
+  color: white !important;
 }
diff --git a/src/components/layers/JSONEditor.jsx b/src/components/layers/JSONEditor.jsx
index a8c0ce58..4fbd0097 100644
--- a/src/components/layers/JSONEditor.jsx
+++ b/src/components/layers/JSONEditor.jsx
@@ -7,6 +7,7 @@ import CodeMirror from 'codemirror';
 
 import 'codemirror/mode/javascript/javascript'
 import 'codemirror/addon/lint/lint'
+import 'codemirror/addon/edit/matchbrackets'
 import 'codemirror/lib/codemirror.css'
 import 'codemirror/addon/lint/lint.css'
 import '../../codemirror-maputnik.css'
@@ -47,6 +48,7 @@ class JSONEditor extends React.Component {
       viewportMargin: Infinity,
       lineNumbers: true,
       lint: true,
+      matchBrackets: true,
       gutters: ["CodeMirror-lint-markers"],
       scrollbarStyle: "null",
     });
@@ -112,6 +114,7 @@ class JSONEditor extends React.Component {
       viewportMargin: Infinity,
       lineNumbers: true,
       lint: true,
+      matchBrackets: true,
       gutters: ["CodeMirror-lint-markers"],
       scrollbarStyle: "null",
     }

From 6b245c9894f1493f0f6a12bb488761d6c538fec4 Mon Sep 17 00:00:00 2001
From: pathmapper <pathmapper@posteo.de>
Date: Wed, 30 Oct 2019 12:24:25 +0100
Subject: [PATCH 2/2] Improve matchingbrackets and cursor visibility

---
 src/codemirror-maputnik.css | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/codemirror-maputnik.css b/src/codemirror-maputnik.css
index ec706b30..b43c6c0f 100644
--- a/src/codemirror-maputnik.css
+++ b/src/codemirror-maputnik.css
@@ -17,7 +17,7 @@
 }
 
 .cm-s-maputnik .CodeMirror-cursor {
-    border-left: solid thin #8e8e8e !important;
+    border-left: solid thin #f0f0f0 !important;
 }
 
 .cm-s-maputnik.CodeMirror-focused div.CodeMirror-selected {
@@ -47,5 +47,11 @@
 }
 
 .cm-s-maputnik .CodeMirror-matchingbracket {
+  background-color: #f0f0f0;  
+  color: #565659 !important;
+}
+
+.cm-s-maputnik .CodeMirror-nonmatchingbracket {
+  background-color: #bb0000;  
   color: white !important;
 }