opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14'

Browse Source 
* stable-2.14:
  Update the .mailmap file
  Update .mailmap
  Preserve line-endings in inline editing

Change-Id: I57d8536416ace5c08a012b3093424b26abdc39ed
This commit is contained in:
David Pursehouse
2017-06-27 19:36:22 +09:00
parent f6cf040a5a d846f55f1a
commit c8c63db4eb
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java
View File

@@ -541,26 +541,23 @@ public class EditScreen extends Screen {
mode = ModeInfo.findMode(content.getContentType(), path); mode = ModeInfo.findMode(content.getContentType(), path);
} }
} }
mv =
MergeView.create( Configuration cfg = Configuration.create().set("autoCloseBrackets", prefs.autoCloseBrackets())
editor, .set("cursorBlinkRate", prefs.cursorBlinkRate()).set("cursorHeight", 0.85)
Configuration.create() .set("indentUnit", prefs.indentUnit())
.set("autoCloseBrackets", prefs.autoCloseBrackets()) .set("keyMap", prefs.keyMapType().name().toLowerCase())
.set("cursorBlinkRate", prefs.cursorBlinkRate()) .set("lineNumbers", prefs.hideLineNumbers()).set("lineWrapping", false)
.set("cursorHeight", 0.85) .set("matchBrackets", prefs.matchBrackets()).set("mode", mode != null ? mode.mime() : null)
.set("indentUnit", prefs.indentUnit()) .set("origLeft", editContent).set("scrollbarStyle", "overlay")
.set("keyMap", prefs.keyMapType().name().toLowerCase()) .set("showTrailingSpace", prefs.showWhitespaceErrors()).set("styleSelectedText", true)
.set("lineNumbers", prefs.hideLineNumbers()) .set("tabSize", prefs.tabSize()).set("theme", prefs.theme().name().toLowerCase())
.set("lineWrapping", false) .set("value", "");
.set("matchBrackets", prefs.matchBrackets())
.set("mode", mode != null ? mode.mime() : null) if (editContent.contains("\r\n")) {
.set("origLeft", editContent) cfg.set("lineSeparator", "\r\n");
.set("scrollbarStyle", "overlay") }
.set("showTrailingSpace", prefs.showWhitespaceErrors())
.set("styleSelectedText", true) mv = MergeView.create(editor, cfg);
.set("tabSize", prefs.tabSize())
.set("theme", prefs.theme().name().toLowerCase())
.set("value", ""));
cmBase = mv.leftOriginal(); cmBase = mv.leftOriginal();
cmBase.getWrapperElement().addClassName(style.base()); cmBase.getWrapperElement().addClassName(style.base());