ep_vim 0.6.1 → 0.7.1

package/.claude/settings.local.json

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm test)",
+      "Bash(npm run format)"
+    ]
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ep_vim",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "Vim-mode plugin for Etherpad with modal editing, motions, and operators",
   "author": {
     "name": "Seth Rothschild",

package/static/js/index.js

@@ -18,6 +18,9 @@ const {
   paragraphForward,
   paragraphBackward,
   getTextInRange,
+  matchingBracketPos,
+  paragraphTextRange,
+  sentenceTextRange,
 } = require("./vim-core");
 
 // --- State variables ---
@@ -48,6 +51,73 @@ const textObjectRange = (key, lineText, char, type) => {
     return textBracketRange(lineText, char, key, type);
 };
 
+const resolveTextObject = (key, type, line, lineText, char, rep) => {
+  if (key === "p") {
+    return paragraphTextRange(rep, line, type);
+  }
+  if (key === "s") {
+    const r = sentenceTextRange(lineText, char, type);
+    if (!r) return null;
+    return {
+      startLine: line,
+      startChar: r.start,
+      endLine: line,
+      endChar: r.end,
+    };
+  }
+  const r = textObjectRange(key, lineText, char, type);
+  if (!r) return null;
+  return { startLine: line, startChar: r.start, endLine: line, endChar: r.end };
+};
+
+const getVisibleLineRange = (rep) => {
+  const totalLines = rep.lines.length();
+  if (!editorDoc) return { top: 0, bottom: totalLines - 1 };
+  const lineDivs = editorDoc.body.querySelectorAll("div");
+  const lineCount = Math.min(lineDivs.length, totalLines);
+
+  // The iframe doesn't scroll — the outer page does. getBoundingClientRect()
+  // inside the iframe is relative to the iframe document top (not the outer
+  // viewport). We need the iframe's own position in the outer viewport to
+  // know which lines are actually visible.
+  const frameEl = editorDoc.defaultView.frameElement;
+  const iframeTop = frameEl ? frameEl.getBoundingClientRect().top : 0;
+  const outerViewportHeight = window.parent ? window.parent.innerHeight : 600;
+
+  let top = 0;
+  let bottom = lineCount - 1;
+  for (let i = 0; i < lineCount; i++) {
+    const rect = lineDivs[i].getBoundingClientRect();
+    if (iframeTop + rect.bottom > 0) {
+      top = i;
+      break;
+    }
+  }
+  for (let i = lineCount - 1; i >= 0; i--) {
+    const rect = lineDivs[i].getBoundingClientRect();
+    if (iframeTop + rect.top < outerViewportHeight) {
+      bottom = i;
+      break;
+    }
+  }
+
+  // Lines can wrap, so find the middle by pixel position rather than index.
+  const visibleTop = iframeTop + lineDivs[top].getBoundingClientRect().top;
+  const visibleBottom =
+    iframeTop + lineDivs[bottom].getBoundingClientRect().bottom;
+  const pixelMidpoint = (visibleTop + visibleBottom) / 2;
+  let mid = top;
+  for (let i = top; i <= bottom; i++) {
+    const rect = lineDivs[i].getBoundingClientRect();
+    if (iframeTop + (rect.top + rect.bottom) / 2 >= pixelMidpoint) {
+      mid = i;
+      break;
+    }
+  }
+
+  return { top, mid, bottom };
+};
+
 // --- Count helpers ---
 
 const consumeCount = () => {
@@ -66,7 +136,9 @@ const getCount = () => pendingCount || 1;
 const setRegister = (value) => {
   register = value;
   const text = Array.isArray(value) ? value.join("\n") + "\n" : value;
-  navigator.clipboard.writeText(text).catch(() => {});
+  if (navigator.clipboard) {
+    navigator.clipboard.writeText(text).catch(() => {});
+  }
 };
 
 const moveCursor = (editorInfo, line, char) => {
@@ -315,6 +387,38 @@ const resolveMotion = (key, line, char, lineText, rep, count) => {
     return "pending";
   }
 
+  if (key === "%") {
+    const pos = matchingBracketPos(rep, line, char);
+    if (pos) {
+      desiredColumn = null;
+      return { line: pos.line, char: pos.char };
+    }
+    return { line, char };
+  }
+
+  if (key === "H") {
+    desiredColumn = null;
+    const { top } = getVisibleLineRange(rep);
+    const targetLine = clampLine(top + count - 1, rep);
+    const targetText = getLineText(rep, targetLine);
+    return { line: targetLine, char: firstNonBlank(targetText) };
+  }
+
+  if (key === "M") {
+    desiredColumn = null;
+    const { mid } = getVisibleLineRange(rep);
+    const targetText = getLineText(rep, mid);
+    return { line: mid, char: firstNonBlank(targetText) };
+  }
+
+  if (key === "L") {
+    desiredColumn = null;
+    const { bottom } = getVisibleLineRange(rep);
+    const targetLine = clampLine(bottom - count + 1, rep);
+    const targetText = getLineText(rep, targetLine);
+    return { line: targetLine, char: firstNonBlank(targetText) };
+  }
+
   return null;
 };
 
@@ -472,12 +576,12 @@ const handleKey = (rep, editorInfo, key) => {
       const type = pendingKey;
       pendingKey = null;
       pendingOperator = null;
-      const range = textObjectRange(key, lineText, char, type);
+      const range = resolveTextObject(key, type, line, lineText, char, rep);
       if (range) {
         applyCharOperator(
           op,
-          [line, range.start],
-          [line, range.end],
+          [range.startLine, range.startChar],
+          [range.endLine, range.endChar],
           editorInfo,
           rep,
         );
@@ -521,6 +625,26 @@ const handleKey = (rep, editorInfo, key) => {
       return true;
     }
 
+    if (key === "%") {
+      pendingOperator = null;
+      const matchPos = matchingBracketPos(rep, line, char);
+      if (matchPos) {
+        let start, end;
+        if (
+          matchPos.line > line ||
+          (matchPos.line === line && matchPos.char > char)
+        ) {
+          start = [line, char];
+          end = [matchPos.line, matchPos.char + 1];
+        } else {
+          start = [matchPos.line, matchPos.char];
+          end = [line, char + 1];
+        }
+        applyCharOperator(op, start, end, editorInfo, rep);
+      }
+      return true;
+    }
+
     pendingOperator = null;
     const range = motionRange(key, char, lineText, count);
     if (range && range.end > range.start) {
@@ -540,10 +664,10 @@ const handleKey = (rep, editorInfo, key) => {
   if (inVisual && (pendingKey === "i" || pendingKey === "a")) {
     const type = pendingKey;
     pendingKey = null;
-    const range = textObjectRange(key, lineText, char, type);
+    const range = resolveTextObject(key, type, line, lineText, char, rep);
     if (range) {
-      visualAnchor = [line, range.start];
-      visualCursor = [line, range.end];
+      visualAnchor = [range.startLine, range.startChar];
+      visualCursor = [range.endLine, range.endChar];
       setVisualMode("char");
       updateVisualSelection(editorInfo, rep);
     }

package/static/js/vim-core.js

@@ -301,6 +301,132 @@ const textBracketRange = (lineText, char, bracket, type) => {
   return null;
 };
 
+const offsetToPos = (rep, offset) => {
+  const totalLines = rep.lines.length();
+  for (let i = 0; i < totalLines; i++) {
+    const lineStart = rep.lines.offsetOfIndex(i);
+    const lineLen = getLineText(rep, i).length;
+    if (offset >= lineStart && offset < lineStart + lineLen) {
+      return { line: i, char: offset - lineStart };
+    }
+  }
+  return null;
+};
+
+const matchingBracketPos = (rep, line, char) => {
+  const lineText = getLineText(rep, line);
+  let bracketChar = -1;
+  let bracket = null;
+  for (let i = char; i < lineText.length; i++) {
+    if (lineText[i] in BRACKET_PAIRS) {
+      bracketChar = i;
+      bracket = lineText[i];
+      break;
+    }
+  }
+  if (bracketChar === -1) return null;
+  const isOpen = OPEN_BRACKETS.has(bracket);
+  const match = BRACKET_PAIRS[bracket];
+  const startOffset = rep.lines.offsetOfIndex(line) + bracketChar;
+  const alltext = rep.alltext;
+  let depth = 0;
+  if (isOpen) {
+    for (let i = startOffset; i < alltext.length; i++) {
+      if (alltext[i] === bracket) depth++;
+      else if (alltext[i] === match) {
+        depth--;
+        if (depth === 0) return offsetToPos(rep, i);
+      }
+    }
+  } else {
+    for (let i = startOffset; i >= 0; i--) {
+      if (alltext[i] === bracket) depth++;
+      else if (alltext[i] === match) {
+        depth--;
+        if (depth === 0) return offsetToPos(rep, i);
+      }
+    }
+  }
+  return null;
+};
+
+const paragraphTextRange = (rep, line, type) => {
+  const totalLines = rep.lines.length();
+  const lineIsBlank = (l) => getLineText(rep, l).length === 0;
+  const onBlank = lineIsBlank(line);
+  let start = line;
+  while (start > 0 && lineIsBlank(start - 1) === onBlank) start--;
+  let end = line;
+  while (end < totalLines - 1 && lineIsBlank(end + 1) === onBlank) end++;
+  if (type === "i") {
+    return {
+      startLine: start,
+      startChar: 0,
+      endLine: end,
+      endChar: getLineText(rep, end).length,
+    };
+  }
+  if (!onBlank) {
+    let trailingEnd = end;
+    while (trailingEnd < totalLines - 1 && lineIsBlank(trailingEnd + 1))
+      trailingEnd++;
+    if (trailingEnd > end) {
+      return {
+        startLine: start,
+        startChar: 0,
+        endLine: trailingEnd,
+        endChar: getLineText(rep, trailingEnd).length,
+      };
+    }
+    let leadingStart = start;
+    while (leadingStart > 0 && lineIsBlank(leadingStart - 1)) leadingStart--;
+    return {
+      startLine: leadingStart,
+      startChar: 0,
+      endLine: end,
+      endChar: getLineText(rep, end).length,
+    };
+  }
+  let paraEnd = end;
+  while (paraEnd < totalLines - 1 && !lineIsBlank(paraEnd + 1)) paraEnd++;
+  return {
+    startLine: start,
+    startChar: 0,
+    endLine: paraEnd,
+    endChar: getLineText(rep, paraEnd).length,
+  };
+};
+
+const sentenceTextRange = (lineText, char, type) => {
+  const isTerminator = (ch) => ch === "." || ch === "!" || ch === "?";
+  let start = 0;
+  for (let i = char - 1; i >= 0; i--) {
+    if (isTerminator(lineText[i])) {
+      let j = i + 1;
+      while (j < lineText.length && lineText[j] === " ") j++;
+      start = j;
+      break;
+    }
+  }
+  let end = lineText.length;
+  for (let i = char; i < lineText.length; i++) {
+    if (isTerminator(lineText[i])) {
+      end = i + 1;
+      break;
+    }
+  }
+  if (type === "i") {
+    let s = start;
+    let e = end;
+    while (s < e && lineText[s] === " ") s++;
+    while (e > s && lineText[e - 1] === " ") e--;
+    return { start: s, end: e };
+  }
+  let e = end;
+  while (e < lineText.length && lineText[e] === " ") e++;
+  return { start, end: e };
+};
+
 const getTextInRange = (rep, start, end, type) => {
   if (start[0] === end[0]) {
     return getLineText(rep, start[0]).slice(start[1], end[1]);
@@ -336,4 +462,7 @@ module.exports = {
   paragraphForward,
   paragraphBackward,
   getTextInRange,
+  matchingBracketPos,
+  paragraphTextRange,
+  sentenceTextRange,
 };