opendev/gerrit
Code Issues Proposed changes

Merge "Use COMMIT_MSG_LINE_LENGTH build the diff for commit msg"

Browse Source
This commit is contained in:
Ben Rohlfs
2020-03-16 09:17:36 +00:00
committed by Gerrit Code Review
parent 3059a5eda8 56357ae488
commit 0b3c05e2b8
2 changed files with 57 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-element.js
View File

@@ -24,6 +24,10 @@
const TRAILING_WHITESPACE_PATTERN = /\s+$/;
// https://gerrit.googlesource.com/gerrit/+/234616a8627334686769f1de989d286039f4d6a5/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.js#740
const COMMIT_MSG_PATH = '/COMMIT_MSG';
const COMMIT_MSG_LINE_LENGTH = 72;
/**
* @appliesMixin Gerrit.FireMixin
*/
@@ -271,18 +275,39 @@
return;
}
const localPrefs = Object.assign({}, prefs);
if (this.path === COMMIT_MSG_PATH) {
// override line_length for commit msg the same way as
// in gr-diff
localPrefs.line_length = COMMIT_MSG_LINE_LENGTH;
}
let builder = null;
if (this.isImageDiff) {
builder = new GrDiffBuilderImage(diff, prefs, this.diffElement,
this.baseImage, this.revisionImage);
builder = new GrDiffBuilderImage(
diff,
localPrefs,
this.diffElement,
this.baseImage,
this.revisionImage);
} else if (diff.binary) {
// If the diff is binary, but not an image.
return new GrDiffBuilderBinary(diff, prefs, this.diffElement);
return new GrDiffBuilderBinary(
diff,
localPrefs,
this.diffElement);
} else if (this.viewMode === DiffViewMode.SIDE_BY_SIDE) {
builder = new GrDiffBuilderSideBySide(diff, prefs, this.diffElement,
this._layers);
builder = new GrDiffBuilderSideBySide(
diff,
localPrefs,
this.diffElement,
this._layers
);
} else if (this.viewMode === DiffViewMode.UNIFIED) {
builder = new GrDiffBuilderUnified(diff, prefs, this.diffElement,
builder = new GrDiffBuilderUnified(
diff,
localPrefs,
this.diffElement,
this._layers);
}
if (!builder) {

26
polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-element_test.html
View File

@@ -60,6 +60,11 @@ limitations under the License.
</test-fixture>
<script>
const DiffViewMode = {
SIDE_BY_SIDE: 'SIDE_BY_SIDE',
UNIFIED: 'UNIFIED_DIFF',
};
suite('gr-diff-builder tests', async () => {
await readyToTest();
let prefs;
@@ -192,6 +197,27 @@ limitations under the License.
assert.equal(result, expected);
});
[DiffViewMode.UNIFIED, DiffViewMode.SIDE_BY_SIDE]
.forEach(mode => {
test(`line_length used for regular files under ${mode}`, () => {
element.path = '/a.txt';
element.viewMode = mode;
builder = element._getDiffBuilder(
{}, {tab_size: 4, line_length: 50}
);
assert.equal(builder._prefs.line_length, 50);
});
test(`line_length ignored for commit msg under ${mode}`, () => {
element.path = '/COMMIT_MSG';
element.viewMode = mode;
builder = element._getDiffBuilder(
{}, {tab_size: 4, line_length: 50}
);
assert.equal(builder._prefs.line_length, 72);
});
});
test('_createTextEl linewrap with tabs', () => {
const text = '\t'.repeat(7) + '!';
const line = {text, highlights: []};