Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions src/cm/lineNumberSelection.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { EditorSelection } from "@codemirror/state";
import type { BlockInfo, EditorView } from "@codemirror/view";

type LineInfo = Pick<BlockInfo, "from" | "to"> | null | undefined;

type LineNumberClickEvent = Pick<
MouseEvent,
| "button"
| "shiftKey"
| "altKey"
| "ctrlKey"
| "metaKey"
| "preventDefault"
| "defaultPrevented"
>;

/**
* Resolve the selection range for a clicked document line.
* Includes the trailing line break when one exists to mirror Ace's
* full-line selection behavior.
*/
export function getLineSelectionRange(
state: EditorView["state"],
line: LineInfo,
): { from: number; to: number } | null {
if (!line) return null;
const from = Math.max(0, Number(line.from) || 0);
const to = Math.max(from, Number(line.to) || from);
Comment thread
bajrangCoder marked this conversation as resolved.
Outdated
return {
from,
to: Math.min(to + 1, state.doc.length),
};
}

/**
* Select the clicked line from the line-number gutter.
* Ignores modified and non-primary clicks so it doesn't interfere with
* context menus or alternate selection gestures.
*/
export function handleLineNumberClick(
view: EditorView | null | undefined,
line: LineInfo,
event: LineNumberClickEvent | null | undefined,
): boolean {
if (!view || !event || event.defaultPrevented) return false;
if ((event.button ?? 0) !== 0) return false;
if (event.shiftKey || event.altKey || event.ctrlKey || event.metaKey) {
return false;
}
Comment thread
bajrangCoder marked this conversation as resolved.
Outdated

const range = getLineSelectionRange(view.state, line);
if (!range) return false;

event.preventDefault();
view.dispatch({
selection: EditorSelection.single(range.from, range.to),
userEvent: "select.pointer",
});
Comment thread
bajrangCoder marked this conversation as resolved.
view.focus();
return true;
}

export default handleLineNumberClick;
14 changes: 13 additions & 1 deletion src/lib/editorManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
registerExternalCommand,
removeExternalCommand,
} from "cm/commandRegistry";
import { handleLineNumberClick } from "cm/lineNumberSelection";
import lspApi from "cm/lsp/api";
import lspClientManager from "cm/lsp/clientManager";
import {
Expand Down Expand Up @@ -289,6 +290,13 @@ async function EditorManager($header, $body) {
function makeLineNumberExtension() {
const { linenumbers = true, relativeLineNumbers = false } =
appSettings?.value || {};
const lineNumberConfig = {
domEventHandlers: {
click(view, line, event) {
return handleLineNumberClick(view, line, event);
},
},
};
if (!linenumbers)
return EditorView.theme({
".cm-gutter": {
Expand All @@ -299,9 +307,13 @@ async function EditorManager($header, $body) {
},
});
if (!relativeLineNumbers)
return Prec.highest([lineNumbers(), highlightActiveLineGutter()]);
return Prec.highest([
lineNumbers(lineNumberConfig),
highlightActiveLineGutter(),
]);
return Prec.highest([
lineNumbers({
...lineNumberConfig,
formatNumber: (lineNo, state) => {
try {
const cur = state.doc.lineAt(state.selection.main.head).number;
Expand Down