Skip to content

refactor(CodeBlock): replace addNode workaround with direct parser token registration #991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
d3m1d0v wants to merge 1 commit into
base: upd-extension-builder
Choose a base branch
from
Draft

refactor(CodeBlock): replace addNode workaround with direct parser token registration #991

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 27 additions & 37 deletions packages/editor/src/extensions/markdown/CodeBlock/CodeBlockSpecs/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,44 +124,34 @@ export const CodeBlockSpecs: ExtensionAuto<CodeBlockSpecsOptions> = (builder, op
state.closeBlock(node);
},
}));
builder.addNode('fence', () => ({
// we adding this node only for define specific 'fence' parser token,
// which parse fence md token to code_block node
spec: {},
fromMd: {
tokenSpec: {
name: codeBlockNodeName,
type: 'block',
noCloseToken: true,
getAttrs: (tok) => {
const attrs: Record<string, string | null> = {
[CodeBlockNodeAttr.Markup]: tok.markup,
[CodeBlockNodeAttr.Line]: tok.attrGet('data-line'),
};
if (tok.info) {
// like in markdown-it
// https://github.com/markdown-it/markdown-it/blob/d07d585b6b15aaee2bc8f7a54b994526dad4dbc5/lib/renderer.mjs#L36-L37
const parts = tok.info.split(/\s+/);

const isFirstPartForLineNumbers =
opts.lineNumbers?.enabled && parts[0] === 'showLineNumbers';

attrs[CodeBlockNodeAttr.Lang] = isFirstPartForLineNumbers ? '' : parts[0];
}
if (opts.lineNumbers?.enabled && tok.info?.includes('showLineNumbers')) {
attrs[CodeBlockNodeAttr.ShowLineNumbers] = 'true';
} else {
attrs[CodeBlockNodeAttr.ShowLineNumbers] = '';
}

return attrs;
},
prepareContent: removeNewLineAtEnd, // content of fence blocks contains extra \n at the end
},
},
toMd: () => {
throw new Error('Unexpected toMd() call on fence node');
builder.addMarkdownTokenParserSpec('fence', () => ({
name: codeBlockNodeName,
type: 'block',
noCloseToken: true,
getAttrs: (tok) => {
const attrs: Record<string, string | null> = {
[CodeBlockNodeAttr.Markup]: tok.markup,
[CodeBlockNodeAttr.Line]: tok.attrGet('data-line'),
};
if (tok.info) {
// like in markdown-it
// https://github.com/markdown-it/markdown-it/blob/d07d585b6b15aaee2bc8f7a54b994526dad4dbc5/lib/renderer.mjs#L36-L37
const parts = tok.info.split(/\s+/);

const isFirstPartForLineNumbers =
opts.lineNumbers?.enabled && parts[0] === 'showLineNumbers';

attrs[CodeBlockNodeAttr.Lang] = isFirstPartForLineNumbers ? '' : parts[0];
}
if (opts.lineNumbers?.enabled && tok.info?.includes('showLineNumbers')) {
attrs[CodeBlockNodeAttr.ShowLineNumbers] = 'true';
} else {
attrs[CodeBlockNodeAttr.ShowLineNumbers] = '';
}

return attrs;
},
prepareContent: removeNewLineAtEnd, // content of fence blocks contains extra \n at the end
}));
builder.addKeymap(() => ({
Tab: (state, dispatch) => {
Expand Down
Loading