From 8a76d2c782b32ed8bd27edcb8ffc9bd96417ad51 Mon Sep 17 00:00:00 2001 From: ConfusedSushi Date: Mon, 31 Jan 2022 20:59:52 +0100 Subject: [PATCH 1/7] more consistent unified review comment --- web_src/js/features/repo-issue.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 7a62cf2701ca6..69911a17345cf 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -505,7 +505,9 @@ export function initRepoPullRequestReview() { ` : ` - + + + `} `); From 40df434f32a695b5ec81026dc4763eca5e15739c Mon Sep 17 00:00:00 2001 From: ConfusedSushi Date: Mon, 31 Jan 2022 21:01:31 +0100 Subject: [PATCH 2/7] fix unified review code excerpt --- templates/repo/diff/blob_excerpt.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl index b3e80881fda1c..1125aa44afa69 100644 --- a/templates/repo/diff/blob_excerpt.tmpl +++ b/templates/repo/diff/blob_excerpt.tmpl @@ -67,6 +67,7 @@ {{end}} + {{$inlineDiff := $.section.GetComputedInlineDiffFor $line}}{{$inlineDiff.Content}} From c0908080e8b8b9d4c04d1dda883b902d444538d1 Mon Sep 17 00:00:00 2001 From: ConfusedSushi Date: Mon, 31 Jan 2022 21:02:06 +0100 Subject: [PATCH 3/7] fix split review code excerpt --- templates/repo/diff/blob_excerpt.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl index 1125aa44afa69..c20e2c8b6b320 100644 --- a/templates/repo/diff/blob_excerpt.tmpl +++ b/templates/repo/diff/blob_excerpt.tmpl @@ -22,6 +22,7 @@ {{$inlineDiff := $.section.GetComputedInlineDiffFor $line}}{{$inlineDiff.Content}} {{else}} + {{if $line.LeftIdx}}{{end}} {{/* */}}{{if $line.LeftIdx}}{{/* @@ -31,6 +32,7 @@ */}}{{end}}{{/* */}} + {{if $line.RightIdx}}{{end}} {{/* */}}{{if $line.RightIdx}}{{/* From 94839bec3eaeb906d160581ee9505a3f07ef1898 Mon Sep 17 00:00:00 2001 From: ConfusedSushi Date: Mon, 31 Jan 2022 21:02:53 +0100 Subject: [PATCH 4/7] correct split view seperator line --- web_src/less/_repository.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 75ccc8d25f84b..18c463bf180f2 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -3186,7 +3186,7 @@ td.blob-excerpt { background: var(--color-diff-inactive); } -.code-diff-split tbody tr td:nth-child(4) { +.code-diff-split tbody tr td:nth-child(5) { border-left: 1px solid var(--color-secondary); } From 32fc88b2ce4a1b761b71e3368610b7196518ce22 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Tue, 1 Feb 2022 17:43:25 +0000 Subject: [PATCH 5/7] ensure escaped warning marker also appears; Signed-off-by: Andrew Thornton --- templates/repo/diff/blob_excerpt.tmpl | 28 +++++++++++---------------- web_src/js/features/repo-issue.js | 2 +- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl index c20e2c8b6b320..294e937c37a00 100644 --- a/templates/repo/diff/blob_excerpt.tmpl +++ b/templates/repo/diff/blob_excerpt.tmpl @@ -21,25 +21,18 @@ {{$inlineDiff := $.section.GetComputedInlineDiffFor $line}}{{$inlineDiff.Content}} {{else}} + {{$inlineDiff := $.section.GetComputedInlineDiffFor $line}} - - {{if $line.LeftIdx}}{{end}} + {{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}{{end}} + {{/* - */}}{{if $line.LeftIdx}}{{/* - */}}{{$inlineDiff := $.section.GetComputedInlineDiffFor $line}}{{$inlineDiff.Content}}{{/* - */}}{{else}}{{/* - */}}{{/* - */}}{{end}}{{/* - */}} + */}}{{if $line.LeftIdx}}{{$inlineDiff.Content}}{{end}}{{/* + */}} - - {{if $line.RightIdx}}{{end}} + {{if and $line.RightIdx $inlineDiff.EscapeStatus.Escaped}}{{end}} + {{/* - */}}{{if $line.RightIdx}}{{/* - */}}{{$inlineDiff := $.section.GetComputedInlineDiffFor $line}}{{$inlineDiff.Content}}{{/* - */}}{{else}}{{/* - */}}{{/* - */}}{{end}}{{/* + */}}{{if $line.RightIdx}}{{$inlineDiff.Content}}{{end}}{{/* */}} {{end}} @@ -69,9 +62,10 @@ {{end}} - + {{$inlineDiff := $.section.GetComputedInlineDiffFor $line}} + {{if $inlineDiff.EscapeStatus.Escaped}}{{end}} - {{$inlineDiff := $.section.GetComputedInlineDiffFor $line}}{{$inlineDiff.Content}} + {{$inlineDiff.Content}} {{end}} {{end}} diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 69911a17345cf..f20a7acf68a8d 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -505,9 +505,9 @@ export function initRepoPullRequestReview() { ` : ` - + `} `); From f63df6a3ad95ea72b0b8acb8ab244e48d4e57398 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Tue, 1 Feb 2022 17:47:04 +0000 Subject: [PATCH 6/7] oops Signed-off-by: Andrew Thornton --- templates/repo/diff/blob_excerpt.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl index 294e937c37a00..9bf0a7f9909e8 100644 --- a/templates/repo/diff/blob_excerpt.tmpl +++ b/templates/repo/diff/blob_excerpt.tmpl @@ -24,13 +24,13 @@ {{$inlineDiff := $.section.GetComputedInlineDiffFor $line}} {{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}{{end}} - + {{if $line.LeftIdx}}{{end}} {{/* */}}{{if $line.LeftIdx}}{{$inlineDiff.Content}}{{end}}{{/* */}} {{if and $line.RightIdx $inlineDiff.EscapeStatus.Escaped}}{{end}} - + {{if $line.RightIdx}}{{end}} {{/* */}}{{if $line.RightIdx}}{{$inlineDiff.Content}}{{end}}{{/* */}} From d60cd390041c70846925f9c9fa667bd521d3c37c Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 1 Feb 2022 18:33:34 +0000 Subject: [PATCH 7/7] Apply suggestions from code review --- web_src/js/features/repo-issue.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index f20a7acf68a8d..69911a17345cf 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -505,9 +505,9 @@ export function initRepoPullRequestReview() { ` : ` + - `} `);