From edacb9ae3d3636787cca12cf47b110c7f3ade8b9 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Wed, 7 Jun 2023 10:36:20 +0800 Subject: [PATCH] :recycle: https://github.com/siyuan-note/siyuan/issues/2829 --- app/src/ai/actions.ts | 4 ++-- app/src/block/util.ts | 2 +- app/src/boot/openChangelog.ts | 2 +- app/src/config/bazaar.ts | 2 +- app/src/menus/protyle.ts | 6 +++--- app/src/mobile/util/MobileBackFoward.ts | 4 ++-- app/src/protyle/export/util.ts | 2 +- app/src/protyle/gutter/index.ts | 6 +++--- app/src/protyle/hint/extend.ts | 14 +++++++------- app/src/protyle/hint/index.ts | 4 ++-- app/src/protyle/index.ts | 2 +- app/src/protyle/preview/index.ts | 4 ++-- .../protyle/{markdown => render}/abcRender.ts | 0 .../protyle/{markdown => render}/blockRender.ts | 0 .../protyle/{markdown => render}/chartRender.ts | 0 .../{markdown => render}/flowchartRender.ts | 0 .../{markdown => render}/graphvizRender.ts | 0 .../{markdown => render}/highlightRender.ts | 0 .../protyle/{markdown => render}/mathRender.ts | 0 .../{markdown => render}/mermaidRender.ts | 0 .../{markdown => render}/mindmapRender.ts | 0 .../{markdown => render}/plantumlRender.ts | 0 app/src/protyle/{markdown => render}/setLute.ts | 0 .../protyle/{markdown => render}/speechRender.ts | 0 app/src/protyle/toolbar/index.ts | 6 +++--- app/src/protyle/ui/initUI.ts | 2 +- app/src/protyle/util/editorCommonEvent.ts | 2 +- app/src/protyle/util/insertHTML.ts | 4 ++-- app/src/protyle/util/onGet.ts | 4 ++-- app/src/protyle/util/paste.ts | 4 ++-- app/src/protyle/util/processCode.ts | 16 ++++++++-------- app/src/protyle/wysiwyg/enter.ts | 2 +- app/src/protyle/wysiwyg/index.ts | 4 ++-- app/src/protyle/wysiwyg/input.ts | 6 +++--- app/src/protyle/wysiwyg/keydown.ts | 2 +- app/src/protyle/wysiwyg/renderBacklink.ts | 4 ++-- app/src/protyle/wysiwyg/transaction.ts | 4 ++-- app/src/util/Tree.ts | 2 +- 38 files changed, 57 insertions(+), 57 deletions(-) rename app/src/protyle/{markdown => render}/abcRender.ts (100%) rename app/src/protyle/{markdown => render}/blockRender.ts (100%) rename app/src/protyle/{markdown => render}/chartRender.ts (100%) rename app/src/protyle/{markdown => render}/flowchartRender.ts (100%) rename app/src/protyle/{markdown => render}/graphvizRender.ts (100%) rename app/src/protyle/{markdown => render}/highlightRender.ts (100%) rename app/src/protyle/{markdown => render}/mathRender.ts (100%) rename app/src/protyle/{markdown => render}/mermaidRender.ts (100%) rename app/src/protyle/{markdown => render}/mindmapRender.ts (100%) rename app/src/protyle/{markdown => render}/plantumlRender.ts (100%) rename app/src/protyle/{markdown => render}/setLute.ts (100%) rename app/src/protyle/{markdown => render}/speechRender.ts (100%) diff --git a/app/src/ai/actions.ts b/app/src/ai/actions.ts index 8e5d93e1b..5c412d5a2 100644 --- a/app/src/ai/actions.ts +++ b/app/src/ai/actions.ts @@ -5,9 +5,9 @@ import {insertHTML} from "../protyle/util/insertHTML"; import {Dialog} from "../dialog"; import {isMobile} from "../util/functions"; import {getContenteditableElement} from "../protyle/wysiwyg/getBlock"; -import {blockRender} from "../protyle/markdown/blockRender"; +import {blockRender} from "../protyle/render/blockRender"; import {processRender} from "../protyle/util/processCode"; -import {highlightRender} from "../protyle/markdown/highlightRender"; +import {highlightRender} from "../protyle/render/highlightRender"; import {Constants} from "../constants"; import {setStorageVal} from "../protyle/util/compatibility"; import {hasClosestByClassName} from "../protyle/util/hasClosest"; diff --git a/app/src/block/util.ts b/app/src/block/util.ts index 9f3bde19a..b9111ac0c 100644 --- a/app/src/block/util.ts +++ b/app/src/block/util.ts @@ -6,7 +6,7 @@ import {transaction, updateTransaction} from "../protyle/wysiwyg/transaction"; import {scrollCenter} from "../util/highlightById"; import {Constants} from "../constants"; import {hideElements} from "../protyle/ui/hideElements"; -import {blockRender} from "../protyle/markdown/blockRender"; +import {blockRender} from "../protyle/render/blockRender"; export const cancelSB = (protyle: IProtyle, nodeElement: Element) => { const doOperations: IOperation[] = []; diff --git a/app/src/boot/openChangelog.ts b/app/src/boot/openChangelog.ts index 5ebb74f1b..cec9bd810 100644 --- a/app/src/boot/openChangelog.ts +++ b/app/src/boot/openChangelog.ts @@ -1,6 +1,6 @@ import {fetchPost} from "../util/fetch"; import {Dialog} from "../dialog"; -import {highlightRender} from "../protyle/markdown/highlightRender"; +import {highlightRender} from "../protyle/render/highlightRender"; import {isMobile} from "../util/functions"; export const openChangelog = () => { diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts index 920290b5d..6dddaf426 100644 --- a/app/src/config/bazaar.ts +++ b/app/src/config/bazaar.ts @@ -2,7 +2,7 @@ import {appearance} from "./appearance"; import {showMessage} from "../dialog/message"; import {fetchPost} from "../util/fetch"; import {confirmDialog} from "../dialog/confirmDialog"; -import {highlightRender} from "../protyle/markdown/highlightRender"; +import {highlightRender} from "../protyle/render/highlightRender"; import {exportLayout} from "../layout/util"; import {Constants} from "../constants"; /// #if !BROWSER diff --git a/app/src/menus/protyle.ts b/app/src/menus/protyle.ts index 57bbd81eb..638fb7c71 100644 --- a/app/src/menus/protyle.ts +++ b/app/src/menus/protyle.ts @@ -14,7 +14,7 @@ import { moveRowToUp, setTableAlign } from "../protyle/util/table"; -import {mathRender} from "../protyle/markdown/mathRender"; +import {mathRender} from "../protyle/render/mathRender"; import {transaction, updateTransaction} from "../protyle/wysiwyg/transaction"; import {openMenu} from "./commonMenuItem"; import {fetchPost} from "../util/fetch"; @@ -31,9 +31,9 @@ import {openNewWindowById} from "../window/openNewWindow"; /// #endif import {getSearch, isMobile} from "../util/functions"; import {removeFoldHeading} from "../protyle/util/heading"; -import {lineNumberRender} from "../protyle/markdown/highlightRender"; +import {lineNumberRender} from "../protyle/render/highlightRender"; import * as dayjs from "dayjs"; -import {blockRender} from "../protyle/markdown/blockRender"; +import {blockRender} from "../protyle/render/blockRender"; import {renameAsset} from "../editor/rename"; import {electronUndo} from "../protyle/undo"; import {pushBack} from "../mobile/util/MobileBackFoward"; diff --git a/app/src/mobile/util/MobileBackFoward.ts b/app/src/mobile/util/MobileBackFoward.ts index 897b44f1f..faee476af 100644 --- a/app/src/mobile/util/MobileBackFoward.ts +++ b/app/src/mobile/util/MobileBackFoward.ts @@ -4,8 +4,8 @@ import {setEditMode} from "../../protyle/util/setEditMode"; import {fetchPost} from "../../util/fetch"; import {zoomOut} from "../../menus/protyle"; import {processRender} from "../../protyle/util/processCode"; -import {highlightRender} from "../../protyle/markdown/highlightRender"; -import {blockRender} from "../../protyle/markdown/blockRender"; +import {highlightRender} from "../../protyle/render/highlightRender"; +import {blockRender} from "../../protyle/render/blockRender"; import {disabledForeverProtyle, disabledProtyle, enableProtyle} from "../../protyle/util/onGet"; import {setStorageVal} from "../../protyle/util/compatibility"; import {closePanel} from "./closePanel"; diff --git a/app/src/protyle/export/util.ts b/app/src/protyle/export/util.ts index 202e7daae..0798cc20f 100644 --- a/app/src/protyle/export/util.ts +++ b/app/src/protyle/export/util.ts @@ -9,7 +9,7 @@ import {Dialog} from "../../dialog"; import {addScript} from "../util/addScript"; import {isMobile} from "../../util/functions"; import {Constants} from "../../constants"; -import {highlightRender} from "../markdown/highlightRender"; +import {highlightRender} from "../render/highlightRender"; import {processRender} from "../util/processCode"; import {openByMobile, setStorageVal} from "../util/compatibility"; diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts index cbb6599b3..de3e616a8 100644 --- a/app/src/protyle/gutter/index.ts +++ b/app/src/protyle/gutter/index.ts @@ -15,8 +15,8 @@ import {removeBlock} from "../wysiwyg/remove"; import {focusBlock, focusByRange, focusByWbr, getEditorRange} from "../util/selection"; import {hideElements} from "../ui/hideElements"; import {processRender} from "../util/processCode"; -import {highlightRender} from "../markdown/highlightRender"; -import {blockRender} from "../markdown/blockRender"; +import {highlightRender} from "../render/highlightRender"; +import {blockRender} from "../render/blockRender"; import {removeEmbed} from "../wysiwyg/removeEmbed"; import {getContenteditableElement, getTopAloneElement, isNotEditBlock} from "../wysiwyg/getBlock"; import * as dayjs from "dayjs"; @@ -28,7 +28,7 @@ import {openFileById} from "../../editor/util"; /// #endif import {Constants} from "../../constants"; import {openMobileFileById} from "../../mobile/editor"; -import {mathRender} from "../markdown/mathRender"; +import {mathRender} from "../render/mathRender"; import {duplicateBlock} from "../wysiwyg/commonHotkey"; import {movePathTo} from "../../util/pathName"; import {hintMoveBlock} from "../hint/extend"; diff --git a/app/src/protyle/hint/extend.ts b/app/src/protyle/hint/extend.ts index 931a44c74..26ea6fe5a 100644 --- a/app/src/protyle/hint/extend.ts +++ b/app/src/protyle/hint/extend.ts @@ -2,10 +2,10 @@ import {fetchPost} from "../../util/fetch"; import {insertHTML} from "../util/insertHTML"; import {getIconByType} from "../../editor/getIcon"; import {updateHotkeyTip} from "../util/compatibility"; -import {blockRender} from "../markdown/blockRender"; +import {blockRender} from "../render/blockRender"; import {Constants} from "../../constants"; import {processRender} from "../util/processCode"; -import {highlightRender} from "../markdown/highlightRender"; +import {highlightRender} from "../render/highlightRender"; import {focusBlock, focusByRange, getEditorRange} from "../util/selection"; import {hasClosestBlock, hasClosestByClassName} from "../util/hasClosest"; import {getContenteditableElement, getTopAloneElement} from "../wysiwyg/getBlock"; @@ -46,11 +46,11 @@ export const hintSlash = (key: string, protyle: IProtyle) => { value: Constants.ZWSP + 5, html: '
AI Chat
', }, - // { - // filter: ["属性视图", "shuxingshitu", "sxst", "attribute view"], - // value: '
', - // html: `
${window.siyuan.languages.attributeView}
`, - // }, + { + filter: ["属性视图", "shuxingshitu", "sxst", "attribute view"], + value: '
', + html: `
${window.siyuan.languages.attributeView}
`, + }, { filter: ["文档", "子文档", "wendang", "wd", "ziwendang", "zwd", "xjwd"], value: Constants.ZWSP + 4, diff --git a/app/src/protyle/hint/index.ts b/app/src/protyle/hint/index.ts index 98f942518..508badecb 100644 --- a/app/src/protyle/hint/index.ts +++ b/app/src/protyle/hint/index.ts @@ -15,13 +15,13 @@ import {setPosition} from "../../util/setPosition"; import {getContenteditableElement, hasNextSibling, hasPreviousSibling} from "../wysiwyg/getBlock"; import {transaction, updateTransaction} from "../wysiwyg/transaction"; import {insertHTML} from "../util/insertHTML"; -import {highlightRender} from "../markdown/highlightRender"; +import {highlightRender} from "../render/highlightRender"; import {imgMenu} from "../../menus/protyle"; import {hideElements} from "../ui/hideElements"; import {fetchPost} from "../../util/fetch"; import {getDisplayName, pathPosix} from "../../util/pathName"; import {addEmoji, filterEmoji, lazyLoadEmoji, lazyLoadEmojiImg, unicode2Emoji} from "../../emoji"; -import {blockRender} from "../markdown/blockRender"; +import {blockRender} from "../render/blockRender"; import {uploadFiles} from "../upload"; /// #if !MOBILE import {openFileById} from "../../editor/util"; diff --git a/app/src/protyle/index.ts b/app/src/protyle/index.ts index 336775c55..a7a8ae596 100644 --- a/app/src/protyle/index.ts +++ b/app/src/protyle/index.ts @@ -1,6 +1,6 @@ import {Constants} from "../constants"; import {Hint} from "./hint"; -import {setLute} from "./markdown/setLute"; +import {setLute} from "./render/setLute"; import {Preview} from "./preview"; import {addLoading, initUI, removeLoading, setPadding} from "./ui/initUI"; import {Undo} from "./undo"; diff --git a/app/src/protyle/preview/index.ts b/app/src/protyle/preview/index.ts index f51ff8050..b35c522a6 100644 --- a/app/src/protyle/preview/index.ts +++ b/app/src/protyle/preview/index.ts @@ -15,8 +15,8 @@ import {openAsset, openBy} from "../../editor/util"; /// #endif import {fetchPost} from "../../util/fetch"; import {processRender} from "../util/processCode"; -import {highlightRender} from "../markdown/highlightRender"; -import {speechRender} from "../markdown/speechRender"; +import {highlightRender} from "../render/highlightRender"; +import {speechRender} from "../render/speechRender"; export class Preview { public element: HTMLElement; diff --git a/app/src/protyle/markdown/abcRender.ts b/app/src/protyle/render/abcRender.ts similarity index 100% rename from app/src/protyle/markdown/abcRender.ts rename to app/src/protyle/render/abcRender.ts diff --git a/app/src/protyle/markdown/blockRender.ts b/app/src/protyle/render/blockRender.ts similarity index 100% rename from app/src/protyle/markdown/blockRender.ts rename to app/src/protyle/render/blockRender.ts diff --git a/app/src/protyle/markdown/chartRender.ts b/app/src/protyle/render/chartRender.ts similarity index 100% rename from app/src/protyle/markdown/chartRender.ts rename to app/src/protyle/render/chartRender.ts diff --git a/app/src/protyle/markdown/flowchartRender.ts b/app/src/protyle/render/flowchartRender.ts similarity index 100% rename from app/src/protyle/markdown/flowchartRender.ts rename to app/src/protyle/render/flowchartRender.ts diff --git a/app/src/protyle/markdown/graphvizRender.ts b/app/src/protyle/render/graphvizRender.ts similarity index 100% rename from app/src/protyle/markdown/graphvizRender.ts rename to app/src/protyle/render/graphvizRender.ts diff --git a/app/src/protyle/markdown/highlightRender.ts b/app/src/protyle/render/highlightRender.ts similarity index 100% rename from app/src/protyle/markdown/highlightRender.ts rename to app/src/protyle/render/highlightRender.ts diff --git a/app/src/protyle/markdown/mathRender.ts b/app/src/protyle/render/mathRender.ts similarity index 100% rename from app/src/protyle/markdown/mathRender.ts rename to app/src/protyle/render/mathRender.ts diff --git a/app/src/protyle/markdown/mermaidRender.ts b/app/src/protyle/render/mermaidRender.ts similarity index 100% rename from app/src/protyle/markdown/mermaidRender.ts rename to app/src/protyle/render/mermaidRender.ts diff --git a/app/src/protyle/markdown/mindmapRender.ts b/app/src/protyle/render/mindmapRender.ts similarity index 100% rename from app/src/protyle/markdown/mindmapRender.ts rename to app/src/protyle/render/mindmapRender.ts diff --git a/app/src/protyle/markdown/plantumlRender.ts b/app/src/protyle/render/plantumlRender.ts similarity index 100% rename from app/src/protyle/markdown/plantumlRender.ts rename to app/src/protyle/render/plantumlRender.ts diff --git a/app/src/protyle/markdown/setLute.ts b/app/src/protyle/render/setLute.ts similarity index 100% rename from app/src/protyle/markdown/setLute.ts rename to app/src/protyle/render/setLute.ts diff --git a/app/src/protyle/markdown/speechRender.ts b/app/src/protyle/render/speechRender.ts similarity index 100% rename from app/src/protyle/markdown/speechRender.ts rename to app/src/protyle/render/speechRender.ts diff --git a/app/src/protyle/toolbar/index.ts b/app/src/protyle/toolbar/index.ts index 4c7f246e2..f6612a122 100644 --- a/app/src/protyle/toolbar/index.ts +++ b/app/src/protyle/toolbar/index.ts @@ -17,12 +17,12 @@ import {updateTransaction} from "../wysiwyg/transaction"; import {Constants} from "../../constants"; import {getEventName, openByMobile, setStorageVal} from "../util/compatibility"; import {upDownHint} from "../../util/upDownHint"; -import {highlightRender} from "../markdown/highlightRender"; +import {highlightRender} from "../render/highlightRender"; import {getContenteditableElement, hasNextSibling, hasPreviousSibling} from "../wysiwyg/getBlock"; import {processRender} from "../util/processCode"; import {BlockRef} from "./BlockRef"; import {hintRenderAssets, hintRenderTemplate, hintRenderWidget} from "../hint/extend"; -import {blockRender} from "../markdown/blockRender"; +import {blockRender} from "../render/blockRender"; /// #if !BROWSER import {openBy} from "../../editor/util"; /// #endif @@ -41,7 +41,7 @@ import {previewTemplate} from "./util"; import {hideMessage, showMessage} from "../../dialog/message"; import {InlineMath} from "./InlineMath"; import {InlineMemo} from "./InlineMemo"; -import {mathRender} from "../markdown/mathRender"; +import {mathRender} from "../render/mathRender"; import {linkMenu} from "../../menus/protyle"; import {addScript} from "../util/addScript"; import {confirmDialog} from "../../dialog/confirmDialog"; diff --git a/app/src/protyle/ui/initUI.ts b/app/src/protyle/ui/initUI.ts index 9264ab561..45a7acf95 100644 --- a/app/src/protyle/ui/initUI.ts +++ b/app/src/protyle/ui/initUI.ts @@ -1,5 +1,5 @@ import {setEditMode} from "../util/setEditMode"; -import {lineNumberRender} from "../markdown/highlightRender"; +import {lineNumberRender} from "../render/highlightRender"; import {scrollEvent} from "../scroll/event"; import {isMobile} from "../../util/functions"; import {Constants} from "../../constants"; diff --git a/app/src/protyle/util/editorCommonEvent.ts b/app/src/protyle/util/editorCommonEvent.ts index f451d2c8e..eb4bcc618 100644 --- a/app/src/protyle/util/editorCommonEvent.ts +++ b/app/src/protyle/util/editorCommonEvent.ts @@ -14,7 +14,7 @@ import {Tab} from "../../layout/Tab"; import {updatePanelByEditor} from "../../editor/util"; /// #endif import {Editor} from "../../editor"; -import {blockRender} from "../markdown/blockRender"; +import {blockRender} from "../render/blockRender"; import {uploadLocalFiles} from "../upload"; import {insertHTML} from "./insertHTML"; import {isBrowser} from "../../util/functions"; diff --git a/app/src/protyle/util/insertHTML.ts b/app/src/protyle/util/insertHTML.ts index fe7793901..bee1251b3 100644 --- a/app/src/protyle/util/insertHTML.ts +++ b/app/src/protyle/util/insertHTML.ts @@ -3,9 +3,9 @@ import * as dayjs from "dayjs"; import {transaction, updateTransaction} from "../wysiwyg/transaction"; import {getContenteditableElement} from "../wysiwyg/getBlock"; import {fixTableRange, focusBlock, focusByWbr, getEditorRange} from "./selection"; -import {mathRender} from "../markdown/mathRender"; +import {mathRender} from "../render/mathRender"; import {Constants} from "../../constants"; -import {highlightRender} from "../markdown/highlightRender"; +import {highlightRender} from "../render/highlightRender"; import {scrollCenter} from "../../util/highlightById"; export const insertHTML = (html: string, protyle: IProtyle, isBlock = false, diff --git a/app/src/protyle/util/onGet.ts b/app/src/protyle/util/onGet.ts index 906b1c251..f6e22506e 100644 --- a/app/src/protyle/util/onGet.ts +++ b/app/src/protyle/util/onGet.ts @@ -3,8 +3,8 @@ import {Constants} from "../../constants"; import {hideElements} from "../ui/hideElements"; import {fetchPost} from "../../util/fetch"; import {processRender} from "./processCode"; -import {highlightRender} from "../markdown/highlightRender"; -import {blockRender} from "../markdown/blockRender"; +import {highlightRender} from "../render/highlightRender"; +import {blockRender} from "../render/blockRender"; import {highlightById} from "../../util/highlightById"; /// #if !MOBILE import {pushBack} from "../../util/backForward"; diff --git a/app/src/protyle/util/paste.ts b/app/src/protyle/util/paste.ts index fc288fdb8..38e7b7619 100644 --- a/app/src/protyle/util/paste.ts +++ b/app/src/protyle/util/paste.ts @@ -7,8 +7,8 @@ import {clipboard} from "electron"; /// #endif import {hasClosestBlock} from "./hasClosest"; import {getEditorRange} from "./selection"; -import {blockRender} from "../markdown/blockRender"; -import {highlightRender} from "../markdown/highlightRender"; +import {blockRender} from "../render/blockRender"; +import {highlightRender} from "../render/highlightRender"; import {fetchPost, fetchSyncPost} from "../../util/fetch"; import {isDynamicRef, isFileAnnotation} from "../../util/functions"; import {insertHTML} from "./insertHTML"; diff --git a/app/src/protyle/util/processCode.ts b/app/src/protyle/util/processCode.ts index ba798607c..48c92349b 100644 --- a/app/src/protyle/util/processCode.ts +++ b/app/src/protyle/util/processCode.ts @@ -1,11 +1,11 @@ -import {abcRender} from "../markdown/abcRender"; -import {chartRender} from "../markdown/chartRender"; -import {graphvizRender} from "../markdown/graphvizRender"; -import {mathRender} from "../markdown/mathRender"; -import {mermaidRender} from "../markdown/mermaidRender"; -import {mindmapRender} from "../markdown/mindmapRender"; -import {flowchartRender} from "../markdown/flowchartRender"; -import {plantumlRender} from "../markdown/plantumlRender"; +import {abcRender} from "../render/abcRender"; +import {chartRender} from "../render/chartRender"; +import {graphvizRender} from "../render/graphvizRender"; +import {mathRender} from "../render/mathRender"; +import {mermaidRender} from "../render/mermaidRender"; +import {mindmapRender} from "../render/mindmapRender"; +import {flowchartRender} from "../render/flowchartRender"; +import {plantumlRender} from "../render/plantumlRender"; import {Constants} from "../../constants"; export const processPasteCode = (html: string, text: string) => { diff --git a/app/src/protyle/wysiwyg/enter.ts b/app/src/protyle/wysiwyg/enter.ts index 70f676640..7336f4f12 100644 --- a/app/src/protyle/wysiwyg/enter.ts +++ b/app/src/protyle/wysiwyg/enter.ts @@ -9,7 +9,7 @@ import { } from "./getBlock"; import {transaction, updateTransaction} from "./transaction"; import {breakList, genListItemElement, listOutdent, updateListOrder} from "./list"; -import {highlightRender} from "../markdown/highlightRender"; +import {highlightRender} from "../render/highlightRender"; import {Constants} from "../../constants"; import {scrollCenter} from "../../util/highlightById"; import {hideElements} from "../ui/hideElements"; diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts index a97421085..a927f9f93 100644 --- a/app/src/protyle/wysiwyg/index.ts +++ b/app/src/protyle/wysiwyg/index.ts @@ -43,9 +43,9 @@ import {getEnableHTML, removeEmbed} from "./removeEmbed"; import {keydown} from "./keydown"; import {openMobileFileById} from "../../mobile/editor"; import {removeBlock} from "./remove"; -import {highlightRender} from "../markdown/highlightRender"; +import {highlightRender} from "../render/highlightRender"; import {openAttr} from "../../menus/commonMenuItem"; -import {blockRender} from "../markdown/blockRender"; +import {blockRender} from "../render/blockRender"; /// #if !MOBILE import {getAllModels} from "../../layout/getAll"; import {pushBack} from "../../util/backForward"; diff --git a/app/src/protyle/wysiwyg/input.ts b/app/src/protyle/wysiwyg/input.ts index fcc5a24b7..f5bc46b9d 100644 --- a/app/src/protyle/wysiwyg/input.ts +++ b/app/src/protyle/wysiwyg/input.ts @@ -3,11 +3,11 @@ import {focusBlock, focusByWbr} from "../util/selection"; import {Constants} from "../../constants"; import * as dayjs from "dayjs"; import {transaction, updateTransaction} from "./transaction"; -import {mathRender} from "../markdown/mathRender"; -import {highlightRender} from "../markdown/highlightRender"; +import {mathRender} from "../render/mathRender"; +import {highlightRender} from "../render/highlightRender"; import {getContenteditableElement, getNextBlock, isNotEditBlock} from "./getBlock"; import {genEmptyBlock} from "../../block/util"; -import {blockRender} from "../markdown/blockRender"; +import {blockRender} from "../render/blockRender"; import {hideElements} from "../ui/hideElements"; import {hasClosestByAttribute} from "../util/hasClosest"; import {fetchPost, fetchSyncPost} from "../../util/fetch"; diff --git a/app/src/protyle/wysiwyg/keydown.ts b/app/src/protyle/wysiwyg/keydown.ts index 4852f4874..7d9b6426b 100644 --- a/app/src/protyle/wysiwyg/keydown.ts +++ b/app/src/protyle/wysiwyg/keydown.ts @@ -61,7 +61,7 @@ import {fetchPost} from "../../util/fetch"; import {scrollCenter} from "../../util/highlightById"; import {BlockPanel} from "../../block/Panel"; import * as dayjs from "dayjs"; -import {highlightRender} from "../markdown/highlightRender"; +import {highlightRender} from "../render/highlightRender"; import {countBlockWord} from "../../layout/status"; import {moveToDown, moveToUp} from "./move"; import {pasteAsPlainText} from "../util/paste"; diff --git a/app/src/protyle/wysiwyg/renderBacklink.ts b/app/src/protyle/wysiwyg/renderBacklink.ts index f4cd1b919..52ec7b74e 100644 --- a/app/src/protyle/wysiwyg/renderBacklink.ts +++ b/app/src/protyle/wysiwyg/renderBacklink.ts @@ -3,8 +3,8 @@ import {removeLoading} from "../ui/initUI"; import {fetchPost} from "../../util/fetch"; import {Constants} from "../../constants"; import {processRender} from "../util/processCode"; -import {highlightRender} from "../markdown/highlightRender"; -import {blockRender} from "../markdown/blockRender"; +import {highlightRender} from "../render/highlightRender"; +import {blockRender} from "../render/blockRender"; import {disabledForeverProtyle, disabledProtyle} from "../util/onGet"; export const renderBacklink = (protyle: IProtyle, backlinkData: { diff --git a/app/src/protyle/wysiwyg/transaction.ts b/app/src/protyle/wysiwyg/transaction.ts index ae48d4847..4c9625837 100644 --- a/app/src/protyle/wysiwyg/transaction.ts +++ b/app/src/protyle/wysiwyg/transaction.ts @@ -2,9 +2,9 @@ import {fetchPost} from "../../util/fetch"; import {focusBlock, focusByWbr, focusSideBlock, getEditorRange} from "../util/selection"; import {getTopAloneElement} from "./getBlock"; import {Constants} from "../../constants"; -import {blockRender} from "../markdown/blockRender"; +import {blockRender} from "../render/blockRender"; import {processRender} from "../util/processCode"; -import {highlightRender} from "../markdown/highlightRender"; +import {highlightRender} from "../render/highlightRender"; import {hasClosestBlock, hasClosestByAttribute} from "../util/hasClosest"; import {setFold} from "../../menus/protyle"; import {onGet} from "../util/onGet"; diff --git a/app/src/util/Tree.ts b/app/src/util/Tree.ts index 0aeb8945c..8e631c989 100644 --- a/app/src/util/Tree.ts +++ b/app/src/util/Tree.ts @@ -1,7 +1,7 @@ import {getIconByType} from "../editor/getIcon"; import {hasClosestByMatchTag, hasClosestByTag} from "../protyle/util/hasClosest"; import {isMobile} from "./functions"; -import {mathRender} from "../protyle/markdown/mathRender"; +import {mathRender} from "../protyle/render/mathRender"; import {unicode2Emoji} from "../emoji"; import {Constants} from "../constants";