fix: respect editor.scrollBeyondLastLine

Fixes #329

media/editor/scrollContainer.tsx

@@ -1,9 +1,9 @@
 import { css } from "@linaria/core";
 import React, { useCallback, useEffect, useRef, useState } from "react";
 import { useRecoilState, useRecoilValue } from "recoil";
+import { DataDisplay } from "./dataDisplay";
 import * as select from "./state";
 import { Range } from "./util";
-import { DataDisplay } from "./dataDisplay";
 import { VirtualScrollContainer } from "./virtualScrollContainer";
 
 const wrapperCls = css`
@@ -22,6 +22,7 @@ export const ScrollContainer: React.FC = () => {
  const dimension = useRecoilValue(select.dimensions);
  const columnWidth = useRecoilValue(select.columnWidth);
  const fileSize = useRecoilValue(select.fileSize);
+ const { scrollBeyondLastLine } = useRecoilValue(select.codeSettings);
  const [bounds, setBounds] = useRecoilState(select.scrollBounds);
  const [offset, setOffset] = useRecoilState(select.offset);
  const previousOffset = useRef<number>();
@@ -64,12 +65,14 @@ export const ScrollContainer: React.FC = () => {
  setScrollTop(newScrollTop);
  }, [dimension, columnWidth, expandBoundsToContain]);
 
+ const extraScroll = scrollBeyondLastLine ? dimension.height / 2 : 0;
+
  return (
  <VirtualScrollContainer
  className={wrapperCls}
  scrollTop={scrollTop}
  scrollStart={dimension.rowPxHeight * (bounds.start / columnWidth)}
- scrollEnd={dimension.rowPxHeight * (bounds.end / columnWidth) + dimension.height / 2}
+ scrollEnd={dimension.rowPxHeight * (Math.ceil(bounds.end / columnWidth) + 1) + extraScroll}
  onScroll={onScroll}
  >
  <DataDisplay />

media/editor/state.ts

@@ -64,6 +64,11 @@ export const isReadonly = selector({
  get: ({ get }) => get(readyQuery).isReadonly,
 });
 
+export const codeSettings = selector({
+ key: "codeSettings",
+ get: ({ get }) => get(readyQuery).codeSettings,
+});
+
 export const showReadonlyWarningForEl = atom<HTMLElement | null>({
  key: "showReadonlyWarningForEl",
  default: null,

shared/protocol.ts

@@ -56,12 +56,17 @@ export interface IEditorSettings {
  defaultEndianness: Endianness;
 }
 
+export interface ICodeSettings {
+ scrollBeyondLastLine: boolean;
+}
+
 export interface ReadyResponseMessage {
  type: MessageType.ReadyResponse;
  initialOffset: number;
  pageSize: number;
  edits: ISerializedEdits;
  editorSettings: IEditorSettings;
+ codeSettings: ICodeSettings;
  unsavedEditIndex: number;
  fileSize: number | undefined;
  isReadonly: boolean;

src/hexEditorProvider.ts

@@ -5,7 +5,7 @@ import TelemetryReporter from "@vscode/extension-telemetry";
 import * as base64 from "js-base64";
 import * as vscode from "vscode";
 import { HexDocumentEditReference } from "../shared/hexDocumentModel";
-import { Endianness, ExtensionHostMessageHandler, FromWebviewMessage, IEditorSettings, InspectorLocation, MessageHandler, MessageType, PasteMode, ToWebviewMessage } from "../shared/protocol";
+import { Endianness, ExtensionHostMessageHandler, FromWebviewMessage, ICodeSettings, IEditorSettings, InspectorLocation, MessageHandler, MessageType, PasteMode, ToWebviewMessage } from "../shared/protocol";
 import { deserializeEdits, serializeEdits } from "../shared/serialization";
 import { DataInspectorView } from "./dataInspectorView";
 import { disposeAll } from "./dispose";
@@ -212,6 +212,13 @@ export class HexEditorProvider implements vscode.CustomEditorProvider<HexDocumen
  </html>`;
  }
 
+ private readCodeSettings(): ICodeSettings {
+ const editorConfig = vscode.workspace.getConfiguration("editor");
+ return {
+ scrollBeyondLastLine: editorConfig.get("scrollBeyondLastLine", true)
+ };
+ }
+
  private readEditorSettings(): IEditorSettings {
  const config = vscode.workspace.getConfiguration("hexeditor");
  const settings: IEditorSettings = { ...defaultEditorSettings };
@@ -250,6 +257,7 @@ export class HexEditorProvider implements vscode.CustomEditorProvider<HexDocumen
  type: MessageType.ReadyResponse,
  initialOffset: document.baseAddress,
  editorSettings: this.readEditorSettings(),
+ codeSettings: this.readCodeSettings(),
  edits: serializeEdits(document.edits),
  unsavedEditIndex: document.unsavedEditIndex,
  fileSize: await document.size(),