(.*?)<\/div>/g,
+ '
$1
'
+ );
+ }
+
return html;
};
@@ -160,7 +173,8 @@ export const playgroundPlugin = (
eleventyConfig.addPairedShortcode(
'highlight',
- (code: string, lang: 'js' | 'ts' | 'html' | 'css') => render(code, lang)
+ (code: string, lang: 'js' | 'ts' | 'html' | 'css', makePre = false) =>
+ render(code, lang, makePre)
);
eleventyConfig.addMarkdownHighlighter(
diff --git a/packages/lit-dev-tools-cjs/src/playground-plugin/renderer.ts b/packages/lit-dev-tools-cjs/src/playground-plugin/renderer.ts
index abd826e34..76f0cc2fa 100644
--- a/packages/lit-dev-tools-cjs/src/playground-plugin/renderer.ts
+++ b/packages/lit-dev-tools-cjs/src/playground-plugin/renderer.ts
@@ -107,36 +107,26 @@ export class Renderer {
editor.type = lang;
editor.value = code;
await editor.updateComplete;
- const cm = editor.shadowRoot.querySelector('.CodeMirror-code');
+ const cm = editor.shadowRoot.querySelector('.cm-content');
if (cm === null) {
throw new Error(
- '
did not render a ".CodeMirror-code" element'
+ ' did not render a ".cm-content" element'
);
}
+
// The final line is sometimes (always?) an empty line containing just
// a zero width space. Remove any final line that's only whitespace.
// Note that RegExp "\s" doesn't include zero width spaces.
- const lastLine = cm.querySelector('.CodeMirror-line:last-of-type');
- if (lastLine?.textContent?.match(/^[\s\u200B]*$/)) {
+ const lastLine = cm.querySelector('.cm-line:last-of-type');
+ if (lastLine?.textContent === '') {
lastLine.remove();
}
- // Replace zero width newlines that don't copy paste well with a line
- // feed unicode character that pastes correctly.
- const codeLines = cm.querySelectorAll(
- '.CodeMirror-line > span > span[cm-text]'
- );
- for (const line of codeLines) {
- if (line?.textContent?.match(/^[\u200B]*$/)) {
- line.textContent = `\u000A`;
- }
- }
-
return cm.innerHTML;
},
[lang, code]
);
- const html = `${codemirrorHtml}`;
+ const html = `${codemirrorHtml}`;
return {html};
} finally {
this.releasePageLock();
diff --git a/packages/lit-dev-tools-cjs/src/search/indexers/index-tutorials.ts b/packages/lit-dev-tools-cjs/src/search/indexers/index-tutorials.ts
index 5ca997b64..4bc1d5e63 100644
--- a/packages/lit-dev-tools-cjs/src/search/indexers/index-tutorials.ts
+++ b/packages/lit-dev-tools-cjs/src/search/indexers/index-tutorials.ts
@@ -90,7 +90,7 @@ export const indexTutorials = async (
// Remove all code samples from the description – they might pollute
// the search results.
jsdoc.window.document
- .querySelectorAll('figure.CodeMirror')
+ .querySelectorAll('figure.cm-editor')
.forEach((el) => {
el.remove();
});