opendev/gerrit
Code Issues Proposed changes

Merge "SideBySide2: Defer syntax highlighting on large files"

Browse Source
This commit is contained in:
Shawn Pearce
2013-12-09 16:47:54 +00:00
committed by Gerrit Code Review
parent f9b92f04c3 d62a6a94a4
commit 2ac58acbc7
4 changed files with 74 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
View File

@@ -132,12 +132,14 @@ public class GetDiff implements RestReadView<FileResource> {
result.metaA = new FileMeta();
result.metaA.name = Objects.firstNonNull(ps.getOldName(), ps.getNewName());
result.metaA.setContentType(ps.getFileModeA(), ps.getMimeTypeA());
result.metaA.lines = ps.getA().size();
}
if (ps.getDisplayMethodB() != DisplayMethod.NONE) {
result.metaB = new FileMeta();
result.metaB.name = ps.getNewName();
result.metaB.setContentType(ps.getFileModeB(), ps.getMimeTypeB());
result.metaB.lines = ps.getB().size();
}
if (intraline) {
@@ -179,7 +181,7 @@ public class GetDiff implements RestReadView<FileResource> {
static class FileMeta {
String name;
String contentType;
String url;
Integer lines;
void setContentType(FileMode fileMode, String mimeType) {
switch (fileMode) {