hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: minimize changes

Browse source
This commit is contained in:
Felix Roos 2026-02-13 10:02:14 +01:00
parent 9bc560b17f
commit 7e3063038e
No known key found for this signature in database
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
packages/codemirror/keybindings.mjs
View file

@ -1,5 +1,5 @@
import { defaultKeymap } from '@codemirror/commands'; import { defaultKeymap } from '@codemirror/commands';
import { Prec, EditorState, StateField } from '@codemirror/state'; import { Prec, EditorState } from '@codemirror/state';
import { keymap, ViewPlugin } from '@codemirror/view'; import { keymap, ViewPlugin } from '@codemirror/view';
// import { searchKeymap } from '@codemirror/search'; // import { searchKeymap } from '@codemirror/search';
import { emacs } from '@replit/codemirror-emacs'; import { emacs } from '@replit/codemirror-emacs';
@ -26,10 +26,7 @@ function replEval(view) {
// Dispatch a dedicated evaluate event first // Dispatch a dedicated evaluate event first
let handled = false; let handled = false;
try { try {
const ev = new CustomEvent('repl-evaluate', { const ev = new CustomEvent('repl-evaluate', { detail: { source: 'vim', view }, cancelable: true });
detail: { source: 'vim', view },
cancelable: true,
});
handled = document.dispatchEvent(ev) === false; // false means preventDefault was called handled = document.dispatchEvent(ev) === false; // false means preventDefault was called
} catch (e) { } catch (e) {
console.error('Error dispatching repl-evaluate event', e); console.error('Error dispatching repl-evaluate event', e);
@ -99,11 +96,9 @@ try {
// internal actions and works with current selections/visual mode. // internal actions and works with current selections/visual mode.
try { try {
Vim.defineAction('strudelToggleComment', (cm) => { Vim.defineAction('strudelToggleComment', (cm) => {
const view = cm.cm6;
try { try {
const ev = new CustomEvent('repl-toggle-comment', { const ev = new CustomEvent('repl-toggle-comment', { detail: { source: 'vim', view }, cancelable: true });
detail: { source: 'vim', view: cm.cm6 },
cancelable: true,
});
document.dispatchEvent(ev); document.dispatchEvent(ev);
} catch (e) { } catch (e) {
console.error('strudelToggleComment dispatch failed', e); console.error('strudelToggleComment dispatch failed', e);
@ -123,16 +118,16 @@ try {
// :w to evaluate // :w to evaluate
Vim.defineEx('write', 'w', (cm) => { Vim.defineEx('write', 'w', (cm) => {
const view = cm?.view || cm; // CM6 Vim passes either an object with view or the view itself const view = cm.cm6;
try { try {
view?.focus?.(); view.focus?.();
// Let the app know this came from Vim :w // Let the app know this came from Vim :w
try { try {
logger('[vim] :w — evaluating code'); logger('[vim] :w — evaluating code');
} catch (e) { } catch (e) {
console.error('Error logging Vim :w evaluation', e); console.error('Error logging Vim :w evaluation', e);
} }
replEval(cm.cm6); replEval(view);
} catch (e) { } catch (e) {
console.error('Error dispatching :w evaluation event', e); console.error('Error dispatching :w evaluation event', e);
} }