Merge "Fix bug with diff context 0"
diff --git a/polygerrit-ui/app/elements/shared/gr-user-suggestion-fix/gr-user-suggestion-fix.ts b/polygerrit-ui/app/elements/shared/gr-user-suggestion-fix/gr-user-suggestion-fix.ts
index e484d6b..5e67a88b 100644
--- a/polygerrit-ui/app/elements/shared/gr-user-suggestion-fix/gr-user-suggestion-fix.ts
+++ b/polygerrit-ui/app/elements/shared/gr-user-suggestion-fix/gr-user-suggestion-fix.ts
@@ -265,7 +265,7 @@
if (!this.diffPrefs) return undefined;
return {
...this.diffPrefs,
- context: 1,
+ context: 0,
line_length: Math.min(this.diffPrefs.line_length, 100),
line_wrapping: true,
};
diff --git a/polygerrit-ui/app/embed/diff/gr-diff/gr-diff-utils.ts b/polygerrit-ui/app/embed/diff/gr-diff/gr-diff-utils.ts
index c41dc91..7e30581 100644
--- a/polygerrit-ui/app/embed/diff/gr-diff/gr-diff-utils.ts
+++ b/polygerrit-ui/app/embed/diff/gr-diff/gr-diff-utils.ts
@@ -226,7 +226,7 @@
return FULL_CONTEXT;
}
if (
- prefsContext &&
+ prefsContext !== undefined &&
!(showFullContext === FullContext.NO && prefsContext === FULL_CONTEXT)
) {
return prefsContext;
diff --git a/polygerrit-ui/app/embed/diff/gr-diff/gr-diff-utils_test.ts b/polygerrit-ui/app/embed/diff/gr-diff/gr-diff-utils_test.ts
index 44f4f60..f425e2b 100644
--- a/polygerrit-ui/app/embed/diff/gr-diff/gr-diff-utils_test.ts
+++ b/polygerrit-ui/app/embed/diff/gr-diff/gr-diff-utils_test.ts
@@ -196,6 +196,12 @@
assert.equal(computeContext(1, FullContext.UNDECIDED, 2), 1);
});
+ test('computeContext 0', () => {
+ assert.equal(computeContext(0, FullContext.YES, 2), FULL_CONTEXT);
+ assert.equal(computeContext(0, FullContext.NO, 2), 0);
+ assert.equal(computeContext(0, FullContext.UNDECIDED, 2), 0);
+ });
+
test('computeContext FULL_CONTEXT', () => {
assert.equal(
computeContext(FULL_CONTEXT, FullContext.YES, 2),
