Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions CoreEditor/src/styling/helper.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
import { BlockWrapper, Decoration, DOMEventHandlers, EditorView, ViewPlugin } from '@codemirror/view';
import { Decoration, DOMEventHandlers, EditorView, ViewPlugin } from '@codemirror/view';
import { Range, RangeSet } from '@codemirror/state';

// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function createBlockPlugin(builder: () => RangeSet<BlockWrapper>, eventHandlers?: DOMEventHandlers<any>) {
return ViewPlugin.fromClass(class {}, {
provide: () => EditorView.blockWrappers.of(editor => {
window.editor = editor;
return builder();
}),
eventHandlers,
});
}

// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function createDecoPlugin(builder: () => RangeSet<Decoration>, eventHandlers?: DOMEventHandlers<any>) {
return ViewPlugin.fromClass(class {}, {
Expand Down
18 changes: 1 addition & 17 deletions CoreEditor/src/styling/matchers/lezer.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,10 @@
import { BlockWrapper, Decoration } from '@codemirror/view';
import { Decoration } from '@codemirror/view';
import { Range, RangeValue } from '@codemirror/state';
import { syntaxTree } from '@codemirror/language';
import { SyntaxNodeRef } from '@lezer/common';
import { WidgetView } from '../views/types';
import { lineDecoRanges } from '../helper';

/**
* Build block wrappers by leveraging language lexers.
*
* @param nodeName Node name(s), such as "CodeBlock" for code blocks
* @param className Class to decorate the node
*/
export function createBlockWrappers(nodeName: string | string[], className: string, attributes?: { [key: string]: string }) {
return BlockWrapper.set(createNodeRanges(nodeName, node => BlockWrapper.create({
tagName: 'div',
attributes: {
'class': className,
...attributes,
},
}).range(node.from, node.to)));
}

/**
* Create mark decorations.
*
Expand Down
10 changes: 2 additions & 8 deletions CoreEditor/src/styling/nodes/code.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createBlockWrappers, createMarkDeco, createWidgetDeco, createLineDeco } from '../matchers/lezer';
import { createBlockPlugin, createDecoPlugin } from '../helper';
import { createMarkDeco, createWidgetDeco, createLineDeco } from '../matchers/lezer';
import { createDecoPlugin } from '../helper';
import { PreviewWidget } from '../views';
import { cancelDefaultEvent, PreviewType, showPreview } from '../../modules/preview';

Expand All @@ -16,12 +16,6 @@ export const inlineCodeStyle = createDecoPlugin(() => {
export const codeBlockStyle = (() => {
const nodeNames = ['FencedCode', 'CodeBlock'];
return [
createBlockPlugin(() => createBlockWrappers(nodeNames, 'cm-md-codeBlockWrapper', {
'spellcheck': 'false',
'autocorrect': 'off',
'autocomplete': 'off',
'autocapitalize': 'off',
})),
createDecoPlugin(() => createLineDeco(nodeNames, 'cm-md-monospace cm-md-codeBlock')),
];
})();
Expand Down
5 changes: 2 additions & 3 deletions CoreEditor/src/styling/nodes/table.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { createBlockWrappers, createLineDeco, createWidgetDeco } from '../matchers/lezer';
import { createBlockPlugin, createDecoPlugin } from '../helper';
import { createLineDeco, createWidgetDeco } from '../matchers/lezer';
import { createDecoPlugin } from '../helper';
import { PreviewWidget } from '../views';
import { cancelDefaultEvent, PreviewType, showPreview } from '../../modules/preview';

/**
* Always use monospace font for Table.
*/
export const tableStyle = [
createBlockPlugin(() => createBlockWrappers('Table', 'cm-md-tableWrapper')),
createDecoPlugin(() => createLineDeco('Table', 'cm-md-monospace cm-md-table')),
];

Expand Down
Loading