Adds settings to the settings editor

Adds the status bar reduce flashing setting
Adds the current line scrollable setting

Author: eamodio

README.md

@@ -646,7 +646,7 @@ See also [Explorer Settings](#explorer-settings "Jump to the Explorer settings")
 |`gitlens.statusBar.dateFormat`|Specifies the date format of absolute dates shown in the blame information on the status bar<br />See https://momentjs.com/docs/#/displaying/format/ for valid formats
 |`gitlens.statusBar.enabled`|Specifies whether to provide blame information on the status bar
 |`gitlens.statusBar.format`|Specifies the format of the blame information on the status bar<br />Available tokens<br />`${id}` - commit id<br />`${author}` - commit author<br />`${message}` - commit message<br />`${ago}` - relative commit date (e.g. 1 day ago)<br />`${date}` - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br />`${agoOrDate}` - commit date specified by `gitlens.defaultDateStyle`<br />`${authorAgo}` - commit author, relative commit date<br />`${authorAgoOrDate}` - commit author, commit date specified by `gitlens.defaultDateStyle`<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
-|`gitlens.statusBar.reduceFlicker`|Specifies whether to reduce the status bar "flickering" when changing lines by not first clearing the previous blame information
+|`gitlens.statusBar.reduceFlicker`|Specifies whether to avoid clearing the previous blame information when changing lines to reduce status bar "flashing"
 
 ### Advanced Settings
 

package.json

@@ -776,7 +776,7 @@
                 "gitlens.statusBar.reduceFlicker": {
                     "type": "boolean",
                     "default": false,
-                    "description": "Specifies whether to reduce the status bar \"flickering\" when changing lines by not first clearing the previous blame information",
+                    "description": "Specifies whether to avoid clearing the previous blame information when changing lines to reduce status bar \"flashing\"",
                     "scope": "window"
                 },
                 "gitlens.strings.codeLens.unsavedChanges.recentChangeAndAuthors": {

src/ui/images/settings/current-line-blame-on-scrollable.png

@@ -269,10 +269,16 @@ <h2 class="section__title">Current Line Blame
                                     <input class="setting" id="currentLine.enabled" name="currentLine.enabled" type="checkbox" data-add-settings-off="hovers.currentLine.over=line"/>
                                     <label for="currentLine.enabled">Show a blame annotation at the end of the current line</label>
                                 </div>
+                                <div class="settings-group__setting nowrap ml-2" data-enablement="currentLine.enabled" disabled>
+                                    <input class="setting" id="currentLine.scrollable" name="currentLine.scrollable" type="checkbox" disabled/>
+                                    <label for="currentLine.scrollable">Include the annotation when scrolling the editor horizontally</label>
+                                </div>
+                                <p class="setting__hint">When enabled the annotation can be scrolled into view when it is outside the viewport</p>
                             </div>
                             <div class="section__preview">
                                 <img class="image__preview" src="{{root}}/images/settings/current-line-blame.png"/>
                                 <img class="image__preview--overlay hidden" src="{{root}}/images/settings/current-line-blame-on.png" data-visibility="currentLine.enabled"/>
+                                <img class="image__preview--overlay hidden" src="{{root}}/images/settings/current-line-blame-on-scrollable.png" data-visibility="currentLine.enabled &amp; currentLine.scrollable"/>
                             </div>
                             <p class="settings-group__hint">
                                 <i class="icon icon--lg icon__info"></i>
@@ -601,6 +607,11 @@ <h2 class="section__title">Status Bar Blame
                                         <option value="gitlens.showQuickRepoHistory">shows the current branch history</option>
                                     </select>
                                 </div>
+                                <div class="settings-group__setting nowrap ml-2" data-enablement="statusBar.enabled" disabled>
+                                    <input class="setting" id="statusBar.reduceFlicker" name="statusBar.reduceFlicker" type="checkbox" disabled/>
+                                    <label for="statusBar.reduceFlicker">Reduce flashing when updating the annotation</label>
+                                </div>
+                                <p class="setting__hint">Avoids clearing the previous blame information when changing lines to reduce status bar "flashing"</p>
                             </div>
                             <div class="section__preview">
                                 <img class="image__preview" src="{{root}}/images/settings/status-bar.png"/>