Alphabetize the CodeMirror options in newCM() in SidebySide.

Change-Id: I1a8c3fa5f942cef4dc0d79b1a0b7f998c5123cc0
This commit is contained in:
Michael Zhou
2016-03-09 12:56:45 -05:00
parent b50f450f9c
commit 5572eadc72

View File

@@ -637,18 +637,18 @@ public class SideBySide extends Screen {
String contents, String contents,
Element parent) { Element parent) {
return CodeMirror.create(parent, Configuration.create() return CodeMirror.create(parent, Configuration.create()
.set("readOnly", true)
.set("cursorBlinkRate", prefs.cursorBlinkRate()) .set("cursorBlinkRate", prefs.cursorBlinkRate())
.set("cursorHeight", 0.85) .set("cursorHeight", 0.85)
.set("keyMap", "vim_ro")
.set("lineNumbers", prefs.showLineNumbers()) .set("lineNumbers", prefs.showLineNumbers())
.set("tabSize", prefs.tabSize()) .set("lineWrapping", false)
.set("matchBrackets", prefs.matchBrackets()) .set("matchBrackets", prefs.matchBrackets())
.set("mode", fileSize == FileSize.SMALL ? getContentType(meta) : null) .set("mode", fileSize == FileSize.SMALL ? getContentType(meta) : null)
.set("lineWrapping", false) .set("readOnly", true)
.set("scrollbarStyle", "overlay") .set("scrollbarStyle", "overlay")
.set("styleSelectedText", true)
.set("showTrailingSpace", prefs.showWhitespaceErrors()) .set("showTrailingSpace", prefs.showWhitespaceErrors())
.set("keyMap", "vim_ro") .set("styleSelectedText", true)
.set("tabSize", prefs.tabSize())
.set("theme", prefs.theme().name().toLowerCase()) .set("theme", prefs.theme().name().toLowerCase())
.set("value", meta != null ? contents : "") .set("value", meta != null ? contents : "")
.set("viewportMargin", renderEntireFile() ? POSITIVE_INFINITY : 10)); .set("viewportMargin", renderEntireFile() ? POSITIVE_INFINITY : 10));