From 7a4258bb208d43be80e575fe61c0a0a187811e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pavli=CC=81k?= <david@dpavlik.cz>
Date: Wed, 20 Sep 2017 22:33:51 +0200
Subject: [PATCH 1/3] Make line numbers in the editor optional

---
 browser/components/CodeEditor.js              |  6 +++++-
 browser/components/MarkdownEditor.js          |  3 +++
 browser/main/Detail/SnippetNoteDetail.js      |  1 +
 browser/main/lib/ConfigManager.js             |  1 +
 browser/main/modals/PreferencesModal/UiTab.js | 12 ++++++++++++
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index f00794bf..8378f493 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -50,7 +50,7 @@ export default class CodeEditor extends React.Component {
     this.value = this.props.value
     this.editor = CodeMirror(this.refs.root, {
       value: this.props.value,
-      lineNumbers: true,
+      lineNumbers: this.props.lineNumber,
       lineWrapping: true,
       theme: this.props.theme,
       indentUnit: this.props.indentSize,
@@ -141,6 +141,10 @@ export default class CodeEditor extends React.Component {
       this.editor.setOption('indentWithTabs', this.props.indentType !== 'space')
     }
 
+    if (prevProps.lineNumber !== this.props.lineNumber) {
+      this.editor.setOption('lineNumbers', this.props.lineNumber)
+    }
+
     if (needRefresh) {
       this.editor.refresh()
     }
diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index f20ec087..e5b7287c 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -213,6 +213,8 @@ class MarkdownEditor extends React.Component {
     if (!(editorFontSize > 0 && editorFontSize < 101)) editorFontSize = 14
     let editorIndentSize = parseInt(config.editor.indentSize, 10)
     if (!(editorFontSize > 0 && editorFontSize < 132)) editorIndentSize = 4
+    let editorLineNumber = config.editor.lineNumber
+    if (editorLineNumber === undefined) editorLineNumber = true
 
     let previewStyle = {}
     if (this.props.ignorePreviewPointerEvents) previewStyle.pointerEvents = 'none'
@@ -242,6 +244,7 @@ class MarkdownEditor extends React.Component {
           fontSize={editorFontSize}
           indentType={config.editor.indentType}
           indentSize={editorIndentSize}
+          lineNumber={editorLineNumber}
           storageKey={storageKey}
           onChange={(e) => this.handleChange(e)}
           onBlur={(e) => this.handleBlur(e)}
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 5f767b70..a7b0a8b3 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -530,6 +530,7 @@ class SnippetNoteDetail extends React.Component {
             fontSize={editorFontSize}
             indentType={config.editor.indentType}
             indentSize={editorIndentSize}
+            lineNumber
             keyMap={config.editor.keyMap}
             onChange={(e) => this.handleCodeChange(index)(e)}
             ref={'code-' + index}
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 543c7e5b..f87c1dc0 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -35,6 +35,7 @@ export const DEFAULT_CONFIG = {
     fontFamily: win ? 'Segoe UI' : 'Monaco, Consolas',
     indentType: 'space',
     indentSize: '2',
+    lineNumber: true,
     switchPreview: 'BLUR' // Available value: RIGHTCLICK, BLUR
   },
   preview: {
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index 96c04ddf..bea6d28b 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -46,6 +46,7 @@ class UiTab extends React.Component {
         fontFamily: this.refs.editorFontFamily.value,
         indentType: this.refs.editorIndentType.value,
         indentSize: this.refs.editorIndentSize.value,
+        lineNumber: this.refs.editorLineNumber.checked,
         switchPreview: this.refs.editorSwitchPreview.value,
         keyMap: this.refs.editorKeyMap.value
       },
@@ -222,6 +223,17 @@ class UiTab extends React.Component {
             </div>
           </div>
 
+          <div styleName='group-checkBoxSection'>
+            <label>
+              <input onChange={(e) => this.handleUIChange(e)}
+                checked={this.state.config.editor.lineNumber}
+                ref='editorLineNumber'
+                type='checkbox'
+              />&nbsp;
+              Show line numbers in the editor
+            </label>
+          </div>
+
           <div styleName='group-header2'>Preview</div>
           <div styleName='group-section'>
             <div styleName='group-section-label'>

From 1f5f6c3b0ed912ced8bc6fa0e03d716db4bfa6cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pavli=CC=81k?= <david@dpavlik.cz>
Date: Sat, 23 Dec 2017 22:51:38 +0100
Subject: [PATCH 2/3] Rename 'lineNumber' to 'displayLineNumbers'

---
 browser/components/CodeEditor.js              | 6 +++---
 browser/components/MarkdownEditor.js          | 4 +---
 browser/main/Detail/SnippetNoteDetail.js      | 2 +-
 browser/main/lib/ConfigManager.js             | 2 +-
 browser/main/modals/PreferencesModal/UiTab.js | 6 +++---
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 8378f493..66e647d6 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -50,7 +50,7 @@ export default class CodeEditor extends React.Component {
     this.value = this.props.value
     this.editor = CodeMirror(this.refs.root, {
       value: this.props.value,
-      lineNumbers: this.props.lineNumber,
+      lineNumbers: this.props.displayLineNumbers,
       lineWrapping: true,
       theme: this.props.theme,
       indentUnit: this.props.indentSize,
@@ -141,8 +141,8 @@ export default class CodeEditor extends React.Component {
       this.editor.setOption('indentWithTabs', this.props.indentType !== 'space')
     }
 
-    if (prevProps.lineNumber !== this.props.lineNumber) {
-      this.editor.setOption('lineNumbers', this.props.lineNumber)
+    if (prevProps.displayLineNumbers !== this.props.displayLineNumbers) {
+      this.editor.setOption('lineNumbers', this.props.displayLineNumbers)
     }
 
     if (needRefresh) {
diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index e5b7287c..88485207 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -213,8 +213,6 @@ class MarkdownEditor extends React.Component {
     if (!(editorFontSize > 0 && editorFontSize < 101)) editorFontSize = 14
     let editorIndentSize = parseInt(config.editor.indentSize, 10)
     if (!(editorFontSize > 0 && editorFontSize < 132)) editorIndentSize = 4
-    let editorLineNumber = config.editor.lineNumber
-    if (editorLineNumber === undefined) editorLineNumber = true
 
     let previewStyle = {}
     if (this.props.ignorePreviewPointerEvents) previewStyle.pointerEvents = 'none'
@@ -244,7 +242,7 @@ class MarkdownEditor extends React.Component {
           fontSize={editorFontSize}
           indentType={config.editor.indentType}
           indentSize={editorIndentSize}
-          lineNumber={editorLineNumber}
+          displayLineNumbers={config.editor.displayLineNumbers}
           storageKey={storageKey}
           onChange={(e) => this.handleChange(e)}
           onBlur={(e) => this.handleBlur(e)}
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index a7b0a8b3..2f5ba34f 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -530,7 +530,7 @@ class SnippetNoteDetail extends React.Component {
             fontSize={editorFontSize}
             indentType={config.editor.indentType}
             indentSize={editorIndentSize}
-            lineNumber
+            displayLineNumbers
             keyMap={config.editor.keyMap}
             onChange={(e) => this.handleCodeChange(index)(e)}
             ref={'code-' + index}
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index f87c1dc0..cdd7eb80 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -35,7 +35,7 @@ export const DEFAULT_CONFIG = {
     fontFamily: win ? 'Segoe UI' : 'Monaco, Consolas',
     indentType: 'space',
     indentSize: '2',
-    lineNumber: true,
+    displayLineNumbers: true,
     switchPreview: 'BLUR' // Available value: RIGHTCLICK, BLUR
   },
   preview: {
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index bea6d28b..61aca0dc 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -46,7 +46,7 @@ class UiTab extends React.Component {
         fontFamily: this.refs.editorFontFamily.value,
         indentType: this.refs.editorIndentType.value,
         indentSize: this.refs.editorIndentSize.value,
-        lineNumber: this.refs.editorLineNumber.checked,
+        displayLineNumbers: this.refs.editorDisplayLineNumbers.checked,
         switchPreview: this.refs.editorSwitchPreview.value,
         keyMap: this.refs.editorKeyMap.value
       },
@@ -226,8 +226,8 @@ class UiTab extends React.Component {
           <div styleName='group-checkBoxSection'>
             <label>
               <input onChange={(e) => this.handleUIChange(e)}
-                checked={this.state.config.editor.lineNumber}
-                ref='editorLineNumber'
+                checked={this.state.config.editor.displayLineNumbers}
+                ref='editorDisplayLineNumbers'
                 type='checkbox'
               />&nbsp;
               Show line numbers in the editor

From 85065357e2f91d9cc237874986e937f64478f7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pavli=CC=81k?= <david@dpavlik.cz>
Date: Sat, 23 Dec 2017 22:52:50 +0100
Subject: [PATCH 3/3] Make the option to disable line numbers in editor affect
 snippet notes too

---
 browser/main/Detail/SnippetNoteDetail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 2f5ba34f..f45ce5d6 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -530,7 +530,7 @@ class SnippetNoteDetail extends React.Component {
             fontSize={editorFontSize}
             indentType={config.editor.indentType}
             indentSize={editorIndentSize}
-            displayLineNumbers
+            displayLineNumbers={config.editor.displayLineNumbers}
             keyMap={config.editor.keyMap}
             onChange={(e) => this.handleCodeChange(index)(e)}
             ref={'code-' + index}