commit e199aa3eb8cc2495520b597c4888e8041d23eed3
author Anurag Pathak <anuragpathak@google.com> Tue Jul 23 11:57:33 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 23 11:57:33 2024 +0000
tree c1e937eec43bfeee744b981c5fdc02f7458f8db3
parent b05c409d0982debee393de8087a4c5a9e9d5373e
parent 1b900ac7fbc261b37d0e2155a48c1185b06bd3f1

Merge "Apply layers on blank lines"

polygerrit-ui/app/embed/diff/gr-diff-builder/gr-diff-row.ts

diff --git a/polygerrit-ui/app/embed/diff/gr-diff-builder/gr-diff-row.ts b/polygerrit-ui/app/embed/diff/gr-diff-builder/gr-diff-row.ts
index 642610a..1caaebd 100644
--- a/polygerrit-ui/app/embed/diff/gr-diff-builder/gr-diff-row.ts
+++ b/polygerrit-ui/app/embed/diff/gr-diff-builder/gr-diff-row.ts
@@ -573,11 +573,11 @@
     // Note that `this.layersApplied` will wipe away the <gr-diff-text>, and
     // another rendering cycle will be initiated in `updated()`.
     // prettier-ignore
-    const textElement = line?.text && !this.layersApplied
+    const textElement = !this.layersApplied
       ? html`<gr-diff-text
           ${ref(this.contentRef(side))}
           data-side=${ifDefined(side)}
-          .text=${line?.text}
+          .text=${line?.text ?? ''}
           .tabSize=${this.tabSize}
           .lineLimit=${this.lineLength}
           .isResponsive=${isResponsive(this.responsiveMode)}

polygerrit-ui/app/embed/diff/gr-diff-builder/gr-diff-row_test.ts

diff --git a/polygerrit-ui/app/embed/diff/gr-diff-builder/gr-diff-row_test.ts b/polygerrit-ui/app/embed/diff/gr-diff-builder/gr-diff-row_test.ts
index 1526ce3..346d3fe 100644
--- a/polygerrit-ui/app/embed/diff/gr-diff-builder/gr-diff-row_test.ts
+++ b/polygerrit-ui/app/embed/diff/gr-diff-builder/gr-diff-row_test.ts
@@ -164,7 +164,9 @@
             >
               <td class="blankLineNum left"></td>
               <td class="blank left no-intraline-info">
-                <div class="contentText" data-side="left"></div>
+                <div class="contentText" data-side="left">
+                  <gr-diff-text data-side="left"></gr-diff-text>
+                </div>
               </td>
               <td class="lineNum right" data-value="1">
                 <button
@@ -226,7 +228,9 @@
               </td>
               <td class="blankLineNum right"></td>
               <td class="blank no-intraline-info right">
-                <div class="contentText" data-side="right"></div>
+                <div class="contentText" data-side="right">
+                  <gr-diff-text data-side="right"></gr-diff-text>
+                </div>
               </td>
             </tr>
             <slot name="post-left-line-1"></slot>