Split continued line at cursor position

Fixes #1137
BetterThanTomorrow · Apr 21, 2021 · 72f322e · 72f322e
1 parent 746f341
commit 72f322e
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/edit.ts b/src/edit.ts
@@ -2,14 +2,15 @@ import * as vscode from 'vscode';
 import * as util from './utilities';
 import * as docMirror from './doc-mirror/index';
 
+// Relies on that `when` claus guards this from being called
+// when the cursor is before the comment marker
 export function continueCommentCommand() {
     const document = util.getDocument({});
     if (document && document.languageId === 'clojure') {
         const editor = vscode.window.activeTextEditor;
         const position = editor.selection.active;
-        const eolPosition = position.with(position.line, Infinity);
         const cursor = docMirror.getDocument(document).getTokenCursor();
-        if (!(cursor.getToken().type === 'comment')) {
+        if (cursor.getToken().type !== 'comment') {
             if (cursor.getPrevToken().type === 'comment') {
                 cursor.previous();
             } else {
@@ -20,17 +21,17 @@ export function continueCommentCommand() {
             }
         }
         const commentOffset = cursor.rowCol[1];
-        const commentText = cursor.getToken().raw;
+        const commentText = cursor.getToken().raw.substring(0, commentOffset);
         const [_1, startText, bullet, num] =
             commentText.match(/^([;\s]+)([*-] +|(\d+)\. +)?/);
         const newNum = num ? parseInt(num) + 1 : undefined;
         const bulletText = newNum ? bullet.replace(/\d+/, '' + newNum) : bullet;
         const pad = ' '.repeat(commentOffset);
         const newText = `${pad}${startText}${bullet ? bulletText : ''}`;
-        editor.edit(edits => edits.insert(eolPosition, `\n${newText}`), { undoStopAfter: false, undoStopBefore: true }).then(fulfilled => {
+        editor.edit(edits => edits.insert(position, `\n${newText}`), { undoStopAfter: false, undoStopBefore: true }).then(fulfilled => {
             if (fulfilled) {
-                const newEolPosition = eolPosition.with(eolPosition.line + 1, newText.length);
-                editor.selection = new vscode.Selection(newEolPosition, newEolPosition);
+                const newPosition = position.with(position.line + 1, newText.length);
+                editor.selection = new vscode.Selection(newPosition, newPosition);
             }
         });
     }