Plugins: Add support for external CodeMirror plugins (#4015)

2024-12-21 09:38:01 +02:00 · 2020-11-17 11:28:32 -07:00 · 2020-11-17 11:28:32 -07:00 · 3e00f6078d
commit 3e00f6078d
parent 4e08adb76f
38 changed files with 5732 additions and 50 deletions
--- a/.eslintignore
+++ b/.eslintignore
@ -196,6 +196,15 @@ packages/app-cli/tests/services_keychainService.js.map
 packages/app-cli/tests/services_rest_Api.d.ts
 packages/app-cli/tests/services_rest_Api.js
 packages/app-cli/tests/services_rest_Api.js.map
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.d.ts
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.js
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.js.map
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.d.ts
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.js
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.js.map
+packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.d.ts
+packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.js
+packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.js.map
 packages/app-cli/tests/support/plugins/content_script/api/index.d.ts
 packages/app-cli/tests/support/plugins/content_script/api/index.js
 packages/app-cli/tests/support/plugins/content_script/api/index.js.map
@ -499,6 +508,9 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js.
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js.map
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.d.ts
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js.map
@ -1174,15 +1186,15 @@ packages/lib/services/plugins/reducer.js.map
 packages/lib/services/plugins/sandboxProxy.d.ts
 packages/lib/services/plugins/sandboxProxy.js
 packages/lib/services/plugins/sandboxProxy.js.map
-packages/lib/services/plugins/utils/contentScriptsToRendererRules.d.ts
-packages/lib/services/plugins/utils/contentScriptsToRendererRules.js
-packages/lib/services/plugins/utils/contentScriptsToRendererRules.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
 packages/lib/services/plugins/utils/executeSandboxCall.d.ts
 packages/lib/services/plugins/utils/executeSandboxCall.js
 packages/lib/services/plugins/utils/executeSandboxCall.js.map
+packages/lib/services/plugins/utils/loadContentScripts.d.ts
+packages/lib/services/plugins/utils/loadContentScripts.js
+packages/lib/services/plugins/utils/loadContentScripts.js.map
 packages/lib/services/plugins/utils/manifestFromObject.d.ts
 packages/lib/services/plugins/utils/manifestFromObject.js
 packages/lib/services/plugins/utils/manifestFromObject.js.map
--- a/.gitignore
+++ b/.gitignore
@ -188,6 +188,15 @@ packages/app-cli/tests/services_keychainService.js.map
 packages/app-cli/tests/services_rest_Api.d.ts
 packages/app-cli/tests/services_rest_Api.js
 packages/app-cli/tests/services_rest_Api.js.map
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.d.ts
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.js
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.js.map
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.d.ts
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.js
+packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.js.map
+packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.d.ts
+packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.js
+packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.js.map
 packages/app-cli/tests/support/plugins/content_script/api/index.d.ts
 packages/app-cli/tests/support/plugins/content_script/api/index.js
 packages/app-cli/tests/support/plugins/content_script/api/index.js.map
@ -491,6 +500,9 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js.
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js.map
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.d.ts
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js
+packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.js.map
@ -1166,15 +1178,15 @@ packages/lib/services/plugins/reducer.js.map
 packages/lib/services/plugins/sandboxProxy.d.ts
 packages/lib/services/plugins/sandboxProxy.js
 packages/lib/services/plugins/sandboxProxy.js.map
-packages/lib/services/plugins/utils/contentScriptsToRendererRules.d.ts
-packages/lib/services/plugins/utils/contentScriptsToRendererRules.js
-packages/lib/services/plugins/utils/contentScriptsToRendererRules.js.map
 packages/lib/services/plugins/utils/createViewHandle.d.ts
 packages/lib/services/plugins/utils/createViewHandle.js
 packages/lib/services/plugins/utils/createViewHandle.js.map
 packages/lib/services/plugins/utils/executeSandboxCall.d.ts
 packages/lib/services/plugins/utils/executeSandboxCall.js
 packages/lib/services/plugins/utils/executeSandboxCall.js.map
+packages/lib/services/plugins/utils/loadContentScripts.d.ts
+packages/lib/services/plugins/utils/loadContentScripts.js
+packages/lib/services/plugins/utils/loadContentScripts.js.map
 packages/lib/services/plugins/utils/manifestFromObject.d.ts
 packages/lib/services/plugins/utils/manifestFromObject.js
 packages/lib/services/plugins/utils/manifestFromObject.js.map
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/.gitignore
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/.gitignore
@ -0,0 +1,2 @@
+dist/*
+node_modules/
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/README.md
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/README.md
@ -0,0 +1,14 @@
+# Joplin Plugin
+
+This is a template to create a new Joplin plugin.
+
+The main two files you will want to look at are:
+
+- `/src/index.ts`, which contains the entry point for the plugin source code.
+- `/src/manifest.json`, which is the plugin manifest. It contains information such as the plugin a name, version, etc.
+
+The plugin is built using webpack, which create the compiled code in `/dist`. The project is setup to use TypeScript, although you can change the configuration to use plain JavaScript.
+
+## Building the plugin
+
+To build the plugin, simply run `npm run dist`.
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/Global.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/Global.d.ts
@ -0,0 +1,15 @@
+import Plugin from '../Plugin';
+import Joplin from './Joplin';
+import Logger from 'lib/Logger';
+/**
+ * @ignore
+ */
+export default class Global {
+    private joplin_;
+    private requireWhiteList_;
+    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    get joplin(): Joplin;
+    private requireWhiteList;
+    require(filePath: string): any;
+    get process(): any;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/Joplin.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/Joplin.d.ts
@ -0,0 +1,38 @@
+import Plugin from '../Plugin';
+import JoplinData from './JoplinData';
+import JoplinPlugins from './JoplinPlugins';
+import JoplinWorkspace from './JoplinWorkspace';
+import JoplinFilters from './JoplinFilters';
+import JoplinCommands from './JoplinCommands';
+import JoplinViews from './JoplinViews';
+import JoplinInterop from './JoplinInterop';
+import JoplinSettings from './JoplinSettings';
+import Logger from 'lib/Logger';
+/**
+ * This is the main entry point to the Joplin API. You can access various services using the provided accessors.
+ */
+export default class Joplin {
+    private data_;
+    private plugins_;
+    private workspace_;
+    private filters_;
+    private commands_;
+    private views_;
+    private interop_;
+    private settings_;
+    constructor(logger: Logger, implementation: any, plugin: Plugin, store: any);
+    get data(): JoplinData;
+    get plugins(): JoplinPlugins;
+    get workspace(): JoplinWorkspace;
+    /**
+     * @ignore
+     *
+     * Not sure if it's the best way to hook into the app
+     * so for now disable filters.
+     */
+    get filters(): JoplinFilters;
+    get commands(): JoplinCommands;
+    get views(): JoplinViews;
+    get interop(): JoplinInterop;
+    get settings(): JoplinSettings;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinCommands.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinCommands.d.ts
@ -0,0 +1,51 @@
+import { Command } from './types';
+/**
+ * This class allows executing or registering new Joplin commands. Commands can be executed or associated with
+ * {@link JoplinViewsToolbarButtons | toolbar buttons} or {@link JoplinViewsMenuItems | menu items}.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/register_command)
+ *
+ * ## Executing Joplin's internal commands
+ *
+ * It is also possible to execute internal Joplin's commands which, as of now, are not well documented.
+ * You can find the list directly on GitHub though at the following locations:
+ *
+ * https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/MainScreen/commands
+ * https://github.com/laurent22/joplin/tree/dev/ElectronClient/commands
+ * https://github.com/laurent22/joplin/tree/dev/ElectronClient/gui/NoteEditor/commands/editorCommandDeclarations.ts
+ *
+ * To view what arguments are supported, you can open any of these files and look at the `execute()` command.
+ */
+export default class JoplinCommands {
+    /**
+     * <span class="platform-desktop">desktop</span> Executes the given command.
+     * The `props` are the arguments passed to the command, and they vary based on the command
+     *
+     * ```typescript
+     * // Create a new note in the current notebook:
+     * await joplin.commands.execute('newNote');
+     *
+     * // Create a new sub-notebook under the provided notebook
+     * // Note: internally, notebooks are called "folders".
+     * await joplin.commands.execute('newFolder', "SOME_FOLDER_ID");
+     * ```
+     */
+    execute(commandName: string, ...args: any[]): Promise<any | void>;
+    /**
+     * <span class="platform-desktop">desktop</span> Registers a new command.
+     *
+     * ```typescript
+     * // Register a new commmand called "testCommand1"
+     *
+     * await joplin.commands.register({
+     *     name: 'testCommand1',
+     *     label: 'My Test Command 1',
+     *     iconName: 'fas fa-music',
+     *     execute: () => {
+     *         alert('Testing plugin command 1');
+     *     },
+     * });
+     * ```
+     */
+    register(command: Command): Promise<void>;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinData.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinData.d.ts
@ -0,0 +1,47 @@
+import { Path } from './types';
+/**
+ * This module provides access to the Joplin data API: https://joplinapp.org/api/references/rest_api/
+ * This is the main way to retrieve data, such as notes, notebooks, tags, etc.
+ * or to update them or delete them.
+ *
+ * This is also what you would use to search notes, via the `search` endpoint.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/simple)
+ *
+ * In general you would use the methods in this class as if you were using a REST API. There are four methods that map to GET, POST, PUT and DELETE calls.
+ * And each method takes these parameters:
+ *
+ * * `path`: This is an array that represents the path to the resource in the form `["resouceName", "resourceId", "resourceLink"]` (eg. ["tags", ":id", "notes"]). The "resources" segment is the name of the resources you want to access (eg. "notes", "folders", etc.). If not followed by anything, it will refer to all the resources in that collection. The optional "resourceId" points to a particular resources within the collection. Finally, an optional "link" can be present, which links the resource to a collection of resources. This can be used in the API for example to retrieve all the notes associated with a tag.
+ * * `query`: (Optional) The query parameters. In a URL, this is the part after the question mark "?". In this case, it should be an object with key/value pairs.
+ * * `data`: (Optional) Applies to PUT and POST calls only. The request body contains the data you want to create or modify, for example the content of a note or folder.
+ * * `files`: (Optional) Used to create new resources and associate them with files.
+ *
+ * Please refer to the [Joplin API documentation](https://joplinapp.org/api/references/rest_api/) for complete details about each call. As the plugin runs within the Joplin application **you do not need an authorisation token** to use this API.
+ *
+ * For example:
+ *
+ * ```typescript
+ * // Get a note ID, title and body
+ * const noteId = 'some_note_id';
+ * const note = await joplin.data.get(['notes', noteId], { fields: ['id', 'title', 'body'] });
+ *
+ * // Get all folders
+ * const folders = await joplin.data.get(['folders']);
+ *
+ * // Set the note body
+ * await joplin.data.put(['notes', noteId], null, { body: "New note body" });
+ *
+ * // Create a new note under one of the folders
+ * await joplin.data.post(['notes'], null, { body: "my new note", title: "some title", parent_id: folders[0].id });
+ * ```
+ */
+export default class JoplinData {
+    private api_;
+    private pathSegmentRegex_;
+    private serializeApiBody;
+    private pathToString;
+    get(path: Path, query?: any): Promise<any>;
+    post(path: Path, query?: any, body?: any, files?: any[]): Promise<any>;
+    put(path: Path, query?: any, body?: any, files?: any[]): Promise<any>;
+    delete(path: Path, query?: any): Promise<any>;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinFilters.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinFilters.d.ts
@ -0,0 +1,10 @@
+/**
+ * @ignore
+ *
+ * Not sure if it's the best way to hook into the app
+ * so for now disable filters.
+ */
+export default class JoplinFilters {
+    on(name: string, callback: Function): Promise<void>;
+    off(name: string, callback: Function): Promise<void>;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinInterop.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinInterop.d.ts
@ -0,0 +1,17 @@
+import { ExportModule, ImportModule } from './types';
+/**
+ * Provides a way to create modules to import external data into Joplin or to export notes into any arbitrary format.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/json_export)
+ *
+ * To implement an import or export module, you would simply define an object with various event handlers that are called
+ * by the application during the import/export process.
+ *
+ * See the documentation of the [[ExportModule]] and [[ImportModule]] for more information.
+ *
+ * You may also want to refer to the Joplin API documentation to see the list of properties for each item (note, notebook, etc.) - https://joplinapp.org/api/references/rest_api/
+ */
+export default class JoplinInterop {
+    registerExportModule(module: ExportModule): Promise<void>;
+    registerImportModule(module: ImportModule): Promise<void>;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinPlugins.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinPlugins.d.ts
@ -0,0 +1,38 @@
+import Plugin from '../Plugin';
+import Logger from 'lib/Logger';
+import { ContentScriptType, Script } from './types';
+/**
+ * This class provides access to plugin-related features.
+ */
+export default class JoplinPlugins {
+    private logger;
+    private plugin;
+    constructor(logger: Logger, plugin: Plugin);
+    /**
+     * Registers a new plugin. This is the entry point when creating a plugin. You should pass a simple object with an `onStart` method to it.
+     * That `onStart` method will be executed as soon as the plugin is loaded.
+     *
+     * ```typescript
+     * joplin.plugins.register({
+     *     onStart: async function() {
+     *         // Run your plugin code here
+     *     }
+     * });
+     * ```
+     */
+    register(script: Script): Promise<void>;
+    /**
+     * Registers a new content script. Unlike regular plugin code, which runs in a separate process, content scripts run within the main process code
+     * and thus allow improved performances and more customisations in specific cases. It can be used for example to load a Markdown or editor plugin.
+     *
+     * Note that registering a content script in itself will do nothing - it will only be loaded in specific cases by the relevant app modules
+     * (eg. the Markdown renderer or the code editor). So it is not a way to inject and run arbitrary code in the app, which for safety and performance reasons is not supported.
+     *
+     * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/content_script)
+     *
+     * @param type Defines how the script will be used. See the type definition for more information about each supported type.
+     * @param id A unique ID for the content script.
+     * @param scriptPath Must be a path relative to the plugin main script. For example, if your file content_script.js is next to your index.ts file, you would set `scriptPath` to `"./content_script.js`.
+     */
+    registerContentScript(type: ContentScriptType, id: string, scriptPath: string): Promise<void>;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinSettings.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinSettings.d.ts
@ -0,0 +1,43 @@
+import Plugin from '../Plugin';
+import { SettingItem, SettingSection } from './types';
+/**
+ * This API allows registering new settings and setting sections, as well as getting and setting settings. Once a setting has been registered it will appear in the config screen and be editable by the user.
+ *
+ * Settings are essentially key/value pairs.
+ *
+ * Note: Currently this API does **not** provide access to Joplin's built-in settings. This is by design as plugins that modify user settings could give unexpected results
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/settings)
+ */
+export default class JoplinSettings {
+    private plugin_;
+    constructor(plugin: Plugin);
+    private namespacedKey;
+    /**
+     * Registers a new setting. Note that registering a setting item is dynamic and will be gone next time Joplin starts.
+     * What it means is that you need to register the setting every time the plugin starts (for example in the onStart event).
+     * The setting value however will be preserved from one launch to the next so there is no risk that it will be lost even if for some
+     * reason the plugin fails to start at some point.
+     */
+    registerSetting(key: string, settingItem: SettingItem): Promise<void>;
+    /**
+     * Registers a new setting section. Like for registerSetting, it is dynamic and needs to be done every time the plugin starts.
+     */
+    registerSection(name: string, section: SettingSection): Promise<void>;
+    /**
+     * Gets a setting value (only applies to setting you registered from your plugin)
+     */
+    value(key: string): Promise<any>;
+    /**
+     * Sets a setting value (only applies to setting you registered from your plugin)
+     */
+    setValue(key: string, value: any): Promise<void>;
+    /**
+     * Gets a global setting value, including app-specific settings and those set by other plugins.
+     *
+     * The list of available settings is not documented yet, but can be found by looking at the source code:
+     *
+     * https://github.com/laurent22/joplin/blob/3539a452a359162c461d2849829d2d42973eab50/ReactNativeClient/lib/models/Setting.ts#L142
+     */
+    globalValue(key: string): Promise<any>;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinViews.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinViews.d.ts
@ -0,0 +1,28 @@
+import Plugin from '../Plugin';
+import JoplinViewsDialogs from './JoplinViewsDialogs';
+import JoplinViewsMenuItems from './JoplinViewsMenuItems';
+import JoplinViewsMenus from './JoplinViewsMenus';
+import JoplinViewsToolbarButtons from './JoplinViewsToolbarButtons';
+import JoplinViewsPanels from './JoplinViewsPanels';
+/**
+ * This namespace provides access to view-related services.
+ *
+ * All view services provide a `create()` method which you would use to create the view object, whether it's a dialog, a toolbar button or a menu item.
+ * In some cases, the `create()` method will return a [[ViewHandle]], which you would use to act on the view, for example to set certain properties or call some methods.
+ */
+export default class JoplinViews {
+    private store;
+    private plugin;
+    private dialogs_;
+    private panels_;
+    private menuItems_;
+    private menus_;
+    private toolbarButtons_;
+    private implementation_;
+    constructor(implementation: any, plugin: Plugin, store: any);
+    get dialogs(): JoplinViewsDialogs;
+    get panels(): JoplinViewsPanels;
+    get menuItems(): JoplinViewsMenuItems;
+    get menus(): JoplinViewsMenus;
+    get toolbarButtons(): JoplinViewsToolbarButtons;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinViewsDialogs.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinViewsDialogs.d.ts
@ -0,0 +1,36 @@
+import Plugin from '../Plugin';
+import { ButtonSpec, ViewHandle, ButtonId } from './types';
+/**
+ * Allows creating and managing dialogs. A dialog is modal window that contains a webview and a row of buttons. You can update the update the webview using the `setHtml` method.
+ * Dialogs are hidden by default and you need to call `open()` to open them. Once the user clicks on a button, the `open` call will return and provide the button ID that was
+ * clicked on. There is currently no "close" method since the dialog should be thought as a modal one and thus can only be closed by clicking on one of the buttons.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/dialog)
+ */
+export default class JoplinViewsDialogs {
+    private store;
+    private plugin;
+    private implementation_;
+    constructor(implementation: any, plugin: Plugin, store: any);
+    private controller;
+    /**
+     * Creates a new dialog
+     */
+    create(): Promise<ViewHandle>;
+    /**
+     * Displays a message box with OK/Cancel buttons. Returns the button index that was clicked - "0" for OK and "1" for "Cancel"
+     */
+    showMessageBox(message: string): Promise<number>;
+    /**
+     * Sets the dialog HTML content
+     */
+    setHtml(handle: ViewHandle, html: string): Promise<string>;
+    /**
+     * Sets the dialog buttons.
+     */
+    setButtons(handle: ViewHandle, buttons: ButtonSpec[]): Promise<ButtonSpec[]>;
+    /**
+     * Opens the dialog
+     */
+    open(handle: ViewHandle): Promise<ButtonId>;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinViewsMenuItems.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinViewsMenuItems.d.ts
@ -0,0 +1,16 @@
+import { CreateMenuItemOptions, MenuItemLocation } from './types';
+import Plugin from '../Plugin';
+/**
+ * Allows creating and managing menu items.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/register_command)
+ */
+export default class JoplinViewsMenuItems {
+    private store;
+    private plugin;
+    constructor(plugin: Plugin, store: any);
+    /**
+     * Creates a new menu item and associate it with the given command. You can specify under which menu the item should appear using the `location` parameter.
+     */
+    create(commandName: string, location?: MenuItemLocation, options?: CreateMenuItemOptions): Promise<void>;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinViewsMenus.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinViewsMenus.d.ts
@ -0,0 +1,18 @@
+import { MenuItem, MenuItemLocation } from './types';
+import Plugin from '../Plugin';
+/**
+ * Allows creating menus.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/menu)
+ */
+export default class JoplinViewsMenus {
+    private store;
+    private plugin;
+    constructor(plugin: Plugin, store: any);
+    private registerCommandAccelerators;
+    /**
+     * Creates a new menu from the provided menu items and place it at the given location. As of now, it is only possible to place the
+     * menu as a sub-menu of the application build-in menus.
+     */
+    create(label: string, menuItems: MenuItem[], location?: MenuItemLocation): Promise<void>;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinViewsPanels.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinViewsPanels.d.ts
@ -0,0 +1,30 @@
+import Plugin from '../Plugin';
+import { ViewHandle } from './types';
+/**
+ * Allows creating and managing view panels. View panels currently are displayed at the right of the sidebar and allows displaying any HTML content (within a webview) and update it in real-time. For example
+ * it could be used to display a table of content for the active note, or display various metadata or graph.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/toc)
+ */
+export default class JoplinViewsPanels {
+    private store;
+    private plugin;
+    constructor(plugin: Plugin, store: any);
+    private controller;
+    /**
+     * Creates a new panel
+     */
+    create(): Promise<ViewHandle>;
+    /**
+     * Sets the panel webview HTML
+     */
+    setHtml(handle: ViewHandle, html: string): Promise<string>;
+    /**
+     * Adds and loads a new JS or CSS files into the panel.
+     */
+    addScript(handle: ViewHandle, scriptPath: string): Promise<void>;
+    /**
+     * Called when a message is sent from the webview (using postMessage).
+     */
+    onMessage(handle: ViewHandle, callback: Function): Promise<void>;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinViewsToolbarButtons.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinViewsToolbarButtons.d.ts
@ -0,0 +1,16 @@
+import { ToolbarButtonLocation } from './types';
+import Plugin from '../Plugin';
+/**
+ * Allows creating and managing toolbar buttons.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/register_command)
+ */
+export default class JoplinViewsToolbarButtons {
+    private store;
+    private plugin;
+    constructor(plugin: Plugin, store: any);
+    /**
+     * Creates a new toolbar button and associate it with the given command.
+     */
+    create(commandName: string, location: ToolbarButtonLocation): Promise<void>;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinWorkspace.d.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/JoplinWorkspace.d.ts
@ -0,0 +1,34 @@
+/**
+ * The workspace service provides access to all the parts of Joplin that are being worked on - i.e. the currently selected notes or notebooks as well
+ * as various related events, such as when a new note is selected, or when the note content changes.
+ *
+ * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins)
+ */
+export default class JoplinWorkspace {
+    private store;
+    constructor(_implementation: any, store: any);
+    /**
+     * Called when a new note or notes are selected.
+     */
+    onNoteSelectionChange(callback: Function): Promise<void>;
+    /**
+     * Called when the content of a note changes.
+     */
+    onNoteContentChange(callback: Function): Promise<void>;
+    /**
+     * Called when an alarm associated with a to-do is triggered.
+     */
+    onNoteAlarmTrigger(callback: Function): Promise<void>;
+    /**
+     * Called when the synchronisation process has finished.
+     */
+    onSyncComplete(callback: Function): Promise<void>;
+    /**
+     * Gets the currently selected note
+     */
+    selectedNote(): Promise<any>;
+    /**
+     * Gets the IDs of the selected notes (can be zero, one, or many). Use the data API to retrieve information about these notes.
+     */
+    selectedNoteIds(): Promise<string[]>;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/index.ts
@ -0,0 +1,5 @@
+import type Joplin from './Joplin';
+
+declare const joplin:Joplin;
+
+export default joplin; 
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/api/types.ts
@ -0,0 +1,368 @@
+// =================================================================
+// Command API types
+// =================================================================
+
+export interface Command {
+	/**
+	 * Name of command - must be globally unique
+	 */
+	name: string
+
+	/**
+	 * Label to be displayed on menu items or keyboard shortcut editor for example.
+	 * If it is missing, it's assumed it's a private command, to be called programmatically only.
+	 * In that case the command will not appear in the shortcut editor or command panel, and logically
+	 * should not be used as a menu item.
+	 */
+	label?: string
+
+	/**
+	 * Icon to be used on toolbar buttons for example
+	 */
+	iconName?: string,
+
+	/**
+	 * Code to be ran when the command is executed. It may return a result.
+	 */
+	execute(...args:any[]):Promise<any | void>
+
+	/**
+	 * Defines whether the command should be enabled or disabled, which in turns affects
+	 * the enabled state of any associated button or menu item.
+	 *
+	 * The condition should be expressed as a "when-clause" (as in Visual Studio Code). It's a simple boolean expression that evaluates to
+	 * `true` or `false`. It supports the following operators:
+	 *
+	 * Operator | Symbol | Example
+	 * -- | -- | --
+	 * Equality | == | "editorType == markdown"
+	 * Inequality | != | "currentScreen != config"
+	 * Or | \|\| | "noteIsTodo \|\| noteTodoCompleted"
+	 * And | && | "oneNoteSelected && !inConflictFolder"
+	 *
+	 * Currently the supported context variables aren't documented, but you can find the list there:
+	 *
+	 * https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/services/commands/stateToWhenClauseContext.ts
+	 *
+	 * Note: Commands are enabled by default unless you use this property.
+	 */
+	enabledCondition?: string
+}
+
+// =================================================================
+// Interop API types
+// =================================================================
+
+export enum FileSystemItem {
+	File = 'file',
+	Directory = 'directory',
+}
+
+export enum ImportModuleOutputFormat {
+	Markdown = 'md',
+	Html = 'html',
+}
+
+/**
+ * Used to implement a module to export data from Joplin. [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/CliClient/tests/support/plugins/json_export) for an example.
+ *
+ * In general, all the event handlers you'll need to implement take a `context` object as a first argument. This object will contain the export or import path as well as various optional properties, such as which notes or notebooks need to be exported.
+ *
+ * To get a better sense of what it will contain it can be useful to print it using `console.info(context)`.
+ */
+export interface ExportModule {
+	/**
+	 * The format to be exported, eg "enex", "jex", "json", etc.
+	 */
+	format: string,
+
+	/**
+	 * The description that will appear in the UI, for example in the menu item.
+	 */
+	description: string,
+
+	/**
+	 * Whether the module will export a single file or multiple files in a directory. It affects the open dialog that will be presented to the user when using your exporter.
+	 */
+	target: FileSystemItem,
+
+	/**
+	 * Only applies to single file exporters or importers
+	 * It tells whether the format can package multiple notes into one file.
+	 * For example JEX or ENEX can, but HTML cannot.
+	 */
+	isNoteArchive: boolean,
+
+	/**
+	 * The extensions of the files exported by your module. For example, it is `["htm", "html"]` for the HTML module, and just `["jex"]` for the JEX module.
+	 */
+	fileExtensions?: string[],
+
+	/**
+	 * Called when the export process starts.
+	 */
+	onInit(context:ExportContext): Promise<void>;
+
+	/**
+	 * Called when an item needs to be processed. An "item" can be any Joplin object, such as a note, a folder, a notebook, etc.
+	 */
+	onProcessItem(context:ExportContext, itemType:number, item:any):Promise<void>;
+
+	/**
+	 * Called when a resource file needs to be exported.
+	 */
+	onProcessResource(context:ExportContext, resource:any, filePath:string):Promise<void>;
+
+	/**
+	 * Called when the export process is done.
+	 */
+	onClose(context:ExportContext):Promise<void>;
+}
+
+export interface ImportModule {
+	/**
+	 * The format to be exported, eg "enex", "jex", "json", etc.
+	 */
+	format: string,
+
+	/**
+	 * The description that will appear in the UI, for example in the menu item.
+	 */
+	description: string,
+
+	/**
+	 * Only applies to single file exporters or importers
+	 * It tells whether the format can package multiple notes into one file.
+	 * For example JEX or ENEX can, but HTML cannot.
+	 */
+	isNoteArchive: boolean,
+
+	/**
+	 * The type of sources that are supported by the module. Tells whether the module can import files or directories or both.
+	 */
+	sources: FileSystemItem[],
+
+	/**
+	 * Tells the file extensions of the exported files.
+	 */
+	fileExtensions?: string[],
+
+	/**
+	 * Tells the type of notes that will be generated, either HTML or Markdown (default).
+	 */
+	outputFormat?: ImportModuleOutputFormat,
+
+	/**
+	 * Called when the import process starts. There is only one event handler within which you should import the complete data.
+	 */
+	onExec(context:ImportContext): Promise<void>;
+}
+
+export interface ExportOptions {
+	format?: string,
+	path?:string,
+	sourceFolderIds?: string[],
+	sourceNoteIds?: string[],
+	modulePath?:string,
+	target?:FileSystemItem,
+}
+
+export interface ExportContext {
+	destPath: string,
+	options: ExportOptions,
+
+	/**
+	 * You can attach your own custom data using this propery - it will then be passed to each event handler, allowing you to keep state from one event to the next.
+	 */
+	userData?: any,
+}
+
+export interface ImportContext {
+	sourcePath: string,
+	options: any,
+	warnings: string[],
+}
+
+// =================================================================
+// Misc types
+// =================================================================
+
+export interface Script {
+	onStart?(event:any):Promise<void>,
+}
+
+// =================================================================
+// Menu types
+// =================================================================
+
+export interface CreateMenuItemOptions {
+	accelerator: string,
+}
+
+export enum MenuItemLocation {
+	File = 'file',
+	Edit = 'edit',
+	View = 'view',
+	Note = 'note',
+	Tools = 'tools',
+	Help = 'help',
+	Context = 'context',
+}
+
+export interface MenuItem {
+	/**
+	 * Command that should be associated with the menu item. All menu item should
+	 * have a command associated with them unless they are a sub-menu.
+	 */
+	commandName?: string,
+
+	/**
+	 * Accelerator associated with the menu item
+	 */
+	accelerator?: string,
+
+	/**
+	 * Menu items that should appear below this menu item. Allows creating a menu tree.
+	 */
+	submenu?: MenuItem[],
+
+	/**
+	 * Menu item label. If not specified, the command label will be used instead.
+	 */
+	label?: string,
+}
+
+// =================================================================
+// View API types
+// =================================================================
+
+export interface ButtonSpec {
+	id: ButtonId,
+	title?: string,
+	onClick?():void,
+}
+
+export type ButtonId = string;
+
+export enum ToolbarButtonLocation {
+	/**
+	 * This toolbar in the top right corner of the application. It applies to the note as a whole, including its metadata.
+	 */
+	NoteToolbar = 'noteToolbar',
+
+	/**
+	 * This toolbar is right above the text editor. It applies to the note body only.
+	 */
+	EditorToolbar = 'editorToolbar',
+}
+
+export type ViewHandle = string;
+
+export interface EditorCommand {
+	name: string;
+	value?: any;
+}
+
+// =================================================================
+// Settings types
+// =================================================================
+
+export enum SettingItemType {
+	Int = 1,
+	String = 2,
+	Bool = 3,
+	Array = 4,
+	Object = 5,
+	Button = 6,
+}
+
+// Redefine a simplified interface to mask internal details
+// and to remove function calls as they would have to be async.
+export interface SettingItem {
+	value: any,
+	type: SettingItemType,
+	public: boolean,
+	label:string,
+
+	description?:string,
+	isEnum?: boolean,
+	section?: string,
+	options?:any,
+	appTypes?:string[],
+	secure?: boolean,
+	advanced?: boolean,
+	minimum?: number,
+	maximum?: number,
+	step?: number,
+}
+
+export interface SettingSection {
+	label: string,
+	iconName?: string,
+	description?: string,
+	name?: string,
+}
+
+// =================================================================
+// Data API types
+// =================================================================
+
+/**
+ * An array of at least one element and at most three elements.
+ *
+ * [0]: Resource name (eg. "notes", "folders", "tags", etc.)
+ * [1]: (Optional) Resource ID.
+ * [2]: (Optional) Resource link.
+ */
+export type Path = string[];
+
+// =================================================================
+// Plugins type
+// =================================================================
+
+export enum ContentScriptType {
+	/**
+	 * Registers a new Markdown-It plugin, which should follow this template:
+	 *
+	 * ```javascript
+	 * // The module should export an object as below:
+	 *
+	 * module.exports = {
+	 *
+	 *     // The "context" variable is currently unused but could be used later on to provide
+	 *     // access to your own plugin so that the content script and plugin can communicate.
+	 *     default: function(context) {
+	 *         return {
+	 *
+	 *             // This is the actual Markdown-It plugin - check the [official doc](https://github.com/markdown-it/markdown-it) for more information
+	 *             // The `options` parameter is of type [RuleOptions](https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/joplin-renderer/MdToHtml.ts), which
+	 *             // contains a number of options, mostly useful for Joplin's internal code.
+	 *             plugin: function(markdownIt, options) {
+	 *                 // ...
+	 *             },
+	 *
+	 *             // You may also specify additional assets such as JS or CSS that should be loaded in the rendered HTML document.
+	 *             // Check for example the Joplin [Mermaid plugin](https://github.com/laurent22/joplin/blob/dev/ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/mermaid.ts) to
+	 *             // see how the data should be structured.
+	 *             assets: {},
+	 *         }
+	 *     }
+	 * }
+	 * ```
+	 *
+	 * To include a regular Markdown-It plugin, that doesn't make use of any Joplin-specific feature, you
+	 * would simply create a file such as this:
+	 *
+	 * ```javascript
+	 * module.exports = {
+	 *     default: function(context) {
+	 *         return {
+	 *             plugin: require('markdown-it-toc-done-right');
+	 *         }
+	 *     }
+	 * }
+	 * ```
+	 */
+	MarkdownItPlugin = 'markdownItPlugin',
+	CodeMirrorPlugin = 'codeMirrorPlugin',
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/package-lock.json
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/package-lock.json
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/package.json
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/package.json
@ -0,0 +1,23 @@
+{
+  "name": "joplin_plugin",
+  "version": "1.0.0",
+  "description": "",
+  "scripts": {
+    "dist": "webpack",
+    "postinstall": "npm run dist"
+  },
+  "keywords": [],
+  "author": "CalebJohn",
+  "license": "MIT",
+  "devDependencies": {
+    "@types/node": "^14.0.14",
+    "copy-webpack-plugin": "^6.1.0",
+    "ts-loader": "^7.0.5",
+    "typescript": "^3.9.3",
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.11"
+  },
+  "dependencies": {
+    "codemirror": "^5.58.2"
+  }
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/src/index.ts
@ -0,0 +1,13 @@
+import joplin from 'api';
+import { ContentScriptType } from 'api/types';
+
+joplin.plugins.register({
+	onStart: async function() {
+		console.info('Match Highlighter started!');
+		await joplin.plugins.registerContentScript(
+			ContentScriptType.CodeMirrorPlugin,
+			'matchHighlighter',
+			'./joplinMatchHighlighter.js'
+		);
+	},
+});
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/src/joplinMatchHighlighter.js
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/src/joplinMatchHighlighter.js
@ -0,0 +1,45 @@
+
+// Content scripts that extend the funcitonality of codemirror will need to have the exact signature 
+// below. 
+function plugin(CodeMirror) {
+	// This is a dummy command that is registered with codemirror. 
+	// Once created here it can be called by any other codemirror command
+	// using cm.execCommand(stringName) or by binding the command to a key in the keymap
+	CodeMirror.commands.printSomething = function(cm) {
+		console.log("Something");
+	}
+	// Here we manually bind the keys using the codemirror keymap
+	CodeMirror.keyMap.basic["Ctrl-U"] = "printSomething"
+}
+
+module.exports = {
+	default: function(_context) { 
+		return {
+			// A plugin needs to either include a plugin here OR have enable an addon
+			plugin: plugin,
+			// Some resources are included with codemirror and extend the functionality in standard ways
+			// via plugins (called addons) which you can find here: https://codemirror.net/doc/manual.html#addons
+			// and are available under the addon/ directory
+			// or by adding keymaps under the keymap/ directory
+			// or additional modes available under the mode/ directory
+			// All are available in the  CodeMirror source: https://github.com/codemirror/codemirror
+			codeMirrorResources: ['addon/search/match-highlighter'],
+			// Often addons for codemirror need to be enabled using an option,
+			// There is also certain codemirror functionality that can be enabled/disabled using
+			// simple options
+			codeMirrorOptions: {'highlightSelectionMatches': true},
+			// More complex plugins (and some addons) will require additional css styling
+			// which is available through the assets function. As seen below, this styling can
+			// either point to a css file in the plugin src directory or be included inline.
+			assets: function() {
+				return [
+					{ name:'./selection.css' }
+					// { inline: true,
+						// text: '.cm-matchhighlight {	background-color: lightgreen;}',
+						// mime: 'text/css',
+					// }
+				];
+			},
+		}
+	},
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/src/manifest.json
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/src/manifest.json
@ -0,0 +1,9 @@
+{
+	"manifest_version": 1,
+	"name": "joplin-match-highlighter",
+	"description": "Adds support for the Codemirror match highlighter to the Joplin CodeView editor.",
+	"version": "1.0.0",
+	"author": "CalebJohn",
+	"app_min_version": "1.4",
+	"homepage_url": "inmoth.ca"
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/src/selection.css
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/src/selection.css
@ -0,0 +1,3 @@
+.cm-matchhighlight {
+	background-color: lightgreen;
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/tsconfig.json
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/tsconfig.json
@ -0,0 +1,10 @@
+{
+	"compilerOptions": {
+		"outDir": "./dist/",
+		"module": "commonjs",
+		"target": "es2015",
+		"jsx": "react",
+		"allowJs": true,
+		"baseUrl": "."
+	}
+}
--- a/packages/app-cli/tests/support/plugins/codemirror_content_script/webpack.config.js
+++ b/packages/app-cli/tests/support/plugins/codemirror_content_script/webpack.config.js
@ -0,0 +1,44 @@
+const path = require('path');
+const CopyPlugin = require('copy-webpack-plugin');
+
+module.exports = {
+	mode: 'production',
+	entry: './src/index.ts',
+	target: 'node',
+	module: {
+		rules: [
+			{
+				test: /\.tsx?$/,
+				use: 'ts-loader',
+				exclude: /node_modules/,
+			},
+		],
+	},
+	resolve: {
+		alias: {
+			api: path.resolve(__dirname, 'api')
+		},
+		extensions: [ '.tsx', '.ts', '.js' ],
+	},
+	output: {
+		filename: 'index.js',
+		path: path.resolve(__dirname, 'dist'),
+	},
+	plugins: [
+		new CopyPlugin({
+			patterns: [
+				{
+					from: "**/*",
+					context: path.resolve(__dirname, 'src'),
+					to: path.resolve(__dirname, 'dist'),
+					globOptions: {
+						ignore: [
+							'**/*.ts',
+							'**/*.tsx',
+						],
+					},
+				},
+			],
+		}),
+	],
+};
--- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx
+++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx
@ -637,6 +637,7 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
 					readOnly={props.visiblePanes.indexOf('editor') < 0}
 					autoMatchBraces={Setting.value('editor.autoMatchingBraces')}
 					keyMap={props.keyboardMode}
+					plugins={props.plugins}
 					onChange={codeMirror_change}
 					onScroll={editor_scroll}
 					onEditorContextMenu={onEditorContextMenu}
--- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx
+++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx
@ -1,5 +1,6 @@
 import * as React from 'react';
 import { useEffect, useImperativeHandle, useState, useRef, useCallback, forwardRef } from 'react';
+import { PluginStates } from '@joplin/lib/services/plugins/reducer';

 import * as CodeMirror from 'codemirror';

@ -18,6 +19,7 @@ import useLineSorting from './utils/useLineSorting';
 import useEditorSearch from './utils/useEditorSearch';
 import useJoplinMode from './utils/useJoplinMode';
 import useKeymap from './utils/useKeymap';
+import useExternalPlugins from './utils/useExternalPlugins';

 import 'codemirror/keymap/emacs';
 import 'codemirror/keymap/vim';
@ -75,18 +77,19 @@ for (let i = 0; i < topLanguages.length; i++) {
 }

 export interface EditorProps {
-	value: string;
-	searchMarkers: any;
-	mode: string;
-	style: any;
-	codeMirrorTheme: any;
-	readOnly: boolean;
-	autoMatchBraces: boolean;
-	keyMap: string;
-	onChange: any;
-	onScroll: any;
-	onEditorContextMenu: any;
-	onEditorPaste: any;
+	value: string,
+	searchMarkers: any,
+	mode: string,
+	style: any,
+	codeMirrorTheme: any,
+	readOnly: boolean,
+	autoMatchBraces: boolean,
+	keyMap: string,
+	plugins: PluginStates,
+	onChange: any,
+	onScroll: any,
+	onEditorContextMenu: any,
+	onEditorPaste: any,
 }

 function Editor(props: EditorProps, ref: any) {
@ -102,6 +105,7 @@ function Editor(props: EditorProps, ref: any) {
 	useEditorSearch(CodeMirror);
 	useJoplinMode(CodeMirror);
 	useKeymap(CodeMirror);
+	const pluginOptions: any = useExternalPlugins(CodeMirror, props.plugins);

 	useImperativeHandle(ref, () => {
 		return editor;
@ -238,6 +242,14 @@ function Editor(props: EditorProps, ref: any) {
 		}
 	}, [props.keyMap]);

+	useEffect(() => {
+		if (editor) {
+			for (const option in pluginOptions) {
+				editor.setOption(option, pluginOptions[option]);
+			}
+		}
+	}, [pluginOptions, editor]);
+
 	return <div style={props.style} ref={editorParent} />;
 }

--- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.ts
+++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.ts
@ -0,0 +1,90 @@
+import { useEffect, useState } from 'react';
+import { PluginStates } from '@joplin/lib/services/plugins/reducer';
+import { contentScriptsToCodeMirrorPlugin } from '@joplin/lib/services/plugins/utils/loadContentScripts';
+import { extname } from 'path';
+import shim from '@joplin/lib/shim';
+import uuid from '@joplin/lib/uuid';
+
+const { reg } = require('@joplin/lib/registry.js');
+
+export default function useExternalPlugins(CodeMirror: any, plugins: PluginStates) {
+
+	const [options, setOptions] = useState({});
+	useEffect(() => {
+		let newOptions = {};
+
+		const contentScripts = contentScriptsToCodeMirrorPlugin(plugins);
+
+		for (const contentScript of contentScripts) {
+			try {
+				const mod = contentScript.module;
+
+				if (mod.codeMirrorResources) {
+					for (const asset of mod.codeMirrorResources) {
+						try {
+							require(`codemirror/${asset}`);
+						} catch (error) {
+							error.message = `${asset} is not a valid CodeMirror asset, keymap or mode. You can find a list of valid assets here: https://codemirror.net/doc/manual.html#addons`;
+							throw error;
+						}
+					}
+				}
+
+				if (mod.codeMirrorOptions) {
+					newOptions = Object.assign({}, newOptions, mod.codeMirrorOptions);
+				}
+
+				if (mod.assets) {
+					const cssStrings = [];
+
+					for (const asset of mod.assets()) {
+						let mime = asset.mime;
+
+						if (!mime && asset.inline) throw new Error('Mime type is required for inline assets');
+
+						if (!mime && asset.name) {
+							const ext = extname(asset.name).toLowerCase();
+							if (ext === '.css') mime = 'text/css';
+						}
+
+						if (mime !== 'text/css') throw new Error('Only css assets are supported for CodeMirror plugins');
+
+						if (asset.inline) {
+							cssStrings.push(asset.text);
+						} else {
+							addScript(shim.fsDriver().resolveRelativePathWithinDir(contentScript.assetPath, asset.name), contentScript.id);
+						}
+					}
+
+					if (cssStrings.length > 0) {
+						addInlineCss(cssStrings, contentScript.id);
+					}
+				}
+
+				if (mod.plugin) {
+					mod.plugin(CodeMirror);
+				}
+			} catch (error) {
+				reg.logger().error(error.toString());
+			}
+		}
+		setOptions(newOptions);
+	}, [plugins]);
+
+	function addInlineCss(cssStrings: string[], id: string) {
+		const element = document.createElement('style');
+		element.setAttribute('id', `content-script-${id}-inline-${uuid.createNano()}`);
+		document.head.appendChild(element);
+		element.appendChild(document.createTextNode(cssStrings.join('\n')));
+	}
+
+	function addScript(path: string, id: string) {
+		const element = document.createElement('link');
+		element.setAttribute('id', `content-script-${id}-link-${uuid.createNano()}`);
+		element.setAttribute('rel', 'stylesheet');
+		element.setAttribute('href', path);
+		document.head.appendChild(element);
+	}
+
+	return options;
+}
--- a/packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.ts
+++ b/packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.ts
@ -1,5 +1,5 @@
 import { PluginStates } from '@joplin/lib/services/plugins/reducer';
-import contentScriptsToRendererRules from '@joplin/lib/services/plugins/utils/contentScriptsToRendererRules';
+import { contentScriptsToRendererRules } from '@joplin/lib/services/plugins/utils/loadContentScripts';
 import { useCallback, useMemo } from 'react';
 import { ResourceInfos } from './types';
 import markupLanguageUtils from '@joplin/lib/markupLanguageUtils';
--- a/packages/lib/services/plugins/api/JoplinPlugins.ts
+++ b/packages/lib/services/plugins/api/JoplinPlugins.ts
@ -57,7 +57,8 @@ export default class JoplinPlugins {
 	 * Note that registering a content script in itself will do nothing - it will only be loaded in specific cases by the relevant app modules
 	 * (eg. the Markdown renderer or the code editor). So it is not a way to inject and run arbitrary code in the app, which for safety and performance reasons is not supported.
 	 *
-	 * [View the demo plugin](https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/content_script)
+	 * [View the renderer demo plugin](https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/content_script)
+	 * [View the editor demo plugin](https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/codemirror_content_script)
 	 *
 	 * @param type Defines how the script will be used. See the type definition for more information about each supported type.
 	 * @param id A unique ID for the content script.
--- a/packages/lib/services/plugins/api/types.ts
+++ b/packages/lib/services/plugins/api/types.ts
@ -366,5 +366,41 @@ export enum ContentScriptType {
 	 * ```
 	 */
 	MarkdownItPlugin = 'markdownItPlugin',
+	/**
+	 * Registers a new CodeMirror plugin, which should follow the template below.
+	 *
+	 * ```javascript
+	 * module.exports = {
+	 *     default: function(context) {
+	 *         return {
+	 *             plugin: function(CodeMirror) {
+	 *                 // ...
+	 *             },
+	 *             codeMirrorResources: [],
+	 *             codeMirrorOptions: {
+	 *									// ...
+	 *						 },
+	 *             assets: {
+	 *                 // ...
+	 *             },
+	 *         }
+	 *     }
+	 * }
+	 * ```
+	 *
+	 * - The `context` argument is currently unused but could be used later on to provide access to your own plugin so that the content script and plugin can communicate.
+	 *
+	 * - The `plugin` key is your CodeMirror plugin. This is where you can register new commands with CodeMirror or interact with the CodeMirror instance as needed.
+	 *
+	 * - The `codeMirrorResources` key is an array of CodeMirror resources that will be loaded and attached to the CodeMirror module. These are made up of addons, keymaps, and modes. For example, for a plugin that want's to enable clojure highlighting in code blocks. `codeMirrorResources` would be set to `['mode/clojure/clojure']`.
+	 *
+	 * - The `codeMirrorOptions` key contains all the [CodeMirror](https://codemirror.net/doc/manual.html#config) options that will be set or changed by this plugin. New options can alse be declared via [`CodeMirror.defineOption`](https://codemirror.net/doc/manual.html#defineOption), and then have their value set here. For example, a plugin that enables line numbers would set `codeMirrorOptions` to `{'lineNumbers': true}`.
+	 *
+	 * - Using the **optional** `assets` key you may specify **only** CSS assets that should be loaded in the rendered HTML document. Check for example the Joplin [Mermaid plugin](https://github.com/laurent22/joplin/blob/dev/packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/mermaid.ts) to see how the data should be structured.
+	 *
+	 * One of the `plugin`, `codeMirrorResources`, or `codeMirrorOptions` keys must be provided for the plugin to be valid. Having multiple or all provided is also okay.
+	 *
+	 * See the [demo plugin](https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/codemirror_content_script) for an example of all these keys being used in one plugin.
+	 */
 	CodeMirrorPlugin = 'codeMirrorPlugin',
 }
--- a/packages/lib/services/plugins/utils/contentScriptsToRendererRules.ts
+++ b/packages/lib/services/plugins/utils/contentScriptsToRendererRules.ts
@ -1,28 +0,0 @@
-import { PluginStates } from '../reducer';
-import { ExtraRendererRule } from '@joplin/renderer/MdToHtml';
-import { ContentScriptType } from '../api/types';
-
-export default function contentScriptsToRendererRules(plugins: PluginStates): ExtraRendererRule[] {
-	const output: ExtraRendererRule[] = [];
-
-	for (const pluginId in plugins) {
-		const plugin = plugins[pluginId];
-		const contentScripts = plugin.contentScripts[ContentScriptType.MarkdownItPlugin];
-		if (!contentScripts) continue;
-
-		for (const contentScript of contentScripts) {
-			const module = require(contentScript.path);
-			if (!module.default || typeof module.default !== 'function') throw new Error(`Content script must export a function under the "default" key: Plugin: ${pluginId}: Script: ${contentScript.id}`);
-
-			const loadedModule = module.default({});
-			if (!loadedModule.plugin) throw new Error(`Content script must export a "plugin" key: Plugin: ${pluginId}: Script: ${contentScript.id}`);
-
-			output.push({
-				id: contentScript.id,
-				module: loadedModule,
-			});
-		}
-	}
-
-	return output;
-}
--- a/packages/lib/services/plugins/utils/loadContentScripts.ts
+++ b/packages/lib/services/plugins/utils/loadContentScripts.ts
@ -0,0 +1,43 @@
+import { PluginStates } from '../reducer';
+import { ContentScriptType } from '../api/types';
+import { dirname } from '@joplin/renderer/pathUtils';
+
+export interface ExtraContentScript {
+	id: string;
+	module: any;
+	assetPath: string;
+}
+
+export function contentScriptsToRendererRules(plugins: PluginStates): ExtraContentScript[] {
+	return loadContentScripts(plugins, ContentScriptType.MarkdownItPlugin);
+}
+
+export function contentScriptsToCodeMirrorPlugin(plugins: PluginStates): ExtraContentScript[] {
+	return loadContentScripts(plugins, ContentScriptType.CodeMirrorPlugin);
+}
+
+function loadContentScripts(plugins: PluginStates, scriptType: ContentScriptType): ExtraContentScript[] {
+	const output: ExtraContentScript[] = [];
+
+	for (const pluginId in plugins) {
+		const plugin = plugins[pluginId];
+		const contentScripts = plugin.contentScripts[scriptType];
+		if (!contentScripts) continue;
+
+		for (const contentScript of contentScripts) {
+			const module = require(contentScript.path);
+			if (!module.default || typeof module.default !== 'function') throw new Error(`Content script must export a function under the "default" key: Plugin: ${pluginId}: Script: ${contentScript.id}`);
+
+			const loadedModule = module.default({});
+			if (!loadedModule.plugin && !loadedModule.codeMirrorResources && !loadedModule.codeMirrorOptions) throw new Error(`Content script must export a "plugin" key or a list of CodeMirror assets or define a CodeMirror option: Plugin: ${pluginId}: Script: ${contentScript.id}`);
+
+			output.push({
+				id: contentScript.id,
+				module: loadedModule,
+				assetPath: dirname(contentScript.path),
+			});
+		}
+	}
+
+	return output;
+}
--- a/packages/renderer/MdToHtml.ts
+++ b/packages/renderer/MdToHtml.ts
@ -68,8 +68,9 @@ function slugify(s: string): string {
 const inMemoryCache = new InMemoryCache(20);

 export interface ExtraRendererRule {
-	id: string;
-	module: any;
+	id: string,
+	module: any,
+	assetPath: string,
 }

 export interface Options {