Keeps context when showing more items in a view

CHANGELOG.md

@@ -21,13 +21,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
           - A context menu provides access to more common file revision commands
 - Adds a _Collapse All_ command to the _Repositories_ view — closes [#688](https://github.com/eamodio/vscode-gitlens/issues/688)
 - Adds version links to CHANGELOG — closes [#617](https://github.com/eamodio/vscode-gitlens/issues/617) thanks to [PR #600](https://github.com/eamodio/vscode-gitlens/pull/660) by John Gee ([@shadowspawn](https://github.com/shadowspawn))
+- Adds a `gitlens.views.pageItemLimit` setting to specify the number of items to show in a each page when paginating a view list. Use 0 to specify no limit
 
 ### Changed
 
-- Updates the invite link to the [VS Code Development Community Slack](https://vscode-slack.amod.io)
+- Improves the behavior of the _Show More Commits_ & _Show More Results_ commands - no longer loses the context of the last selected item before showing more
 - Improves the behavior of the _Open Changes with Next Revision_ (`gitlens.diffWithNext`) command when in the diff editor
 - Improves the behavior of the _Open Changes with Previous Revision_ (`gitlens.diffWithPrevious`) command when in the diff editor
 - Improves the behavior of the _Open Changes with Working File_ (`gitlens.diffWithWorking`) command when in the diff editor
+- Updates the invite link to the [VS Code Development Community Slack](https://vscode-slack.amod.io)
 
 ### Fixed
 

README.md

@@ -817,6 +817,7 @@ See also [View Settings](#view-settings- 'Jump to the View settings')
 | `gitlens.views.commitFormat`                | Specifies the format of committed changes in the views. See the [GitLens docs](https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting) for advanced formatting<br /><br />Available tokens<br />`${id}` &mdash; commit id<br />`${author}` &mdash; commit author<br />`${email}` &mdash; commit author e-mail<br />`${message}` &mdash; commit message<br />`${ago}` &mdash; relative commit date (e.g. 1 day ago)<br />`${date}` &mdash; formatted commit date (format specified by `gitlens.defaultDateFormat`)<br />`${agoOrDate}` &mdash; commit date specified by `gitlens.defaultDateStyle`<br />`${authorAgo}` &mdash; commit author, relative commit date<br />`${authorAgoOrDate}` &mdash; commit author, commit date specified by `gitlens.defaultDateStyle`             |
 | `gitlens.views.commitDescriptionFormat`     | Specifies the description format of committed changes in the views. See the [GitLens docs](https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting) for advanced formatting<br /><br />Available tokens<br />`${id}` &mdash; commit id<br />`${author}` &mdash; commit author<br />`${email}` &mdash; commit author e-mail<br />`${message}` &mdash; commit message<br />`${ago}` &mdash; relative commit date (e.g. 1 day ago)<br />`${date}` &mdash; formatted commit date (format specified by `gitlens.defaultDateFormat`)<br />`${agoOrDate}` &mdash; commit date specified by `gitlens.defaultDateStyle`<br />`${authorAgo}` &mdash; commit author, relative commit date<br />`${authorAgoOrDate}` &mdash; commit author, commit date specified by `gitlens.defaultDateStyle` |
 | `gitlens.views.defaultItemLimit`            | Specifies the default number of items to show in a view list. Use 0 to specify no limit                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+| `gitlens.views.pageItemLimit`               | Specifies the number of items to show in a each page when paginating a view list. Use 0 to specify no limit                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | `gitlens.views.showRelativeDateMarkers`     | Specifies whether to show relative date markers (_Less than a week ago_, _Over a week ago_, _Over a month ago_, etc) on revision (commit) histories in the views                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | `gitlens.views.stashFileFormat`             | Specifies the format of a stashed file in the views<br /><br />Available tokens<br />`${directory}` &mdash; directory name<br />`${file}` &mdash; file name<br />`${filePath}` &mdash; formatted file name and path<br />`${path}` &mdash; full file path                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | `gitlens.views.stashFileDescriptionFormat`  | Specifies the description format of a stashed file in the views<br /><br />Available tokens<br />`${directory}` &mdash; directory name<br />`${file}` &mdash; file name<br />`${filePath}` &mdash; formatted file name and path<br />`${path}` &mdash; full file path                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |

package.json

@@ -1335,6 +1335,12 @@
                     "markdownDescription": "Specifies the default number of items to show in a view list. Use 0 to specify no limit",
                     "scope": "window"
                 },
+                "gitlens.views.pageItemLimit": {
+                    "type": "number",
+                    "default": 20,
+                    "markdownDescription": "Specifies the number of items to show in a each page when paginating a view list. Use 0 to specify no limit",
+                    "scope": "window"
+                },
                 "gitlens.views.fileHistory.avatars": {
                     "type": "boolean",
                     "default": true,

src/config.ts

@@ -367,6 +367,7 @@ export interface ViewsConfig {
     compare: CompareViewConfig;
     defaultItemLimit: number;
     lineHistory: LineHistoryViewConfig;
+    pageItemLimit: number;
     repositories: RepositoriesViewConfig;
     search: SearchViewConfig;
     showRelativeDateMarkers: boolean;

src/views/nodes/branchNode.ts

@@ -96,7 +96,7 @@ export class BranchNode extends ViewRefNode implements Pageabl
             );
 
             if (log.truncated) {
-                children.push(new ShowMoreNode(this.view, this, 'Commits'));
+                children.push(new ShowMoreNode(this.view, this, 'Commits', children[children.length - 1]));
             }
 
             this._children = children;

src/views/nodes/branchTrackingStatusNode.ts

@@ -74,7 +74,7 @@ export class BranchTrackingStatusNode extends ViewNode implements
         }
 
         if (log.truncated) {
-            children.push(new ShowMoreNode(this.view, this, 'Commits'));
+            children.push(new ShowMoreNode(this.view, this, 'Commits', children[children.length - 1]));
         }
         return children;
     }

src/views/nodes/common.ts

@@ -139,8 +139,17 @@ export class UpdateableMessageNode extends ViewNode {
 export abstract class PagerNode extends ViewNode {
     protected _args: RefreshNodeCommandArgs = {};
 
-    constructor(view: View, parent: ViewNode, protected readonly message: string) {
+    constructor(
+        view: View,
+        parent: ViewNode,
+        protected readonly message: string,
+        previousNode?: ViewNode,
+        maxCount: number = Container.config.views.pageItemLimit
+    ) {
         super(unknownGitUri, view, parent);
+
+        this._args.maxCount = maxCount;
+        this._args.previousNode = previousNode;
     }
 
     getChildren(): ViewNode[] | Promise<ViewNode[]> {
@@ -168,14 +177,15 @@ export abstract class PagerNode extends ViewNode {
 }
 
 export class ShowMoreNode extends PagerNode {
-    constructor(view: View, parent: ViewNode, type: string, maxCount: number = Container.config.advanced.maxListItems) {
+    constructor(view: View, parent: ViewNode, itemType: string, previousNode: ViewNode, maxCount?: number) {
         super(
             view,
             parent,
             maxCount === 0
-                ? `Show All ${type} ${GlyphChars.Space}${GlyphChars.Dash}${GlyphChars.Space} this may take a while`
-                : `Show More ${type}`
+                ? `Show All ${itemType} ${GlyphChars.Space}${GlyphChars.Dash}${GlyphChars.Space} this may take a while`
+                : `Show More ${itemType}`,
+            previousNode,
+            maxCount
         );
-        this._args.maxCount = maxCount;
     }
 }

src/views/nodes/contributorNode.ts

@@ -42,7 +42,7 @@ export class ContributorNode extends ViewNode implements Pagea
         ];
 
         if (log.truncated) {
-            children.push(new ShowMoreNode(this.view, this, 'Commits'));
+            children.push(new ShowMoreNode(this.view, this, 'Commits', children[children.length - 1]));
         }
         return children;
     }

src/views/nodes/resultsCommitsNode.ts

@@ -47,7 +47,7 @@ export class ResultsCommitsNode extends ViewNode implements Pagea
         ];
 
         if (log.truncated) {
-            children.push(new ShowMoreNode(this.view, this, 'Results'));
+            children.push(new ShowMoreNode(this.view, this, 'Results', children[children.length - 1]));
         }
 
         return children;

src/views/nodes/tagNode.ts

@@ -49,7 +49,7 @@ export class TagNode extends ViewRefNode implements PageableVi
         ];
 
         if (log.truncated) {
-            children.push(new ShowMoreNode(this.view, this, 'Commits'));
+            children.push(new ShowMoreNode(this.view, this, 'Commits', children[children.length - 1]));
         }
         return children;
     }

src/views/viewBase.ts

@@ -158,6 +158,10 @@ export abstract class ViewBase> implements TreeData
                 else {
                     node.maxCount = (node.maxCount || args.maxCount) + args.maxCount;
                 }
+
+                if (args.previousNode !== undefined) {
+                    void (await this.reveal(args.previousNode, { select: true }));
+                }
             }
         }
 

src/views/viewCommands.ts

@@ -39,6 +39,7 @@ import { Strings } from '../system/string';
 
 export interface RefreshNodeCommandArgs {
     maxCount?: number;
+    previousNode?: ViewNode;
 }
 
 interface CompareSelectedInfo {