Skip to content

Commit

Permalink
quick fix for #82 : remove (?<=
Browse files Browse the repository at this point in the history
  • Loading branch information
@Benature
Benature committed Mar 16, 2024
1 parent a11db1a commit 81729ad
Show file tree
Hide file tree
Showing 3 changed files with 114 additions and 105 deletions.
193 changes: 101 additions & 92 deletions main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@ export default class TextFormat extends Plugin {


this.addCommand({
id: "remove-spaces",
id: "remove-redundant-spaces",
name: { en: "Remove redundant spaces in selection", zh: "将选中文本中的多余空格移除", "zh-TW": "將選取文字中的多餘空格移除" }[lang],
editorCallback: (editor: Editor, view: MarkdownView) => {
this.editorTextFormat(editor, view, "remove-spaces");
this.editorTextFormat(editor, view, "remove-redundant-spaces");
},
});
this.addCommand({
Expand Down Expand Up @@ -369,6 +369,8 @@ export default class TextFormat extends Plugin {
}

formatSelection(selectedText: string, cmd: string, args: any = ""): string | null {
// console.log("cmd", cmd)
// console.log("selectedText", selectedText)
let replacedText;
switch (cmd) {
case "anki":
Expand All @@ -381,10 +383,10 @@ export default class TextFormat extends Plugin {
replacedText = selectedText.toUpperCase();
break;
case "capitalize-word":
replacedText = capitalizeWord(selectedText);
replacedText = capitalizeWord(this.settings.LowercaseFirst ? selectedText.toLowerCase() : selectedText);
break;
case "capitalize-sentence":
replacedText = capitalizeSentence(selectedText);
replacedText = capitalizeSentence(this.settings.LowercaseFirst ? selectedText.toLowerCase() : selectedText);
break;
case "titlecase":
replacedText = toTitleCase(selectedText, this.settings);
Expand Down Expand Up @@ -431,10 +433,10 @@ export default class TextFormat extends Plugin {
}
if (!(replacedText)) { return; }
break;
case "remove-spaces":
console.log(selectedText)
case "remove-redundant-spaces":
// console.log("selectedText", selectedText)
replacedText = selectedText
.replace(/(?<=\S) {2,}/g, " ")
.replace(/(?:\S) {2,}/g, " ")
.replace(/ $| (?=\n)/g, "");
// replacedText = replacedText.replace(/\n /g, "\n"); // when a single space left at the head of the line
break;
Expand Down Expand Up @@ -507,9 +509,10 @@ export default class TextFormat extends Plugin {
.replace(/\!(?=[^\[])/g, "！")
.replace(/\?/g, "？")
.replace(/[\(（][^\)]*?[\u4e00-\u9fa5]+?[^\)]*?[\)）]/g, (t) => `（${t.slice(1, t.length - 1)}）`);
// TODO: ignore `!` that is `[!note]`
if (this.settings.RemoveBlanksWhenChinese) {
replacedText = replacedText.replace(
/(?<=[\u4e00-\u9fa5【】（）「」《》：“？‘、；])(\s+)(?=[\u4e00-\u9fa5【】（）「」《》：“？‘、；])/g, "");
/([\u4e00-\u9fa5【】（）「」《》：“？‘、；])(\s+)([\u4e00-\u9fa5【】（）「」《》：“？‘、；])/g, "$1$3");
}
break;
case "English-punctuation":
Expand Down Expand Up @@ -585,6 +588,7 @@ export default class TextFormat extends Plugin {
const origin_cursor_to = editor.offsetToPos(Math.max(anchorOffset, headOffset));
const somethingSelected = !(origin_cursor_from.ch == origin_cursor_to.ch && origin_cursor_from.line == origin_cursor_to.line)
if (!somethingSelected) {
// Select whole line if nothing selected
let cursor = editor.getCursor();

cursor.ch = 0;
Expand Down Expand Up @@ -612,13 +616,6 @@ export default class TextFormat extends Plugin {

//： Adjust Selection
switch (cmd) {
case "capitalize-word":
case "capitalize-sentence":
//: Lower case text if setting is true
if (this.settings.LowercaseFirst) {
selectedText = selectedText.toLowerCase();
}
break;
case "heading":
if (origin_cursor_from.line != origin_cursor_to.line) {
adjustSelection = "whole-paragraph";
Expand Down Expand Up @@ -666,29 +663,33 @@ export default class TextFormat extends Plugin {
}]);
}
selectedText = editor.getSelection();
console.log(selectedText)
// console.log(selectedText)
break;
default:
break;
}

// console.log("supportMultiCursor", supportMultiCursor)

// For command that need adjusting selection, only contain first selection
const selectedTextList: string[] = [];
const rangeList: EditorRangeOrCaret[] = [];
if (supportMultiCursor) {
selectionList.forEach((selection) => {
selectedTextList.push(editor.getRange(selection.anchor, selection.head))
rangeList.push(selection2range(editor, selection))
editor.listSelections().forEach((selection) => {
let rangeTmp = selection2range(editor, selection);
// console.log("rangeTmp", rangeTmp)
selectedTextList.push(editor.getRange(rangeTmp.from, rangeTmp.to));
rangeList.push(rangeTmp);
});
} else {
selectedTextList.push(selectedText);
rangeList.push(selection2range(editor, selection))
}

console.log(selectedTextList)
console.log(editor.getSelection())

// console.log("selectedTextList", selectedTextList)
// console.log(editor.getSelection())

// TODO: remove all `selectedText` before this line

let replacedTextList: string[] = [];
const changeList: EditorChange[] = [];
Expand All @@ -697,80 +698,88 @@ export default class TextFormat extends Plugin {
for (let i = 0; i < selectedTextList.length; i++) {
let selectedText = selectedTextList[i];
// selectedTextList.forEach((selectedText) => {
let replacedText = this.formatSelection(selectedText, cmd, args);
if (replacedText === null) {
switch (cmd) {
case "heading":
if (origin_cursor_from.line == origin_cursor_to.line) {
const headingRes = headingLevel(selectedText, args);
replacedText = headingRes.text;
cursorOffset = headingRes.offset
} else {
replacedText = "";
cursorOffset = 0;
selectedText.split("\n").forEach((line, index) => {
const headingRes = headingLevel(line, args, true);
replacedText += headingRes.text + "\n";
cursorOffset += headingRes.offset;
});
replacedText = replacedText.slice(0, -1); // remove the last `\n`
}
break;
case "api-request":
let p = requestAPI(selectedText, view.file, args);
p.then(result => {
replacedText = result;
editor.setSelections([{ anchor: from, head: to }]);
if (replacedText != selectedText) { editor.replaceSelection(replacedText); }
editor.setSelections([{ anchor: from, head: editor.getCursor("head") }]);
let replacedText = selectedText;
// console.log(i, "replacedText", replacedText)
try {
replacedText = this.formatSelection(selectedText, cmd, args);
if (replacedText === null) {
switch (cmd) {
case "heading":
if (origin_cursor_from.line == origin_cursor_to.line) {
const headingRes = headingLevel(selectedText, args);
replacedText = headingRes.text;
cursorOffset = headingRes.offset
} else {
replacedText = "";
cursorOffset = 0;
selectedText.split("\n").forEach((line, index) => {
const headingRes = headingLevel(line, args, true);
replacedText += headingRes.text + "\n";
cursorOffset += headingRes.offset;
});
replacedText = replacedText.slice(0, -1); // remove the last `\n`
}
break;
case "api-request":
let p = requestAPI(selectedText, view.file, args);
p.then(result => {
replacedText = result;
editor.setSelections([{ anchor: from, head: to }]);
if (replacedText != selectedText) { editor.replaceSelection(replacedText); }
editor.setSelections([{ anchor: from, head: editor.getCursor("head") }]);
return;
})
return;
})
return;
case "callout":
const wholeContent = editor.getValue();
let type = this.settings.calloutType;
if (type.startsWith("!")) {
type = type.substring(1, type.length);
} else {
const preCallouts = wholeContent.match(/(?<=\n\>\s*\[\!)\w+(?=\])/gm);
if (preCallouts) {
type = preCallouts[preCallouts.length - 1];
case "callout":
const wholeContent = editor.getValue();
let type = this.settings.calloutType;
if (type.startsWith("!")) {
type = type.substring(1, type.length);
} else {
const reType = /(?:\n\>\s*\[\!)(\w+)(?:\])/gm
const preCallouts = wholeContent.match(reType);
if (preCallouts) {
type = reType.exec(preCallouts[preCallouts.length - 1])[1];
}
}
}
const lines = selectedText.replace(/$\n>/g, "").split("\n");
replacedText = `> [!${type}] ${lines[0]}`
if (lines.length > 1) {
for (let idx = 1; idx < lines.length; idx++) {
replacedText += `\n> ` + lines[idx];
const lines = selectedText.replace(/$\n>/g, "").split("\n");
replacedText = `> [!${type}] ${lines[0]}`
if (lines.length > 1) {
for (let idx = 1; idx < lines.length; idx++) {
replacedText += `\n> ` + lines[idx];
}
}
}
break;
case "bullet":
let r = this.settings.BulletPoints.replace("-", "");
replacedText = selectedText
.replace(RegExp(`\\s*[${r}] *`, "g"), (t) =>
t.replace(RegExp(`[${r}] *`), "\n- ")
)
.replace(/\n[~\/Vv] /g, "\n- ")
.replace(/\n+/g, "\n")
.replace(/^\n/, "");
// if "-" in this.settings.BulletPoints
if (this.settings.BulletPoints.indexOf("-") > -1) {
replacedText = replacedText.replace(/^- /g, "\n- ");
}
// if select multi-paragraphs, add `- ` to the beginning
if (selectedText.indexOf("\n") > -1 && replacedText.slice(0, 2) != "- ") {
replacedText = "- " + replacedText;
}
break;
case "latex-letter":
replacedText = convertLatex(editor, selectedText);
break;
default:
Error("Unknown command")
return;
break;
case "bullet":
let r = this.settings.BulletPoints.replace("-", "");
replacedText = selectedText
.replace(RegExp(`\\s*[${r}] *`, "g"), (t) =>
t.replace(RegExp(`[${r}] *`), "\n- ")
)
.replace(/\n[~\/Vv] /g, "\n- ")
.replace(/\n+/g, "\n")
.replace(/^\n/, "");
// if "-" in this.settings.BulletPoints
if (this.settings.BulletPoints.indexOf("-") > -1) {
replacedText = replacedText.replace(/^- /g, "\n- ");
}
// if select multi-paragraphs, add `- ` to the beginning
if (selectedText.indexOf("\n") > -1 && replacedText.slice(0, 2) != "- ") {
replacedText = "- " + replacedText;
}
break;
case "latex-letter":
replacedText = convertLatex(editor, selectedText);
break;
default:
Error("Unknown command")
return;
}
}
} catch (e) {
console.error(e);
}
// console.log("replacedText", replacedText)
replacedTextList.push(replacedText);
if (supportMultiCursor) {
changeList.push({ text: replacedText, ...rangeList[i] });
Expand All @@ -786,7 +795,7 @@ export default class TextFormat extends Plugin {
// selections: rangeList,
changes: changeList
});
console.log(changeList)
// console.log(changeList)


let replacedText = replacedTextList[0];
Expand Down
2 changes: 1 addition & 1 deletion manifest-beta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "obsidian-text-format",
"name": "Text Format",
"version": "3.0.0-b1",
"version": "3.0.0-b2",
"minAppVersion": "0.9.7",
"description": "Format text such as lowercase/uppercase/capitalize/titlecase, converting order/bullet list, removing redundant spaces/newline characters.",
"author": "Benature",
Expand Down
24 changes: 12 additions & 12 deletions src/format.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export function zoteroNote(
let text = result.groups.text.replace(/\\\[\d+\\\]/g, (t) =>
t.replace("\\[", "[").replace("\\]", "]")
);
console.log(template);
// console.log(template);
// @ts-ignore
return template.format({
text: text,
Expand Down Expand Up @@ -170,7 +170,7 @@ export function array2markdown(content: string): string {
content = content.replace(
/\\begin\{array\}\{[clr]\}.*?\\end\{array\}/g,
(t) => {
console.log(t)
// console.log(t)
return t
.replace(/\\{1,2}begin\{array\}\{[clr]\}/g, "")
.replace("\\end{array}", "")
Expand Down Expand Up @@ -563,7 +563,7 @@ export function convertLatex(editor: Editor, selectedText: string): string {
// const reGreek = /[\u03B1-\u03C9\u0391-\u03A9]/g;

//: Or, find math text and surround it with `$`
const pre = String.raw`(?<=[\s：（）。，、；—\(\)]|^)`;
const pre = String.raw`([\s：（）。，、；—\(\)]|^)`;
const suf = String.raw`(?=[\s\,\:\.\?\!，。、（）；—\(\)]|$)`;


Expand All @@ -573,30 +573,30 @@ export function convertLatex(editor: Editor, selectedText: string): string {
// single character
.replace(
RegExp(pre + String.raw`([a-zA-Z\u03B1-\u03C9\u0391-\u03A9])` + suf, "g"),
(t, t1) => {
return `$${G(t1)}$`;
(t, pre, t1) => {
return pre + `$${G(t1)}$`;
})
// two characters
.replace(
RegExp(pre + patternChar2 + suf, "g"),
(t, t1, t2) => {
(t, pre, t1, t2) => {
// ignore cases
if (/is|or|as|to|am|an|at|by|do|go|ha|he|hi|ho|if|in|it|my|no|of|on|so|up|us|we|be/g.test(t)) { return t; }
return `$${G(t1)}_${G(t2)}$`;
if (/is|or|as|to|am|an|at|by|do|go|ha|he|hi|ho|if|in|it|my|no|of|on|so|up|us|we|be/g.test(t1 + t2)) { return t; }
return pre + `$${G(t1)}_${G(t2)}$`;
})
.replace(
RegExp(pre + String.raw`([a-z\u03B1-\u03C9\u0391-\u03A9])([\*])` + suf, "g"),
(t, t1, t2) => {
return `$${t1}^${t2}$`;
(t, pre, t1, t2) => {
return pre + `$${t1}^${t2}$`;
})
// calculator
.replace(
RegExp(pre + String.raw`([\w\u03B1-\u03C9\u0391-\u03A9]{1,3}[\+\-\*\/<>=][\w\u03B1-\u03C9\u0391-\u03A9]{1,3})` + suf, "g"),
(t, t1) => {
(t, pre, t1) => {
// let content = t1.replace(/([a-z])([a-zA-Z0-9])/g, `$1_$2`)
let content = t1.replace(RegExp(patternChar2, "g"),
(t: string, t1: string, t2: string) => `${G(t1)}_${G(t2)}`)
return `$${content}$`
return pre + `$${content}$`
})
;
return replacedText;
Expand Down

0 comments on commit 81729ad

Please sign in to comment.