diff options
| author | Milutin Kristofic <milutin@google.com> | 2023-08-18 07:55:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-08-18 07:55:21 +0000 |
| commit | 8aefffdb26d66a30164d90277aadf2d407b6e799 (patch) | |
| tree | 51f36dd96254026788db893c6a098d50ea1fec36 | |
| parent | 5b5bb08969bd303c15b51ee0f29c1da00d02f458 (diff) | |
| parent | 103b31957db986e6df9c8168e0e15eb6ee3c4a4c (diff) | |
Merge "Fix bug with diff context 0"
3 files changed, 8 insertions, 2 deletions
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 e484d6b387..5e67a88bef 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 @@ export class GrUserSuggestionsFix extends LitElement { 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 c41dc91b95..7e30581671 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 @@ export function computeContext( 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 44f4f609e7..f425e2b16c 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 @@ suite('gr-diff-utils tests', () => { 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), |