From 9cfd135bba434b6adbfde97600ba8782f3a39753 Mon Sep 17 00:00:00 2001 From: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com> Date: Mon, 21 Jul 2025 13:37:45 -0700 Subject: [PATCH] Chore: Editor: Refactor editor package (#12743) --- .eslintignore | 68 +++++++++---------- .gitignore | 68 +++++++++---------- .../hooks/useEditorCommandHandler.test.ts | 2 +- .../CodeMirror/CodeMirrorControl.test.ts | 4 +- .../editor/CodeMirror/CodeMirrorControl.ts | 4 +- .../editor/CodeMirror/configFromSettings.ts | 12 ++-- .../editor/CodeMirror/createEditor.test.ts | 4 +- packages/editor/CodeMirror/createEditor.ts | 14 ++-- .../editorCommands/editorCommands.ts | 2 +- .../editorCommands/insertLineAfter.test.ts | 2 +- .../editorCommands/insertLineAfter.ts | 2 +- .../insertNewlineContinueMarkup.test.ts | 4 +- .../insertNewlineContinueMarkup.ts | 0 .../editorCommands/jumpToHash.test.ts | 2 +- ...rkdownCommands.bulletedVsChecklist.test.ts | 4 +- .../markdownCommands.test.ts | 6 +- .../markdownCommands.toggleList.test.ts | 6 +- .../markdownCommands.ts | 4 +- .../biDirectionalTextExtension.ts | 0 .../keyUpHandlerExtension.ts | 0 .../markdownDecorationExtension.test.ts} | 4 +- .../markdownDecorationExtension.ts} | 0 .../markdownHighlightExtension.test.ts} | 6 +- .../markdownHighlightExtension.ts} | 10 +-- .../markdownMathExtension.test.ts} | 6 +- .../markdownMathExtension.ts} | 13 ++-- .../overwriteModeExtension.test.ts | 6 +- .../overwriteModeExtension.ts | 0 .../{utils => extensions}/searchExtension.ts | 2 +- .../selectedNoteIdExtension.ts | 0 .../pluginApi/customEditorCompletion.test.ts | 4 +- .../createEditorControl.ts | 0 .../createEditorSettings.ts | 0 .../{testUtil => testing}/createTestEditor.ts | 6 +- .../findNodesWithName.ts | 0 .../{testUtil => testing}/forceFullParse.ts | 0 .../{testUtil => testing}/loadLanguages.ts | 2 +- .../{testUtil => testing}/pressReleaseKey.ts | 0 .../{testUtil => testing}/typeText.ts | 0 packages/editor/CodeMirror/theme.ts | 2 +- .../computeSelectionFormatting.test.ts | 2 +- .../formatting}/computeSelectionFormatting.ts | 2 +- .../codeBlockLanguages/allLanguages.ts | 0 .../codeBlockLanguages/defaultLanguage.ts | 0 .../codeBlockLanguages/lookUpLanguage.ts | 0 .../markdown}/renumberSelectedLists.test.ts | 2 +- .../markdown}/renumberSelectedLists.ts | 0 .../markdown}/stripBlockquote.ts | 0 48 files changed, 137 insertions(+), 138 deletions(-) rename packages/editor/CodeMirror/{markdown => editorCommands}/insertNewlineContinueMarkup.test.ts (95%) rename packages/editor/CodeMirror/{markdown => editorCommands}/insertNewlineContinueMarkup.ts (100%) rename packages/editor/CodeMirror/{markdown => editorCommands}/markdownCommands.bulletedVsChecklist.test.ts (93%) rename packages/editor/CodeMirror/{markdown => editorCommands}/markdownCommands.test.ts (98%) rename packages/editor/CodeMirror/{markdown => editorCommands}/markdownCommands.toggleList.test.ts (98%) rename packages/editor/CodeMirror/{markdown => editorCommands}/markdownCommands.ts (99%) rename packages/editor/CodeMirror/{utils => extensions}/biDirectionalTextExtension.ts (100%) rename packages/editor/CodeMirror/{utils => extensions}/keyUpHandlerExtension.ts (100%) rename packages/editor/CodeMirror/{markdown/decoratorExtension.test.ts => extensions/markdownDecorationExtension.test.ts} (85%) rename packages/editor/CodeMirror/{markdown/decoratorExtension.ts => extensions/markdownDecorationExtension.ts} (100%) rename packages/editor/CodeMirror/{markdown/MarkdownHighlightExtension.test.ts => extensions/markdownHighlightExtension.test.ts} (92%) rename packages/editor/CodeMirror/{markdown/MarkdownHighlightExtension.ts => extensions/markdownHighlightExtension.ts} (86%) rename packages/editor/CodeMirror/{markdown/MarkdownMathExtension.test.ts => extensions/markdownMathExtension.test.ts} (96%) rename packages/editor/CodeMirror/{markdown/MarkdownMathExtension.ts => extensions/markdownMathExtension.ts} (96%) rename packages/editor/CodeMirror/{utils => extensions}/overwriteModeExtension.test.ts (94%) rename packages/editor/CodeMirror/{utils => extensions}/overwriteModeExtension.ts (100%) rename packages/editor/CodeMirror/{utils => extensions}/searchExtension.ts (95%) rename packages/editor/CodeMirror/{utils => extensions}/selectedNoteIdExtension.ts (100%) rename packages/editor/CodeMirror/{testUtil => testing}/createEditorControl.ts (100%) rename packages/editor/CodeMirror/{testUtil => testing}/createEditorSettings.ts (100%) rename packages/editor/CodeMirror/{testUtil => testing}/createTestEditor.ts (90%) rename packages/editor/CodeMirror/{testUtil => testing}/findNodesWithName.ts (100%) rename packages/editor/CodeMirror/{testUtil => testing}/forceFullParse.ts (100%) rename packages/editor/CodeMirror/{testUtil => testing}/loadLanguages.ts (78%) rename packages/editor/CodeMirror/{testUtil => testing}/pressReleaseKey.ts (100%) rename packages/editor/CodeMirror/{testUtil => testing}/typeText.ts (100%) rename packages/editor/CodeMirror/{markdown => utils/formatting}/computeSelectionFormatting.test.ts (91%) rename packages/editor/CodeMirror/{markdown => utils/formatting}/computeSelectionFormatting.ts (98%) rename packages/editor/CodeMirror/{ => utils}/markdown/codeBlockLanguages/allLanguages.ts (100%) rename packages/editor/CodeMirror/{ => utils}/markdown/codeBlockLanguages/defaultLanguage.ts (100%) rename packages/editor/CodeMirror/{ => utils}/markdown/codeBlockLanguages/lookUpLanguage.ts (100%) rename packages/editor/CodeMirror/{markdown/utils => utils/markdown}/renumberSelectedLists.test.ts (98%) rename packages/editor/CodeMirror/{markdown/utils => utils/markdown}/renumberSelectedLists.ts (100%) rename packages/editor/CodeMirror/{markdown/utils => utils/markdown}/stripBlockquote.ts (100%) diff --git a/.eslintignore b/.eslintignore index 3fd892a820..dc1852e214 100644 --- a/.eslintignore +++ b/.eslintignore @@ -962,47 +962,46 @@ packages/editor/CodeMirror/editorCommands/duplicateLine.js packages/editor/CodeMirror/editorCommands/editorCommands.js packages/editor/CodeMirror/editorCommands/insertLineAfter.test.js packages/editor/CodeMirror/editorCommands/insertLineAfter.js +packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.test.js +packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.js packages/editor/CodeMirror/editorCommands/jumpToHash.test.js packages/editor/CodeMirror/editorCommands/jumpToHash.js +packages/editor/CodeMirror/editorCommands/markdownCommands.bulletedVsChecklist.test.js +packages/editor/CodeMirror/editorCommands/markdownCommands.test.js +packages/editor/CodeMirror/editorCommands/markdownCommands.toggleList.test.js +packages/editor/CodeMirror/editorCommands/markdownCommands.js packages/editor/CodeMirror/editorCommands/sortSelectedLines.test.js packages/editor/CodeMirror/editorCommands/sortSelectedLines.js packages/editor/CodeMirror/editorCommands/supportsCommand.js +packages/editor/CodeMirror/extensions/biDirectionalTextExtension.js +packages/editor/CodeMirror/extensions/keyUpHandlerExtension.js +packages/editor/CodeMirror/extensions/markdownDecorationExtension.test.js +packages/editor/CodeMirror/extensions/markdownDecorationExtension.js +packages/editor/CodeMirror/extensions/markdownHighlightExtension.test.js +packages/editor/CodeMirror/extensions/markdownHighlightExtension.js +packages/editor/CodeMirror/extensions/markdownMathExtension.test.js +packages/editor/CodeMirror/extensions/markdownMathExtension.js +packages/editor/CodeMirror/extensions/overwriteModeExtension.test.js +packages/editor/CodeMirror/extensions/overwriteModeExtension.js +packages/editor/CodeMirror/extensions/searchExtension.js +packages/editor/CodeMirror/extensions/selectedNoteIdExtension.js packages/editor/CodeMirror/getScrollFraction.js -packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.test.js -packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.js -packages/editor/CodeMirror/markdown/MarkdownMathExtension.test.js -packages/editor/CodeMirror/markdown/MarkdownMathExtension.js -packages/editor/CodeMirror/markdown/codeBlockLanguages/allLanguages.js -packages/editor/CodeMirror/markdown/codeBlockLanguages/defaultLanguage.js -packages/editor/CodeMirror/markdown/codeBlockLanguages/lookUpLanguage.js -packages/editor/CodeMirror/markdown/computeSelectionFormatting.test.js -packages/editor/CodeMirror/markdown/computeSelectionFormatting.js -packages/editor/CodeMirror/markdown/decoratorExtension.test.js -packages/editor/CodeMirror/markdown/decoratorExtension.js -packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.test.js -packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.js -packages/editor/CodeMirror/markdown/markdownCommands.bulletedVsChecklist.test.js -packages/editor/CodeMirror/markdown/markdownCommands.test.js -packages/editor/CodeMirror/markdown/markdownCommands.toggleList.test.js -packages/editor/CodeMirror/markdown/markdownCommands.js -packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.test.js -packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.js -packages/editor/CodeMirror/markdown/utils/stripBlockquote.js packages/editor/CodeMirror/pluginApi/PluginLoader.js packages/editor/CodeMirror/pluginApi/codeMirrorRequire.js packages/editor/CodeMirror/pluginApi/customEditorCompletion.test.js packages/editor/CodeMirror/pluginApi/customEditorCompletion.js -packages/editor/CodeMirror/testUtil/createEditorControl.js -packages/editor/CodeMirror/testUtil/createEditorSettings.js -packages/editor/CodeMirror/testUtil/createTestEditor.js -packages/editor/CodeMirror/testUtil/findNodesWithName.js -packages/editor/CodeMirror/testUtil/forceFullParse.js -packages/editor/CodeMirror/testUtil/loadLanguages.js -packages/editor/CodeMirror/testUtil/pressReleaseKey.js -packages/editor/CodeMirror/testUtil/typeText.js +packages/editor/CodeMirror/testing/createEditorControl.js +packages/editor/CodeMirror/testing/createEditorSettings.js +packages/editor/CodeMirror/testing/createTestEditor.js +packages/editor/CodeMirror/testing/findNodesWithName.js +packages/editor/CodeMirror/testing/forceFullParse.js +packages/editor/CodeMirror/testing/loadLanguages.js +packages/editor/CodeMirror/testing/pressReleaseKey.js +packages/editor/CodeMirror/testing/typeText.js packages/editor/CodeMirror/theme.js -packages/editor/CodeMirror/utils/biDirectionalTextExtension.js packages/editor/CodeMirror/utils/formatting/RegionSpec.js +packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.test.js +packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.js packages/editor/CodeMirror/utils/formatting/findInlineMatch.test.js packages/editor/CodeMirror/utils/formatting/findInlineMatch.js packages/editor/CodeMirror/utils/formatting/isIndentationEquivalent.js @@ -1021,11 +1020,12 @@ packages/editor/CodeMirror/utils/handleLinkEditRequests.js packages/editor/CodeMirror/utils/handlePasteEvent.js packages/editor/CodeMirror/utils/isCursorAtBeginning.js packages/editor/CodeMirror/utils/isInSyntaxNode.js -packages/editor/CodeMirror/utils/keyUpHandlerExtension.js -packages/editor/CodeMirror/utils/overwriteModeExtension.test.js -packages/editor/CodeMirror/utils/overwriteModeExtension.js -packages/editor/CodeMirror/utils/searchExtension.js -packages/editor/CodeMirror/utils/selectedNoteIdExtension.js +packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/allLanguages.js +packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/defaultLanguage.js +packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/lookUpLanguage.js +packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.test.js +packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.js +packages/editor/CodeMirror/utils/markdown/stripBlockquote.js packages/editor/CodeMirror/utils/setupVim.js packages/editor/SelectionFormatting.js packages/editor/events.js diff --git a/.gitignore b/.gitignore index 05e67b8389..51c26a504b 100644 --- a/.gitignore +++ b/.gitignore @@ -937,47 +937,46 @@ packages/editor/CodeMirror/editorCommands/duplicateLine.js packages/editor/CodeMirror/editorCommands/editorCommands.js packages/editor/CodeMirror/editorCommands/insertLineAfter.test.js packages/editor/CodeMirror/editorCommands/insertLineAfter.js +packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.test.js +packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.js packages/editor/CodeMirror/editorCommands/jumpToHash.test.js packages/editor/CodeMirror/editorCommands/jumpToHash.js +packages/editor/CodeMirror/editorCommands/markdownCommands.bulletedVsChecklist.test.js +packages/editor/CodeMirror/editorCommands/markdownCommands.test.js +packages/editor/CodeMirror/editorCommands/markdownCommands.toggleList.test.js +packages/editor/CodeMirror/editorCommands/markdownCommands.js packages/editor/CodeMirror/editorCommands/sortSelectedLines.test.js packages/editor/CodeMirror/editorCommands/sortSelectedLines.js packages/editor/CodeMirror/editorCommands/supportsCommand.js +packages/editor/CodeMirror/extensions/biDirectionalTextExtension.js +packages/editor/CodeMirror/extensions/keyUpHandlerExtension.js +packages/editor/CodeMirror/extensions/markdownDecorationExtension.test.js +packages/editor/CodeMirror/extensions/markdownDecorationExtension.js +packages/editor/CodeMirror/extensions/markdownHighlightExtension.test.js +packages/editor/CodeMirror/extensions/markdownHighlightExtension.js +packages/editor/CodeMirror/extensions/markdownMathExtension.test.js +packages/editor/CodeMirror/extensions/markdownMathExtension.js +packages/editor/CodeMirror/extensions/overwriteModeExtension.test.js +packages/editor/CodeMirror/extensions/overwriteModeExtension.js +packages/editor/CodeMirror/extensions/searchExtension.js +packages/editor/CodeMirror/extensions/selectedNoteIdExtension.js packages/editor/CodeMirror/getScrollFraction.js -packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.test.js -packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.js -packages/editor/CodeMirror/markdown/MarkdownMathExtension.test.js -packages/editor/CodeMirror/markdown/MarkdownMathExtension.js -packages/editor/CodeMirror/markdown/codeBlockLanguages/allLanguages.js -packages/editor/CodeMirror/markdown/codeBlockLanguages/defaultLanguage.js -packages/editor/CodeMirror/markdown/codeBlockLanguages/lookUpLanguage.js -packages/editor/CodeMirror/markdown/computeSelectionFormatting.test.js -packages/editor/CodeMirror/markdown/computeSelectionFormatting.js -packages/editor/CodeMirror/markdown/decoratorExtension.test.js -packages/editor/CodeMirror/markdown/decoratorExtension.js -packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.test.js -packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.js -packages/editor/CodeMirror/markdown/markdownCommands.bulletedVsChecklist.test.js -packages/editor/CodeMirror/markdown/markdownCommands.test.js -packages/editor/CodeMirror/markdown/markdownCommands.toggleList.test.js -packages/editor/CodeMirror/markdown/markdownCommands.js -packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.test.js -packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.js -packages/editor/CodeMirror/markdown/utils/stripBlockquote.js packages/editor/CodeMirror/pluginApi/PluginLoader.js packages/editor/CodeMirror/pluginApi/codeMirrorRequire.js packages/editor/CodeMirror/pluginApi/customEditorCompletion.test.js packages/editor/CodeMirror/pluginApi/customEditorCompletion.js -packages/editor/CodeMirror/testUtil/createEditorControl.js -packages/editor/CodeMirror/testUtil/createEditorSettings.js -packages/editor/CodeMirror/testUtil/createTestEditor.js -packages/editor/CodeMirror/testUtil/findNodesWithName.js -packages/editor/CodeMirror/testUtil/forceFullParse.js -packages/editor/CodeMirror/testUtil/loadLanguages.js -packages/editor/CodeMirror/testUtil/pressReleaseKey.js -packages/editor/CodeMirror/testUtil/typeText.js +packages/editor/CodeMirror/testing/createEditorControl.js +packages/editor/CodeMirror/testing/createEditorSettings.js +packages/editor/CodeMirror/testing/createTestEditor.js +packages/editor/CodeMirror/testing/findNodesWithName.js +packages/editor/CodeMirror/testing/forceFullParse.js +packages/editor/CodeMirror/testing/loadLanguages.js +packages/editor/CodeMirror/testing/pressReleaseKey.js +packages/editor/CodeMirror/testing/typeText.js packages/editor/CodeMirror/theme.js -packages/editor/CodeMirror/utils/biDirectionalTextExtension.js packages/editor/CodeMirror/utils/formatting/RegionSpec.js +packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.test.js +packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.js packages/editor/CodeMirror/utils/formatting/findInlineMatch.test.js packages/editor/CodeMirror/utils/formatting/findInlineMatch.js packages/editor/CodeMirror/utils/formatting/isIndentationEquivalent.js @@ -996,11 +995,12 @@ packages/editor/CodeMirror/utils/handleLinkEditRequests.js packages/editor/CodeMirror/utils/handlePasteEvent.js packages/editor/CodeMirror/utils/isCursorAtBeginning.js packages/editor/CodeMirror/utils/isInSyntaxNode.js -packages/editor/CodeMirror/utils/keyUpHandlerExtension.js -packages/editor/CodeMirror/utils/overwriteModeExtension.test.js -packages/editor/CodeMirror/utils/overwriteModeExtension.js -packages/editor/CodeMirror/utils/searchExtension.js -packages/editor/CodeMirror/utils/selectedNoteIdExtension.js +packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/allLanguages.js +packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/defaultLanguage.js +packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/lookUpLanguage.js +packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.test.js +packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.js +packages/editor/CodeMirror/utils/markdown/stripBlockquote.js packages/editor/CodeMirror/utils/setupVim.js packages/editor/SelectionFormatting.js packages/editor/events.js diff --git a/packages/app-mobile/components/NoteEditor/hooks/useEditorCommandHandler.test.ts b/packages/app-mobile/components/NoteEditor/hooks/useEditorCommandHandler.test.ts index 7d1b4d34ee..83b5fa8010 100644 --- a/packages/app-mobile/components/NoteEditor/hooks/useEditorCommandHandler.test.ts +++ b/packages/app-mobile/components/NoteEditor/hooks/useEditorCommandHandler.test.ts @@ -3,7 +3,7 @@ import CommandService from '@joplin/lib/services/CommandService'; import useEditorCommandHandler from './useEditorCommandHandler'; import commandDeclarations from '../commandDeclarations'; -import createTestEditorControl from '@joplin/editor/CodeMirror/testUtil/createEditorControl'; +import createTestEditorControl from '@joplin/editor/CodeMirror/testing/createEditorControl'; import { renderHook } from '../../../utils/testing/testingLibrary'; import { defaultState } from '@joplin/lib/reducer'; diff --git a/packages/editor/CodeMirror/CodeMirrorControl.test.ts b/packages/editor/CodeMirror/CodeMirrorControl.test.ts index 3ff853b48b..2068a051a3 100644 --- a/packages/editor/CodeMirror/CodeMirrorControl.test.ts +++ b/packages/editor/CodeMirror/CodeMirrorControl.test.ts @@ -1,7 +1,7 @@ import { ViewPlugin } from '@codemirror/view'; -import createEditorControl from './testUtil/createEditorControl'; +import createEditorControl from './testing/createEditorControl'; import { EditorCommandType } from '../types'; -import pressReleaseKey from './testUtil/pressReleaseKey'; +import pressReleaseKey from './testing/pressReleaseKey'; import { EditorSelection, EditorState } from '@codemirror/state'; describe('CodeMirrorControl', () => { diff --git a/packages/editor/CodeMirror/CodeMirrorControl.ts b/packages/editor/CodeMirror/CodeMirrorControl.ts index c8edcf8413..ac256b97da 100644 --- a/packages/editor/CodeMirror/CodeMirrorControl.ts +++ b/packages/editor/CodeMirror/CodeMirrorControl.ts @@ -3,7 +3,7 @@ import { EditorCommandType, EditorControl, EditorSettings, LogMessageCallback, C import CodeMirror5Emulation from './CodeMirror5Emulation/CodeMirror5Emulation'; import editorCommands from './editorCommands/editorCommands'; import { Compartment, EditorSelection, Extension, StateEffect } from '@codemirror/state'; -import { updateLink } from './markdown/markdownCommands'; +import { updateLink } from './editorCommands/markdownCommands'; import { searchPanelOpen, SearchQuery, setSearchQuery } from '@codemirror/search'; import PluginLoader from './pluginApi/PluginLoader'; import customEditorCompletion, { editorCompletionSource, enableLanguageDataAutocomplete } from './pluginApi/customEditorCompletion'; @@ -11,7 +11,7 @@ import { CompletionSource } from '@codemirror/autocomplete'; import { RegionSpec } from './utils/formatting/RegionSpec'; import toggleInlineSelectionFormat from './utils/formatting/toggleInlineSelectionFormat'; import getSearchState from './utils/getSearchState'; -import { noteIdFacet, setNoteIdEffect } from './utils/selectedNoteIdExtension'; +import { noteIdFacet, setNoteIdEffect } from './extensions/selectedNoteIdExtension'; import jumpToHash from './editorCommands/jumpToHash'; interface Callbacks { diff --git a/packages/editor/CodeMirror/configFromSettings.ts b/packages/editor/CodeMirror/configFromSettings.ts index 4f3e401069..4b8013be2a 100644 --- a/packages/editor/CodeMirror/configFromSettings.ts +++ b/packages/editor/CodeMirror/configFromSettings.ts @@ -5,15 +5,15 @@ import createTheme from './theme'; import { EditorState } from '@codemirror/state'; import { deleteMarkupBackward, markdown, markdownLanguage } from '@codemirror/lang-markdown'; import { GFM as GitHubFlavoredMarkdownExtension } from '@lezer/markdown'; -import MarkdownMathExtension from './markdown/MarkdownMathExtension'; -import MarkdownHighlightExtension from './markdown/MarkdownHighlightExtension'; -import lookUpLanguage from './markdown/codeBlockLanguages/lookUpLanguage'; +import markdownMathExtension from './extensions/markdownMathExtension'; +import markdownHighlightExtension from './extensions/markdownHighlightExtension'; +import lookUpLanguage from './utils/markdown/codeBlockLanguages/lookUpLanguage'; import { html } from '@codemirror/lang-html'; import { defaultKeymap, emacsStyleKeymap } from '@codemirror/commands'; import { vim } from '@replit/codemirror-vim'; import { indentUnit } from '@codemirror/language'; import { Prec } from '@codemirror/state'; -import insertNewlineContinueMarkup from './markdown/insertNewlineContinueMarkup'; +import insertNewlineContinueMarkup from './editorCommands/insertNewlineContinueMarkup'; const configFromSettings = (settings: EditorSettings) => { const languageExtension = (() => { @@ -26,10 +26,10 @@ const configFromSettings = (settings: EditorSettings) => { extensions: [ GitHubFlavoredMarkdownExtension, - settings.markdownMarkEnabled ? MarkdownHighlightExtension : [], + settings.markdownMarkEnabled ? markdownHighlightExtension : [], // Don't highlight KaTeX if the user disabled it - settings.katexEnabled ? MarkdownMathExtension : [], + settings.katexEnabled ? markdownMathExtension : [], ], codeLanguages: lookUpLanguage, diff --git a/packages/editor/CodeMirror/createEditor.test.ts b/packages/editor/CodeMirror/createEditor.test.ts index 6ca1bedb8c..b9a2fa9b3c 100644 --- a/packages/editor/CodeMirror/createEditor.test.ts +++ b/packages/editor/CodeMirror/createEditor.test.ts @@ -5,10 +5,10 @@ import createEditor from './createEditor'; import Setting from '@joplin/lib/models/Setting'; import { forceParsing } from '@codemirror/language'; -import loadLanguages from './testUtil/loadLanguages'; +import loadLanguages from './testing/loadLanguages'; import { expect, describe, it } from '@jest/globals'; -import createEditorSettings from './testUtil/createEditorSettings'; +import createEditorSettings from './testing/createEditorSettings'; describe('createEditor', () => { diff --git a/packages/editor/CodeMirror/createEditor.ts b/packages/editor/CodeMirror/createEditor.ts index 411ff4abcb..a2222b4a7d 100644 --- a/packages/editor/CodeMirror/createEditor.ts +++ b/packages/editor/CodeMirror/createEditor.ts @@ -21,21 +21,21 @@ import { insertOrIncreaseIndent, toggleBolded, toggleCode, toggleItalicized, toggleMath, -} from './markdown/markdownCommands'; -import decoratorExtension from './markdown/decoratorExtension'; -import computeSelectionFormatting from './markdown/computeSelectionFormatting'; +} from './editorCommands/markdownCommands'; +import decoratorExtension from './extensions/markdownDecorationExtension'; +import computeSelectionFormatting from './utils/formatting/computeSelectionFormatting'; import { selectionFormattingEqual } from '../SelectionFormatting'; import configFromSettings from './configFromSettings'; import getScrollFraction from './getScrollFraction'; import CodeMirrorControl from './CodeMirrorControl'; import insertLineAfter from './editorCommands/insertLineAfter'; import handlePasteEvent from './utils/handlePasteEvent'; -import biDirectionalTextExtension from './utils/biDirectionalTextExtension'; -import searchExtension from './utils/searchExtension'; +import biDirectionalTextExtension from './extensions/biDirectionalTextExtension'; +import searchExtension from './extensions/searchExtension'; import isCursorAtBeginning from './utils/isCursorAtBeginning'; -import overwriteModeExtension from './utils/overwriteModeExtension'; +import overwriteModeExtension from './extensions/overwriteModeExtension'; import handleLinkEditRequests, { showLinkEditor } from './utils/handleLinkEditRequests'; -import selectedNoteIdExtension, { setNoteIdEffect } from './utils/selectedNoteIdExtension'; +import selectedNoteIdExtension, { setNoteIdEffect } from './extensions/selectedNoteIdExtension'; // Newer versions of CodeMirror by default use Chrome's EditContext API. // While this might be stable enough for desktop use, it causes significant diff --git a/packages/editor/CodeMirror/editorCommands/editorCommands.ts b/packages/editor/CodeMirror/editorCommands/editorCommands.ts index 5fd597bcf0..0c22506aa1 100644 --- a/packages/editor/CodeMirror/editorCommands/editorCommands.ts +++ b/packages/editor/CodeMirror/editorCommands/editorCommands.ts @@ -7,7 +7,7 @@ import { toggleBolded, toggleCode, toggleHeaderLevel, toggleItalicized, toggleList, toggleMath, -} from '../markdown/markdownCommands'; +} from './markdownCommands'; import duplicateLine from './duplicateLine'; import sortSelectedLines from './sortSelectedLines'; import { closeSearchPanel, findNext, findPrevious, openSearchPanel, replaceAll, replaceNext, searchPanelOpen } from '@codemirror/search'; diff --git a/packages/editor/CodeMirror/editorCommands/insertLineAfter.test.ts b/packages/editor/CodeMirror/editorCommands/insertLineAfter.test.ts index 02bf29faf5..3420b5e2ad 100644 --- a/packages/editor/CodeMirror/editorCommands/insertLineAfter.test.ts +++ b/packages/editor/CodeMirror/editorCommands/insertLineAfter.test.ts @@ -1,5 +1,5 @@ import { EditorSelection } from '@codemirror/state'; -import createTestEditor from '../testUtil/createTestEditor'; +import createTestEditor from '../testing/createTestEditor'; import insertLineAfter from './insertLineAfter'; describe('insertLineAfter', () => { diff --git a/packages/editor/CodeMirror/editorCommands/insertLineAfter.ts b/packages/editor/CodeMirror/editorCommands/insertLineAfter.ts index a1c3fe5fa3..db41b0ecf9 100644 --- a/packages/editor/CodeMirror/editorCommands/insertLineAfter.ts +++ b/packages/editor/CodeMirror/editorCommands/insertLineAfter.ts @@ -1,7 +1,7 @@ import { insertNewlineAndIndent } from '@codemirror/commands'; import { EditorSelection, SelectionRange } from '@codemirror/state'; import { EditorView } from '@codemirror/view'; -import insertNewlineContinueMarkup from '../markdown/insertNewlineContinueMarkup'; +import insertNewlineContinueMarkup from './insertNewlineContinueMarkup'; const insertLineAfter = (view: EditorView) => { const state = view.state; diff --git a/packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.test.ts b/packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.test.ts similarity index 95% rename from packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.test.ts rename to packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.test.ts index 6340b5665f..59eb1fd1d5 100644 --- a/packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.test.ts +++ b/packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.test.ts @@ -1,6 +1,6 @@ import { EditorSelection } from '@codemirror/state'; -import createTestEditor from '../testUtil/createTestEditor'; -import pressReleaseKey from '../testUtil/pressReleaseKey'; +import createTestEditor from '../testing/createTestEditor'; +import pressReleaseKey from '../testing/pressReleaseKey'; import { keymap } from '@codemirror/view'; import insertNewlineContinueMarkup from './insertNewlineContinueMarkup'; diff --git a/packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.ts b/packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.ts similarity index 100% rename from packages/editor/CodeMirror/markdown/insertNewlineContinueMarkup.ts rename to packages/editor/CodeMirror/editorCommands/insertNewlineContinueMarkup.ts diff --git a/packages/editor/CodeMirror/editorCommands/jumpToHash.test.ts b/packages/editor/CodeMirror/editorCommands/jumpToHash.test.ts index 708b15f959..1e735a7e1a 100644 --- a/packages/editor/CodeMirror/editorCommands/jumpToHash.test.ts +++ b/packages/editor/CodeMirror/editorCommands/jumpToHash.test.ts @@ -1,5 +1,5 @@ import { EditorSelection } from '@codemirror/state'; -import createTestEditor from '../testUtil/createTestEditor'; +import createTestEditor from '../testing/createTestEditor'; import jumpToHash from './jumpToHash'; describe('jumpToHash', () => { diff --git a/packages/editor/CodeMirror/markdown/markdownCommands.bulletedVsChecklist.test.ts b/packages/editor/CodeMirror/editorCommands/markdownCommands.bulletedVsChecklist.test.ts similarity index 93% rename from packages/editor/CodeMirror/markdown/markdownCommands.bulletedVsChecklist.test.ts rename to packages/editor/CodeMirror/editorCommands/markdownCommands.bulletedVsChecklist.test.ts index 98d4544a10..c00d27afdc 100644 --- a/packages/editor/CodeMirror/markdown/markdownCommands.bulletedVsChecklist.test.ts +++ b/packages/editor/CodeMirror/editorCommands/markdownCommands.bulletedVsChecklist.test.ts @@ -1,7 +1,7 @@ import { EditorSelection } from '@codemirror/state'; import { ListType } from '../../types'; -import createTestEditor from '../testUtil/createTestEditor'; -import { toggleList } from './markdownCommands'; +import createTestEditor from '../testing/createTestEditor'; +import { toggleList } from '../editorCommands/markdownCommands'; describe('markdownCommands.bulletedVsChecklist', () => { diff --git a/packages/editor/CodeMirror/markdown/markdownCommands.test.ts b/packages/editor/CodeMirror/editorCommands/markdownCommands.test.ts similarity index 98% rename from packages/editor/CodeMirror/markdown/markdownCommands.test.ts rename to packages/editor/CodeMirror/editorCommands/markdownCommands.test.ts index b7e8050e8e..fae6c0b874 100644 --- a/packages/editor/CodeMirror/markdown/markdownCommands.test.ts +++ b/packages/editor/CodeMirror/editorCommands/markdownCommands.test.ts @@ -3,9 +3,9 @@ import { insertHorizontalRule, insertOrIncreaseIndent, toggleBolded, toggleCode, toggleHeaderLevel, toggleItalicized, toggleMath, updateLink, -} from './markdownCommands'; -import createTestEditor from '../testUtil/createTestEditor'; -import { blockMathTagName } from './MarkdownMathExtension'; +} from '../editorCommands/markdownCommands'; +import createTestEditor from '../testing/createTestEditor'; +import { blockMathTagName } from '../extensions/markdownMathExtension'; describe('markdownCommands', () => { diff --git a/packages/editor/CodeMirror/markdown/markdownCommands.toggleList.test.ts b/packages/editor/CodeMirror/editorCommands/markdownCommands.toggleList.test.ts similarity index 98% rename from packages/editor/CodeMirror/markdown/markdownCommands.toggleList.test.ts rename to packages/editor/CodeMirror/editorCommands/markdownCommands.toggleList.test.ts index d8bfc6bbde..8c7f8e0681 100644 --- a/packages/editor/CodeMirror/markdown/markdownCommands.toggleList.test.ts +++ b/packages/editor/CodeMirror/editorCommands/markdownCommands.toggleList.test.ts @@ -1,9 +1,7 @@ import { EditorSelection, EditorState } from '@codemirror/state'; -import { - increaseIndent, toggleList, -} from './markdownCommands'; +import { increaseIndent, toggleList } from '../editorCommands/markdownCommands'; import { ListType } from '../../types'; -import createTestEditor from '../testUtil/createTestEditor'; +import createTestEditor from '../testing/createTestEditor'; describe('markdownCommands.toggleList', () => { diff --git a/packages/editor/CodeMirror/markdown/markdownCommands.ts b/packages/editor/CodeMirror/editorCommands/markdownCommands.ts similarity index 99% rename from packages/editor/CodeMirror/markdown/markdownCommands.ts rename to packages/editor/CodeMirror/editorCommands/markdownCommands.ts index f0faef609f..49ec3c003d 100644 --- a/packages/editor/CodeMirror/markdown/markdownCommands.ts +++ b/packages/editor/CodeMirror/editorCommands/markdownCommands.ts @@ -11,8 +11,8 @@ import intersectsSyntaxNode from '../utils/isInSyntaxNode'; import toggleRegionFormatGlobally from '../utils/formatting/toggleRegionFormatGlobally'; import { RegionSpec } from '../utils/formatting/RegionSpec'; import toggleInlineFormatGlobally from '../utils/formatting/toggleInlineFormatGlobally'; -import stripBlockquote from './utils/stripBlockquote'; -import renumberSelectedLists from './utils/renumberSelectedLists'; +import stripBlockquote from '../utils/markdown/stripBlockquote'; +import renumberSelectedLists from '../utils/markdown/renumberSelectedLists'; import toggleSelectedLinesStartWith from '../utils/formatting/toggleSelectedLinesStartWith'; diff --git a/packages/editor/CodeMirror/utils/biDirectionalTextExtension.ts b/packages/editor/CodeMirror/extensions/biDirectionalTextExtension.ts similarity index 100% rename from packages/editor/CodeMirror/utils/biDirectionalTextExtension.ts rename to packages/editor/CodeMirror/extensions/biDirectionalTextExtension.ts diff --git a/packages/editor/CodeMirror/utils/keyUpHandlerExtension.ts b/packages/editor/CodeMirror/extensions/keyUpHandlerExtension.ts similarity index 100% rename from packages/editor/CodeMirror/utils/keyUpHandlerExtension.ts rename to packages/editor/CodeMirror/extensions/keyUpHandlerExtension.ts diff --git a/packages/editor/CodeMirror/markdown/decoratorExtension.test.ts b/packages/editor/CodeMirror/extensions/markdownDecorationExtension.test.ts similarity index 85% rename from packages/editor/CodeMirror/markdown/decoratorExtension.test.ts rename to packages/editor/CodeMirror/extensions/markdownDecorationExtension.test.ts index 754292074a..93f46e6885 100644 --- a/packages/editor/CodeMirror/markdown/decoratorExtension.test.ts +++ b/packages/editor/CodeMirror/extensions/markdownDecorationExtension.test.ts @@ -1,6 +1,6 @@ import { EditorSelection } from '@codemirror/state'; -import createTestEditor from '../testUtil/createTestEditor'; -import decoratorExtension from './decoratorExtension'; +import createTestEditor from '../testing/createTestEditor'; +import decoratorExtension from './markdownDecorationExtension'; jest.retryTimes(2); diff --git a/packages/editor/CodeMirror/markdown/decoratorExtension.ts b/packages/editor/CodeMirror/extensions/markdownDecorationExtension.ts similarity index 100% rename from packages/editor/CodeMirror/markdown/decoratorExtension.ts rename to packages/editor/CodeMirror/extensions/markdownDecorationExtension.ts diff --git a/packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.test.ts b/packages/editor/CodeMirror/extensions/markdownHighlightExtension.test.ts similarity index 92% rename from packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.test.ts rename to packages/editor/CodeMirror/extensions/markdownHighlightExtension.test.ts index 8968aecbd7..80c345ab3e 100644 --- a/packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.test.ts +++ b/packages/editor/CodeMirror/extensions/markdownHighlightExtension.test.ts @@ -1,8 +1,8 @@ import { EditorSelection, EditorState } from '@codemirror/state'; -import createTestEditor from '../testUtil/createTestEditor'; -import findNodesWithName from '../testUtil/findNodesWithName'; -import { highlightMarkerTagName, highlightTagName } from './MarkdownHighlightExtension'; +import createTestEditor from '../testing/createTestEditor'; +import findNodesWithName from '../testing/findNodesWithName'; +import { highlightMarkerTagName, highlightTagName } from './markdownHighlightExtension'; const createEditorState = async (initialText: string, expectedTags: string[]): Promise => { return (await createTestEditor(initialText, EditorSelection.cursor(0), expectedTags)).state; diff --git a/packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.ts b/packages/editor/CodeMirror/extensions/markdownHighlightExtension.ts similarity index 86% rename from packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.ts rename to packages/editor/CodeMirror/extensions/markdownHighlightExtension.ts index 30506fd3e4..69979a6b7f 100644 --- a/packages/editor/CodeMirror/markdown/MarkdownHighlightExtension.ts +++ b/packages/editor/CodeMirror/extensions/markdownHighlightExtension.ts @@ -1,5 +1,5 @@ import { tags, Tag } from '@lezer/highlight'; -import { MarkdownConfig, InlineContext } from '@lezer/markdown'; +import { MarkdownConfig, InlineContext, MarkdownExtension } from '@lezer/markdown'; const equalsSignCharcode = 61; @@ -16,7 +16,7 @@ const isSpaceOrEmpty = (text: string) => text.match(/^\s*$/); // Markdown extension for recognizing highlighting. This is similar to the upstream // extension for strikethrough: // https://github.com/lezer-parser/markdown/blob/d6f0aa095722329a0188b9c7afe207dab4835e55/src/extension.ts#L10 -const HighlightConfig: MarkdownConfig = { +const highlightConfig: MarkdownConfig = { defineNodes: [ { name: highlightTagName, @@ -59,7 +59,7 @@ const HighlightConfig: MarkdownConfig = { }], }; -const MarkdownHighlightExtension: MarkdownConfig[] = [ - HighlightConfig, +const markdownHighlightExtension: MarkdownExtension = [ + highlightConfig, ]; -export default MarkdownHighlightExtension; +export default markdownHighlightExtension; diff --git a/packages/editor/CodeMirror/markdown/MarkdownMathExtension.test.ts b/packages/editor/CodeMirror/extensions/markdownMathExtension.test.ts similarity index 96% rename from packages/editor/CodeMirror/markdown/MarkdownMathExtension.test.ts rename to packages/editor/CodeMirror/extensions/markdownMathExtension.test.ts index 7e37a1ac03..511872138b 100644 --- a/packages/editor/CodeMirror/markdown/MarkdownMathExtension.test.ts +++ b/packages/editor/CodeMirror/extensions/markdownMathExtension.test.ts @@ -1,8 +1,8 @@ import { EditorSelection, EditorState } from '@codemirror/state'; -import { blockMathTagName, inlineMathContentTagName, inlineMathTagName } from './MarkdownMathExtension'; +import { blockMathTagName, inlineMathContentTagName, inlineMathTagName } from './markdownMathExtension'; -import createTestEditor from '../testUtil/createTestEditor'; -import findNodesWithName from '../testUtil/findNodesWithName'; +import createTestEditor from '../testing/createTestEditor'; +import findNodesWithName from '../testing/findNodesWithName'; // Creates an EditorState with math and markdown extensions const createEditorState = async (initialText: string, expectedTags: string[]): Promise => { diff --git a/packages/editor/CodeMirror/markdown/MarkdownMathExtension.ts b/packages/editor/CodeMirror/extensions/markdownMathExtension.ts similarity index 96% rename from packages/editor/CodeMirror/markdown/MarkdownMathExtension.ts rename to packages/editor/CodeMirror/extensions/markdownMathExtension.ts index 1d082cdf9b..1a6d24e257 100644 --- a/packages/editor/CodeMirror/markdown/MarkdownMathExtension.ts +++ b/packages/editor/CodeMirror/extensions/markdownMathExtension.ts @@ -10,6 +10,7 @@ import { parseMixed, SyntaxNodeRef, Input, NestedParse, ParseWrapper } from '@le import { MarkdownConfig, InlineContext, BlockContext, Line, LeafBlock, + MarkdownExtension, } from '@lezer/markdown'; // The existing stexMath parser is used to parse the text between the $s @@ -50,7 +51,7 @@ const wrappedTeXParser = (nodeTag: string): ParseWrapper => { }; // Markdown extension for recognizing inline code -const InlineMathConfig: MarkdownConfig = { +const inlineMathConfig: MarkdownConfig = { defineNodes: [ { name: inlineMathTagName, @@ -120,7 +121,7 @@ const InlineMathConfig: MarkdownConfig = { }; // Extension for recognising block code -const BlockMathConfig: MarkdownConfig = { +const blockMathConfig: MarkdownConfig = { defineNodes: [ { name: blockMathTagName, @@ -206,9 +207,9 @@ const BlockMathConfig: MarkdownConfig = { }; // Markdown configuration for block and inline math support. -const MarkdownMathExtension: MarkdownConfig[] = [ - InlineMathConfig, - BlockMathConfig, +const markdownMathExtension: MarkdownExtension = [ + inlineMathConfig, + blockMathConfig, ]; -export default MarkdownMathExtension; +export default markdownMathExtension; diff --git a/packages/editor/CodeMirror/utils/overwriteModeExtension.test.ts b/packages/editor/CodeMirror/extensions/overwriteModeExtension.test.ts similarity index 94% rename from packages/editor/CodeMirror/utils/overwriteModeExtension.test.ts rename to packages/editor/CodeMirror/extensions/overwriteModeExtension.test.ts index 3c0819143b..b1be3676aa 100644 --- a/packages/editor/CodeMirror/utils/overwriteModeExtension.test.ts +++ b/packages/editor/CodeMirror/extensions/overwriteModeExtension.test.ts @@ -1,8 +1,8 @@ import { EditorSelection } from '@codemirror/state'; -import createTestEditor from '../testUtil/createTestEditor'; +import createTestEditor from '../testing/createTestEditor'; import overwriteModeExtension, { overwriteModeEnabled, toggleOverwrite } from './overwriteModeExtension'; -import typeText from '../testUtil/typeText'; -import pressReleaseKey from '../testUtil/pressReleaseKey'; +import typeText from '../testing/typeText'; +import pressReleaseKey from '../testing/pressReleaseKey'; const createEditor = async (initialText: string, defaultEnabled = false) => { const editor = await createTestEditor(initialText, EditorSelection.cursor(0), [], [ diff --git a/packages/editor/CodeMirror/utils/overwriteModeExtension.ts b/packages/editor/CodeMirror/extensions/overwriteModeExtension.ts similarity index 100% rename from packages/editor/CodeMirror/utils/overwriteModeExtension.ts rename to packages/editor/CodeMirror/extensions/overwriteModeExtension.ts diff --git a/packages/editor/CodeMirror/utils/searchExtension.ts b/packages/editor/CodeMirror/extensions/searchExtension.ts similarity index 95% rename from packages/editor/CodeMirror/utils/searchExtension.ts rename to packages/editor/CodeMirror/extensions/searchExtension.ts index 1804e74c8a..27b73b8e64 100644 --- a/packages/editor/CodeMirror/utils/searchExtension.ts +++ b/packages/editor/CodeMirror/extensions/searchExtension.ts @@ -1,7 +1,7 @@ import { EditorState, Extension } from '@codemirror/state'; import { EditorView } from '@codemirror/view'; import { EditorSettings, OnEventCallback } from '../../types'; -import getSearchState from './getSearchState'; +import getSearchState from '../utils/getSearchState'; import { EditorEventType } from '../../events'; import { search, searchPanelOpen, setSearchQuery } from '@codemirror/search'; diff --git a/packages/editor/CodeMirror/utils/selectedNoteIdExtension.ts b/packages/editor/CodeMirror/extensions/selectedNoteIdExtension.ts similarity index 100% rename from packages/editor/CodeMirror/utils/selectedNoteIdExtension.ts rename to packages/editor/CodeMirror/extensions/selectedNoteIdExtension.ts diff --git a/packages/editor/CodeMirror/pluginApi/customEditorCompletion.test.ts b/packages/editor/CodeMirror/pluginApi/customEditorCompletion.test.ts index ec2e15248d..e68e8bb56c 100644 --- a/packages/editor/CodeMirror/pluginApi/customEditorCompletion.test.ts +++ b/packages/editor/CodeMirror/pluginApi/customEditorCompletion.test.ts @@ -1,8 +1,8 @@ import { EditorState, StateEffect } from '@codemirror/state'; -import createEditorControl from '../testUtil/createEditorControl'; +import createEditorControl from '../testing/createEditorControl'; import { EditorView } from '@codemirror/view'; import { completeFromList, completionStatus, currentCompletions } from '@codemirror/autocomplete'; -import typeText from '../testUtil/typeText'; +import typeText from '../testing/typeText'; const waitForShownCompletionsToContain = (editor: EditorView, completionLabels: string[]) => { return new Promise(resolve => { diff --git a/packages/editor/CodeMirror/testUtil/createEditorControl.ts b/packages/editor/CodeMirror/testing/createEditorControl.ts similarity index 100% rename from packages/editor/CodeMirror/testUtil/createEditorControl.ts rename to packages/editor/CodeMirror/testing/createEditorControl.ts diff --git a/packages/editor/CodeMirror/testUtil/createEditorSettings.ts b/packages/editor/CodeMirror/testing/createEditorSettings.ts similarity index 100% rename from packages/editor/CodeMirror/testUtil/createEditorSettings.ts rename to packages/editor/CodeMirror/testing/createEditorSettings.ts diff --git a/packages/editor/CodeMirror/testUtil/createTestEditor.ts b/packages/editor/CodeMirror/testing/createTestEditor.ts similarity index 90% rename from packages/editor/CodeMirror/testUtil/createTestEditor.ts rename to packages/editor/CodeMirror/testing/createTestEditor.ts index d5ea3bb7b1..0e6712df04 100644 --- a/packages/editor/CodeMirror/testUtil/createTestEditor.ts +++ b/packages/editor/CodeMirror/testing/createTestEditor.ts @@ -3,10 +3,10 @@ import { GFM as GithubFlavoredMarkdownExt } from '@lezer/markdown'; import { indentUnit, syntaxTree } from '@codemirror/language'; import { SelectionRange, EditorSelection, EditorState, Extension } from '@codemirror/state'; import { EditorView } from '@codemirror/view'; -import MarkdownMathExtension from '../markdown/MarkdownMathExtension'; import forceFullParse from './forceFullParse'; import loadLanguages from './loadLanguages'; -import MarkdownHighlightExtension from '../markdown/MarkdownHighlightExtension'; +import markdownMathExtension from '../extensions/markdownMathExtension'; +import markdownHighlightExtension from '../extensions/markdownHighlightExtension'; // Creates and returns a minimal editor with markdown extensions. Waits to return the editor // until all syntax tree tags in `expectedSyntaxTreeTags` exist. @@ -26,7 +26,7 @@ const createTestEditor = async ( selection: EditorSelection.create(initialSelection), extensions: [ markdown({ - extensions: [MarkdownMathExtension, MarkdownHighlightExtension, GithubFlavoredMarkdownExt], + extensions: [markdownMathExtension, markdownHighlightExtension, GithubFlavoredMarkdownExt], addKeymap: addMarkdownKeymap, }), indentUnit.of('\t'), diff --git a/packages/editor/CodeMirror/testUtil/findNodesWithName.ts b/packages/editor/CodeMirror/testing/findNodesWithName.ts similarity index 100% rename from packages/editor/CodeMirror/testUtil/findNodesWithName.ts rename to packages/editor/CodeMirror/testing/findNodesWithName.ts diff --git a/packages/editor/CodeMirror/testUtil/forceFullParse.ts b/packages/editor/CodeMirror/testing/forceFullParse.ts similarity index 100% rename from packages/editor/CodeMirror/testUtil/forceFullParse.ts rename to packages/editor/CodeMirror/testing/forceFullParse.ts diff --git a/packages/editor/CodeMirror/testUtil/loadLanguages.ts b/packages/editor/CodeMirror/testing/loadLanguages.ts similarity index 78% rename from packages/editor/CodeMirror/testUtil/loadLanguages.ts rename to packages/editor/CodeMirror/testing/loadLanguages.ts index 8e82fdad61..2c5626488d 100644 --- a/packages/editor/CodeMirror/testUtil/loadLanguages.ts +++ b/packages/editor/CodeMirror/testing/loadLanguages.ts @@ -1,4 +1,4 @@ -import allLanguages from '../markdown/codeBlockLanguages/allLanguages'; +import allLanguages from '../utils/markdown/codeBlockLanguages/allLanguages'; // Ensure languages we use are loaded. Without this, tests may randomly fail (LanguageDescriptions // are loaded asynchronously, in the background). diff --git a/packages/editor/CodeMirror/testUtil/pressReleaseKey.ts b/packages/editor/CodeMirror/testing/pressReleaseKey.ts similarity index 100% rename from packages/editor/CodeMirror/testUtil/pressReleaseKey.ts rename to packages/editor/CodeMirror/testing/pressReleaseKey.ts diff --git a/packages/editor/CodeMirror/testUtil/typeText.ts b/packages/editor/CodeMirror/testing/typeText.ts similarity index 100% rename from packages/editor/CodeMirror/testUtil/typeText.ts rename to packages/editor/CodeMirror/testing/typeText.ts diff --git a/packages/editor/CodeMirror/theme.ts b/packages/editor/CodeMirror/theme.ts index 90a1cdb311..edd959116b 100644 --- a/packages/editor/CodeMirror/theme.ts +++ b/packages/editor/CodeMirror/theme.ts @@ -8,7 +8,7 @@ import { tags } from '@lezer/highlight'; import { EditorView } from '@codemirror/view'; import { Extension } from '@codemirror/state'; -import { inlineMathTag, mathTag } from './markdown/MarkdownMathExtension'; +import { inlineMathTag, mathTag } from './extensions/markdownMathExtension'; import { EditorTheme } from '../types'; // For an example on how to customize the theme, see: diff --git a/packages/editor/CodeMirror/markdown/computeSelectionFormatting.test.ts b/packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.test.ts similarity index 91% rename from packages/editor/CodeMirror/markdown/computeSelectionFormatting.test.ts rename to packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.test.ts index 09c6c332b3..51dc86c141 100644 --- a/packages/editor/CodeMirror/markdown/computeSelectionFormatting.test.ts +++ b/packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.test.ts @@ -1,5 +1,5 @@ import { EditorSelection } from '@codemirror/state'; -import createTestEditor from '../testUtil/createTestEditor'; +import createTestEditor from '../../testing/createTestEditor'; import computeSelectionFormatting from './computeSelectionFormatting'; diff --git a/packages/editor/CodeMirror/markdown/computeSelectionFormatting.ts b/packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.ts similarity index 98% rename from packages/editor/CodeMirror/markdown/computeSelectionFormatting.ts rename to packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.ts index 85fbd3cc44..ac9342866c 100644 --- a/packages/editor/CodeMirror/markdown/computeSelectionFormatting.ts +++ b/packages/editor/CodeMirror/utils/formatting/computeSelectionFormatting.ts @@ -1,4 +1,4 @@ -import SelectionFormatting, { MutableSelectionFormatting, defaultSelectionFormatting } from '../../SelectionFormatting'; +import SelectionFormatting, { MutableSelectionFormatting, defaultSelectionFormatting } from '../../../SelectionFormatting'; import { syntaxTree } from '@codemirror/language'; import { EditorState } from '@codemirror/state'; diff --git a/packages/editor/CodeMirror/markdown/codeBlockLanguages/allLanguages.ts b/packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/allLanguages.ts similarity index 100% rename from packages/editor/CodeMirror/markdown/codeBlockLanguages/allLanguages.ts rename to packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/allLanguages.ts diff --git a/packages/editor/CodeMirror/markdown/codeBlockLanguages/defaultLanguage.ts b/packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/defaultLanguage.ts similarity index 100% rename from packages/editor/CodeMirror/markdown/codeBlockLanguages/defaultLanguage.ts rename to packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/defaultLanguage.ts diff --git a/packages/editor/CodeMirror/markdown/codeBlockLanguages/lookUpLanguage.ts b/packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/lookUpLanguage.ts similarity index 100% rename from packages/editor/CodeMirror/markdown/codeBlockLanguages/lookUpLanguage.ts rename to packages/editor/CodeMirror/utils/markdown/codeBlockLanguages/lookUpLanguage.ts diff --git a/packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.test.ts b/packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.test.ts similarity index 98% rename from packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.test.ts rename to packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.test.ts index f76b918010..f86379fa5b 100644 --- a/packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.test.ts +++ b/packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.test.ts @@ -1,5 +1,5 @@ import { EditorSelection } from '@codemirror/state'; -import createTestEditor from '../../testUtil/createTestEditor'; +import createTestEditor from '../../testing/createTestEditor'; import renumberSelectedLists from './renumberSelectedLists'; describe('renumberSelectedLists', () => { diff --git a/packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.ts b/packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.ts similarity index 100% rename from packages/editor/CodeMirror/markdown/utils/renumberSelectedLists.ts rename to packages/editor/CodeMirror/utils/markdown/renumberSelectedLists.ts diff --git a/packages/editor/CodeMirror/markdown/utils/stripBlockquote.ts b/packages/editor/CodeMirror/utils/markdown/stripBlockquote.ts similarity index 100% rename from packages/editor/CodeMirror/markdown/utils/stripBlockquote.ts rename to packages/editor/CodeMirror/utils/markdown/stripBlockquote.ts