Skip to content
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.

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

Reuse markdown instance for preferences widget #12790

Merged
merged 1 commit into from
Aug 2, 2023
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
// *****************************************************************************
// Copyright (C) 2023 TypeFox and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// http://www.eclipse.org/legal/epl-2.0.
//
// This Source Code may also be made available under the following Secondary
// Licenses when the conditions for such availability set forth in the Eclipse
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
// with the GNU Classpath Exception which is available at
// https://www.gnu.org/software/classpath/license.html.
//
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
// *****************************************************************************

import { inject, injectable } from '@theia/core/shared/inversify';
import { PreferenceTreeModel } from '../../preference-tree-model';
import { PreferenceTreeLabelProvider } from '../../util/preference-tree-label-provider';
import * as markdownit from '@theia/core/shared/markdown-it';

@injectable()
export class PreferenceMarkdownRenderer {

@inject(PreferenceTreeModel) protected readonly model: PreferenceTreeModel;
@inject(PreferenceTreeLabelProvider) protected readonly labelProvider: PreferenceTreeLabelProvider;

protected _renderer?: markdownit;

render(text: string): string {
return this.getRenderer().render(text);
}

renderInline(text: string): string {
return this.getRenderer().renderInline(text);
}

protected getRenderer(): markdownit {
this._renderer ??= this.buildMarkdownRenderer();
return this._renderer;
}

protected buildMarkdownRenderer(): markdownit {
const engine = markdownit();
const inlineCode = engine.renderer.rules.code_inline;

engine.renderer.rules.code_inline = (tokens, idx, options, env, self) => {
const token = tokens[idx];
const content = token.content;
if (content.startsWith('#') && content.endsWith('#')) {
const preferenceId = content.substring(1, content.length - 1);
const preferenceNode = this.model.getNodeFromPreferenceId(preferenceId);
if (preferenceNode) {
let name = this.labelProvider.getName(preferenceNode);
const prefix = this.labelProvider.getPrefix(preferenceNode, true);
if (prefix) {
name = prefix + name;
}
return `<a title="${preferenceId}" href="preference:${preferenceId}">${name}</a>`;
} else {
console.warn(`Linked preference "${preferenceId}" not found.`);
}
}
return inlineCode ? inlineCode(tokens, idx, options, env, self) : '';
};
return engine;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import { JSONValue } from '@theia/core/shared/@phosphor/coreutils';
import debounce = require('@theia/core/shared/lodash.debounce');
import { PreferenceTreeModel } from '../../preference-tree-model';
import { PreferencesSearchbarWidget } from '../preference-searchbar-widget';
import * as markdownit from '@theia/core/shared/markdown-it';
import * as DOMPurify from '@theia/core/shared/dompurify';
import URI from '@theia/core/lib/common/uri';
import { PreferenceMarkdownRenderer } from './preference-markdown-renderer';

export const PreferenceNodeRendererFactory = Symbol('PreferenceNodeRendererFactory');
export type PreferenceNodeRendererFactory = (node: Preference.TreeNode) => PreferenceNodeRenderer;
Expand Down Expand Up @@ -163,13 +163,13 @@ export abstract class PreferenceLeafNodeRenderer<ValueType extends JSONValue, In
@inject(PreferenceTreeModel) protected readonly model: PreferenceTreeModel;
@inject(PreferencesSearchbarWidget) protected readonly searchbar: PreferencesSearchbarWidget;
@inject(OpenerService) protected readonly openerService: OpenerService;
@inject(PreferenceMarkdownRenderer) protected readonly markdownRenderer: PreferenceMarkdownRenderer;

protected headlineWrapper: HTMLDivElement;
protected gutter: HTMLDivElement;
protected interactable: InteractableType;
protected inspection: PreferenceInspection<ValueType> | undefined;
protected isModifiedFromDefault = false;
protected markdownRenderer: markdownit;

get schema(): PreferenceDataProperty {
return this.preferenceNode.preference.data;
Expand All @@ -179,7 +179,6 @@ export abstract class PreferenceLeafNodeRenderer<ValueType extends JSONValue, In
protected override init(): void {
this.setId();
this.updateInspection();
this.markdownRenderer = this.buildMarkdownRenderer();
this.domNode = this.createDomNode();
this.updateModificationStatus();
}
Expand All @@ -188,32 +187,6 @@ export abstract class PreferenceLeafNodeRenderer<ValueType extends JSONValue, In
this.inspection = this.preferenceService.inspect<ValueType>(this.id, this.scopeTracker.currentScope.uri);
}

protected buildMarkdownRenderer(): markdownit {
const engine = markdownit();
const inlineCode = engine.renderer.rules.code_inline;

engine.renderer.rules.code_inline = (tokens, idx, options, env, self) => {
const token = tokens[idx];
const content = token.content;
if (content.startsWith('#') && content.endsWith('#')) {
const preferenceId = content.substring(1, content.length - 1);
const preferenceNode = this.model.getNodeFromPreferenceId(preferenceId);
if (preferenceNode) {
let name = this.labelProvider.getName(preferenceNode);
const prefix = this.labelProvider.getPrefix(preferenceNode, true);
if (prefix) {
name = prefix + name;
}
return `<a title="${preferenceId}" href="preference:${preferenceId}">${name}</a>`;
} else {
console.warn(`Linked preference "${preferenceId}" not found. Source: "${this.preferenceNode.preferenceId}"`);
}
}
return inlineCode ? inlineCode(tokens, idx, options, env, self) : '';
};
return engine;
}

protected openLink(event: MouseEvent): void {
if (event.target instanceof HTMLAnchorElement) {
event.preventDefault();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
import { PreferenceNumberInputRenderer, PreferenceNumberInputRendererContribution } from './components/preference-number-input';
import { PreferenceSelectInputRenderer, PreferenceSelectInputRendererContribution } from './components/preference-select-input';
import { PreferenceStringInputRenderer, PreferenceStringInputRendererContribution } from './components/preference-string-input';
import { PreferenceMarkdownRenderer } from './components/preference-markdown-renderer';
import { PreferencesEditorWidget } from './preference-editor-widget';
import { PreferencesScopeTabBar } from './preference-scope-tabbar-widget';
import { PreferencesSearchbarWidget } from './preference-searchbar-widget';
Expand Down Expand Up @@ -95,5 +96,7 @@ export function createPreferencesWidgetContainer(parent: interfaces.Container):
return creator.createRenderer(node, container);
});

child.bind(PreferenceMarkdownRenderer).toSelf().inSingletonScope();

return child;
}
Loading