@(diff: playRepository.FileDiff, comments: java.util.List[_ <: CodeComment], projectB: Project, projectA: Project) @import playRepository.DiffLineType @import playRepository.DiffLine @import playRepository.FileDiff @import playRepository.Hunk @import org.eclipse.jgit.diff.DiffEntry @import org.eclipse.jgit.diff.RawText @import utils.TemplateHelper.DiffRenderer._ @import utils.TemplateHelper._ @import scala.collection.immutable.Map @import scala.collection.immutable.List @import scala.collection.JavaConversions._ @import org.apache.commons.lang.StringEscapeUtils.escapeHtml; @import FileDiff.Error._ @** * 변경 내용(Diff) 표시 * * @param diff * @param comments **@ @renderDiffLines(diff: playRepository.FileDiff, comments: Map[String, List[_ <: CodeComment]]) = { @if(diff.isFileModeChanged) { <tr><td class="linenum"><div class="line-number" data-line-num="@diff.oldMode"></div><span class="hidden">@diff.oldMode</span></td><td class="linenum"><div class="line-number" data-line-num="@diff.newMode"></div><span class="hidden">@diff.newMode</span></td><td class="isBinary">@Messages("code.fileModeChanged")</td></tr> } @null match { case _ if diff.hasError(OTHERS_SIZE_EXCEEDED) => { <tr><td colspan=3>@Messages("code.skipDiff")</td></tr> } case _ if diff.hasAnyError(A_SIZE_EXCEEDED, B_SIZE_EXCEEDED) => { <tr><td colspan=3>@Messages("code.tooBigFile")</td></tr> } case _ if diff.hasError(DIFF_SIZE_EXCEEDED) => { <tr><td colspan=3>@Messages("code.tooBigDiff")</td></tr> } case _ if diff.hasError => { <tr><td colspan=3>@Messages("code.unknownError")</td></tr> } case _ => { @diff.getHunks match { case hunks if (hunks.size <= 0) => { @diff.isFileModeChanged match { case true => { } case false => { <tr><td colspan=3>@Messages("code.noChanges")</td></tr> } } } case hunks => { @for(hunk <- diff.getHunks) { <tr class="range"><td class="linenum"><div class="line-number" data-line-num="..."><span class="hidden">...</span></div></td><td class="linenum"><div class="line-number" data-line-num="..."><span class="hidden">...</span></div></td><td class="hunk">@@@@ -@(hunk.beginA + 1),@(hunk.endA - hunk.beginA) +@(hunk.beginB + 1),@(hunk.endB - hunk.beginB) @@@@</td></tr> @Html(renderLines(hunk.lines.toList, comments, eolMissingChecker(diff))) } } } } } } @** * 파일 내용 표시 * * 성능 문제를 해결하기 위해 StringBuilder를 사용했다. * * 주의: StringBuilder는 thread-safe 하지 않다. * * @param klass * @param path * @param rawText * @param kind * @param prefix * @param comments **@ @renderRawFile(klass: String, path: String, rawText: RawText, side: CodeComment.Side, prefix: String, comments: Map[String, List[_ <: CodeComment]]) = { @defining(new StringBuilder) { builder => @for(i <- 0 until rawText.size) @{ builder.append("<tr class='") builder.append(klass) builder.append("' data-line='") builder.append(i + 1) builder.append("' data-type='") builder.append(klass) builder.append("'><td class='linenum'><i class='icon-comment'></i><div class='line-number'></div></td>") builder.append("<td class='linenum'><div class='line-number' data-line-num='") builder.append(i + 1) builder.append("'></div><span class='hidden'>") builder.append(i + 1) builder.append("</span></td><td class='code'><pre class='diff-partial-codeline'>") builder.append(prefix) builder.append(escapeHtml(rawText.getString(i))) if ((i + 1 == rawText.size) && rawText.isMissingNewlineAtEnd) { builder.append(noNewlineAtEof) } builder.append("</pre></td></tr>") builder.append(partial_diff_comment_on_line(commentsOrEmpty(comments, commentKey(path, side, i + 1))).toString.trim) } @Html(builder.toString) } } @** * 추가된 라인 표시 * * @param diff * @param comments * @param isBinaryOverwritten 기존 데이터가 바이너리인 경우 true **@ @renderAddedLines(diff: FileDiff, comments:Map[String, List[_ <: CodeComment]], isBinaryOverwritten: Boolean = false) = { @null match { case _ if diff.hasError(OTHERS_SIZE_EXCEEDED) => { <tr><td colspan=3>@Messages("code.skipDiff")</td></tr> } case _ if diff.hasError(B_SIZE_EXCEEDED) => { <tr><td colspan=3>@Messages("code.tooBigFile")</td></tr> } case _ if diff.hasError => { <tr><td colspan=3>@Messages("code.unknownError")</td></tr> } case null => { <tr class="range"><td class="linenum"><div class="line-number" data-line-num="..."><span class="hidden">...</span></div></td><td class="linenum"><div class="line-number" data-line-num="..."><span class="hidden">...</span></div></td><td class="hunk">@@@@ -0,0 +1,@diff.b.size @@@@</td></tr> @if(isBinaryOverwritten ) { @renderCodeIsBinary("remove", "-") } @renderRawFile("add", diff.pathB, diff.b, CodeComment.Side.B, "+", comments) } } } @** * 삭제된 라인 표시 * * @param diff * @param comments * @param isOverwrittenByBinary 새 데이터가 바이너리인 경우 true **@ @renderRemovedLines(diff: FileDiff, comments:Map[String, List[_ <: CodeComment]], isOverwrittenByBinary: Boolean = false) = { @null match { case _ if diff.hasError(OTHERS_SIZE_EXCEEDED) => { <tr><td colspan=3>@Messages("code.skipDiff")</td></tr> } case _ if diff.hasError(A_SIZE_EXCEEDED) => { <tr><td colspan=3>@Messages("code.tooBigFile")</td></tr> } case _ if diff.hasError => { <tr><td colspan=3>@Messages("code.unknownError")</td></tr> } case _ => { <tr class="range"><td class="linenum"><div class="line-number" data-line-num="..."><span class="hidden">...</span></div></td><td class="linenum"><div class="line-number" data-line-num="..."><span class="hidden">...</span></div></td><td class="hunk">@@@@ -1,@diff.a.size +0,0 @@@@</td></tr> @renderRawFile("remove", diff.pathA, diff.a, CodeComment.Side.A, "-", comments) @if(isOverwrittenByBinary) { @renderCodeIsBinary("add", "+") } } } } @** * 커밋 아이디를 ShortId 로 만듭니다 * SVN 인 경우 7자 이하인 경우가 많기 때문 * * @param commitId **@ @getShortenedCommitId(commitId:String) = @{ if(commitId.length < 7){ commitId } else { commitId.substring(0,7) } } @getFileHeadId(diff: FileDiff) = @{ defining(Option(diff.pathB).getOrElse(diff.pathA)) { path => path.replace("/", "-").replace(".", "-") } } @** * 파일 헤더를 포함한 변경점 렌더링 * * @param diff * @param fileHeader * @param renderedLines **@ @renderFile(diff: FileDiff, fileHeader: String, renderedLines: Html) = { <div class="diff-partial-outer"> <div class="diff-partial-inner"> <div class="diff-partial-meta"> <div class="diff-partial-commit"> <div class="diff-partial-commit-id"> @if(diff.commitA != null && diff.pathA != null){ <a href="@routes.CodeApp.codeBrowserWithBranch(projectA.owner, projectA.name, diff.commitA, diff.pathA)" title="@diff.commitA" target="_blank">@getShortenedCommitId(diff.commitA)</a> } else { &nbsp; } </div> <div class="diff-partial-commit-id"> @if(diff.commitB != null && diff.pathB != null){ <a href="@routes.CodeApp.codeBrowserWithBranch(projectB.owner, projectB.name, diff.commitB, diff.pathB)" title="@diff.commitB" target="_blank">@getShortenedCommitId(diff.commitB)</a></td> } else { &nbsp; } </div> </div> <div class="diff-partial-file"> <span class="filename">@fileHeader</span> </div> <div class="diff-partial-utility"> @if(diff.commitA && diff.commitB && diff.pathA && diff.pathB){ <button type="button" class="ybtn ybtn-small" data-toggle="mergely" data-pathA="@diff.pathA" data-pathB="@diff.pathB" data-commitA="@diff.commitA" data-commitB="@diff.commitB" data-rawA="@routes.CodeApp.showRawFile(projectA.owner, projectA.name, diff.commitA, diff.pathA)" data-rawB="@routes.CodeApp.showRawFile(projectB.owner, projectB.name, diff.commitB, diff.pathB)" >@Messages("code.fullDiff")</button> } </div> </div> <div class="diff-partial-code"> <table class="diff-container show-comments" data-path-a="@diff.pathA" data-path-b="@diff.pathB" data-commit-a="@diff.commitA" data-commit-b="@diff.commitB"> <tbody> @renderedLines </tbody> </table> </div> </div> </div> } @** * 바이너리 파일이면 경로명 뒤에 (Binary) 붙이기 * * @param path * @param isBinary **@ @getPathPostfixedBinary(path:String, isBinary:Boolean) = @{ path + (if (isBinary) { " (Binary)" } else { "" } ) } @** * 파일 헤더 영역 메시지 * * @param headerType * @param diff **@ @getFileHeaderMessage(headerType:DiffEntry.ChangeType, diff:FileDiff) = @{ headerType match { case DiffEntry.ChangeType.MODIFY => { getPathPostfixedBinary(diff.pathB, diff.isBinaryB) } case DiffEntry.ChangeType.ADD => { Messages("code.addedPath", getPathPostfixedBinary(diff.pathB, diff.isBinaryB)) } case DiffEntry.ChangeType.DELETE => { Messages("code.deletedPath", getPathPostfixedBinary(diff.pathA, diff.isBinaryA)) } case DiffEntry.ChangeType.RENAME => { Messages("code.renamedPath", getPathPostfixedBinary(diff.pathA, diff.isBinaryA), getPathPostfixedBinary(diff.pathB, diff.isBinaryB)) } case DiffEntry.ChangeType.COPY => { Messages("code.copiedPath", getPathPostfixedBinary(diff.pathA, diff.isBinaryA), getPathPostfixedBinary(diff.pathB, diff.isBinaryB)) } case _ => { "" } } } @** * 바이너리 파일입니다 표시 * 이 영역에는 댓글을 달 수 없음 * * @param klass CSS 클래스명. add/remove * @param prefix **@ @renderCodeIsBinary(klass:String = "", prefix:String = "") = { <tr class="@klass"><td class='linenum'><div class='line-number'></div></td><td class='linenum'><div class='line-number'></div></td><td class="isBinary">@prefix@Messages("code.isBinary")</td></tr> } @getComments(comments: java.util.List[_ <: CodeComment]) = @{ if(comments != null){ comments.toList.groupBy((comment: CodeComment) => commentKey(comment.path, comment.side, comment.line)) } else { null } } @defining(getComments(comments)) { comments => @diff.changeType match { case DiffEntry.ChangeType.MODIFY => { @(diff.isBinaryA, diff.isBinaryB) match { case (true, true) => { @renderFile(diff, getFileHeaderMessage(DiffEntry.ChangeType.MODIFY, diff), renderCodeIsBinary()) } case (true, false) => { @renderFile(diff, getFileHeaderMessage(DiffEntry.ChangeType.MODIFY, diff), renderAddedLines(diff, comments, true)) } case (false, true) => { @renderFile(diff, getFileHeaderMessage(DiffEntry.ChangeType.MODIFY, diff), renderRemovedLines(diff, comments, true)) } case (false, false) => { @renderFile(diff, diff.pathB, renderDiffLines(diff, comments)) } } } case DiffEntry.ChangeType.ADD => { @if(diff.isBinaryB){ @renderFile(diff, getFileHeaderMessage(DiffEntry.ChangeType.ADD, diff), renderCodeIsBinary()) } else { @renderFile(diff, getFileHeaderMessage(DiffEntry.ChangeType.ADD, diff), renderAddedLines(diff, comments)) } } case DiffEntry.ChangeType.DELETE => { @if(diff.isBinaryA){ @renderFile(diff, getFileHeaderMessage(DiffEntry.ChangeType.DELETE, diff), renderCodeIsBinary()) } else { @renderFile(diff, Messages("code.deletedPath", diff.pathA), renderRemovedLines(diff, comments)) } } case DiffEntry.ChangeType.RENAME => { @(diff.isBinaryA, diff.isBinaryB) match { case (true, true) => { @renderFile(diff, getFileHeaderMessage(DiffEntry.ChangeType.RENAME, diff), renderCodeIsBinary()) } case (true, false) => { @renderFile(diff, getFileHeaderMessage(DiffEntry.ChangeType.RENAME, diff), renderAddedLines(diff, comments, true)) } case (false, true) => { @renderFile(diff, getFileHeaderMessage(DiffEntry.ChangeType.RENAME, diff), renderRemovedLines(diff, comments, true)) } case (false, false) => { @renderFile(diff, Messages("code.renamedPath", diff.pathA, diff.pathB), renderDiffLines(diff, comments)) } } } case DiffEntry.ChangeType.COPY => { @if(diff.isBinaryB){ @renderFile(diff, getFileHeaderMessage(DiffEntry.ChangeType.COPY, diff), renderCodeIsBinary()) } else { @renderFile(diff, Messages("code.copiedPath", diff.pathA, diff.pathB), renderAddedLines(diff, comments)) } } } }