feat: support CM modes: go, javascript, htmlmixed, markdown, python

README.md

@@ -82,6 +82,16 @@ Mergely will emit an `updated` event when the editor is first initialized, and e
 </body>
 ```
 
+### Visualization modes
+
+Mergely supports the following CodeMirror visualizations for [mode](codemirror.net/5/doc/manual.html#option_mode):
+
+* go
+* javascript
+* htmlmixed
+* markdown
+* python
+
 ## Options
 
 |Option|Type|Default value|Description|

src/diff-view.js

@@ -2,6 +2,12 @@ const CodeMirror = require('codemirror');
 require('codemirror/addon/search/searchcursor.js');
 require('codemirror/addon/selection/mark-selection.js');
 require('codemirror/lib/codemirror.css');
+require('codemirror/mode/go/go.js');
+require('codemirror/mode/javascript/javascript.js');
+require('codemirror/mode/htmlmixed/htmlmixed.js');
+require('codemirror/mode/markdown/markdown.js');
+require('codemirror/mode/python/python.js');
+
 const dom = require('./dom.js');
 const VDoc = require('./vdoc');
 

src/mergely.js

@@ -23,7 +23,8 @@ const defaultOptions = {
 	vpcolor: 'rgba(0, 0, 200, 0.5)',
 	license: 'lgpl',
 	cmsettings: {
-		styleSelectedText: true
+		styleSelectedText: true,
+		mode: null
 	},
 	lhs_cmsettings: {},
 	rhs_cmsettings: {},

test/mergely.spec.js

@@ -22,7 +22,8 @@ const defaultOptions = {
 	vpcolor: 'rgba(0, 0, 200, 0.5)',
 	license: 'lgpl',
 	cmsettings: {
-		styleSelectedText: true
+		styleSelectedText: true,
+		mode: null
 	},
 	_debug: false
 };