From 45bf3a0bfb0eb5e3e1b982016489943afcc67030 Mon Sep 17 00:00:00 2001
From: Kushagra Gour <chinchang457@gmail.com>
Date: Fri, 23 Nov 2018 13:23:26 +0530
Subject: [PATCH] CodeEditor: attach fontsize setting to monaco

---
 src/components/CodeEditor.jsx | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/CodeEditor.jsx b/src/components/CodeEditor.jsx
index 6be8258..aa5086d 100644
--- a/src/components/CodeEditor.jsx
+++ b/src/components/CodeEditor.jsx
@@ -66,21 +66,28 @@ export default class CodeEditor extends Component {
 		if (nextProps.prefs !== this.props.prefs) {
 			const { prefs } = nextProps;
 
-			this.instance.setOption('indentWithTabs', prefs.indentWith !== 'spaces');
-			this.instance.setOption(
-				'blastCode',
-				prefs.isCodeBlastOn ? { effect: 2, shake: false } : false
-			);
-			this.instance.setOption('theme', prefs.editorTheme);
+			if (this.props.mode === 'monaco') {
+				this.instance.updateOptions({ fontSize: prefs.fontSize });
+			} else {
+				this.instance.setOption(
+					'indentWithTabs',
+					prefs.indentWith !== 'spaces'
+				);
+				this.instance.setOption(
+					'blastCode',
+					prefs.isCodeBlastOn ? { effect: 2, shake: false } : false
+				);
+				this.instance.setOption('theme', prefs.editorTheme);
 
-			this.instance.setOption('indentUnit', +prefs.indentSize);
-			this.instance.setOption('tabSize', +prefs.indentSize);
+				this.instance.setOption('indentUnit', +prefs.indentSize);
+				this.instance.setOption('tabSize', +prefs.indentSize);
 
-			this.instance.setOption('keyMap', prefs.keymap);
-			this.instance.setOption('lineWrapping', prefs.lineWrap);
-			this.instance.setOption('lineWrapping', prefs.autoCloseTags);
+				this.instance.setOption('keyMap', prefs.keymap);
+				this.instance.setOption('lineWrapping', prefs.lineWrap);
+				this.instance.setOption('lineWrapping', prefs.autoCloseTags);
 
-			this.instance.refresh();
+				this.instance.refresh();
+			}
 		}
 
 		return false;
@@ -129,6 +136,7 @@ export default class CodeEditor extends Component {
 					enabled: false
 				},
 				wordWrap: 'on',
+				renderWhitespace: 'all',
 				fontLigatures: true,
 				automaticLayout: true
 			});