fix: unassigning code for multi-line paragraphs (#15)

Author: chrisgrieser

src/coding/unassign-code.ts

@@ -3,7 +3,12 @@ import { incrementProgress } from "src/auxiliary/progress-tracker";
 import type Quadro from "src/main";
 import { BLOCKID_REGEX } from "src/shared/add-blockid-to-datafile";
 import { ExtendedFuzzySuggester } from "src/shared/modals";
-import { getActiveEditor, typeOfFile, WIKILINK_REGEX } from "src/shared/utils";
+import {
+	getActiveEditor,
+	moveToLastLineOfParagraph,
+	typeOfFile,
+	WIKILINK_REGEX,
+} from "src/shared/utils";
 import { type Code, codeFileDisplay, getCodesFilesInParagraphOfDatafile } from "./coding-utils";
 
 //──────────────────────────────────────────────────────────────────────────────
@@ -119,8 +124,9 @@ export function unassignCodeCommand(plugin: Quadro): void {
 		return;
 	}
 
-	const paragraphText = editor.getLine(editor.getCursor().line);
-	const codesInPara = getCodesFilesInParagraphOfDatafile(plugin, dataFile, paragraphText);
+	const lnum = moveToLastLineOfParagraph(editor); // to remove from multiline paragraphs, see #15
+	const lineText = editor.getLine(lnum);
+	const codesInPara = getCodesFilesInParagraphOfDatafile(plugin, dataFile, lineText);
 
 	if (codesInPara.length === 0) {
 		new Notice("Line does not contain any codes to remove.", 3500);

src/shared/add-blockid-to-datafile.ts

@@ -1,4 +1,5 @@
 import { type Editor, moment, type TFile } from "obsidian";
+import { moveToLastLineOfParagraph } from "./utils";
 
 // DOCS https://help.obsidian.md/Linking+notes+and+files/Internal+links#Link+to+a+block+in+a+note
 export const BLOCKID_REGEX = /\^[\w-]+$/;
@@ -18,14 +19,7 @@ export function prepareDatafileLineUpdate(editor: Editor): {
 	// 2. move cursor to last line of paragraph
 	// (This is relevant since when there are soft line breaks in a paragraph,
 	// block-ids are only valid on the last line of the paragraph, see #12.)
-	let lnum: number;
-	while (true) {
-		lnum = editor.getCursor().line;
-		const nextLineIsBlank = editor.getLine(lnum + 1).trim() === "";
-		const currentLineIsListItem = editor.getLine(lnum).match(/^\s*([-*+]|[0-9]+\.)\s/);
-		if (nextLineIsBlank || currentLineIsListItem) break;
-		editor.setCursor({ line: lnum + 1, ch: 0 });
-	}
+	const lnum = moveToLastLineOfParagraph(editor);
 
 	// 3. get existing blockID or generate new one
 	const lineText = editor.getLine(lnum);

src/shared/utils.ts

@@ -21,14 +21,20 @@ export const WIKILINK_REGEX = /\[\[(.+?)([|#].*?)?\]\]/;
 export function typeOfFile(
 	plugin: Quadro,
 	file?: TAbstractFile | string | null,
-): "Data File" | "Code File" | "Extraction File" | "Template" | "Backup" | "Not Markdown" {
+):
+	| "Data File"
+	| "Code File"
+	| "Extraction File"
+	| "Template"
+	| "Backup"
+	| "Not Markdown"
+	| "No File" {
 	const { app, settings } = plugin;
-
 	if (!file) file = app.workspace.getActiveFile();
 	if (typeof file === "string") file = app.vault.getFileByPath(file);
 
-	if (!file || !(file instanceof TFile) || file.extension !== "md") return "Not Markdown";
-
+	if (!file) return "No File";
+	if (!(file instanceof TFile) || file.extension !== "md") return "Not Markdown";
 	if (file.name === "Template.md") return "Template";
 	if (file.path.includes(BACKUP_DIRNAME)) return "Backup";
 	if (file.path.startsWith(settings.coding.folder + "/")) return "Code File";
@@ -112,6 +118,20 @@ export function activeFileHasInvalidName(app: App): boolean {
 	return true;
 }
 
+/** needed, since Obsidian block-ids are only valid on the last line of a paragraph */
+export function moveToLastLineOfParagraph(editor: Editor): number {
+	let lnum = editor.getCursor().line;
+	while (true) {
+		// beyond end of file, `editor.getLine` also returns "", thus this check suffices
+		const nextLineIsBlank = editor.getLine(lnum + 1).trim() === "";
+		const currentLineIsListItem = editor.getLine(lnum).match(/^\s*([-*+]|[0-9]+\.)\s/);
+		if (nextLineIsBlank || currentLineIsListItem) break;
+		lnum++;
+		editor.setCursor({ line: lnum, ch: 0 });
+	}
+	return lnum;
+}
+
 //──────────────────────────────────────────────────────────────────────────────
 
 /** Changed types breaks some things, such as the display of dates in