Skip to content

feat(markup): added yfmLang autocomplete options #315

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

Merged
makhnatkin merged 5 commits into from
Aug 1, 2024
Merged

feat(markup): added yfmLang autocomplete options #315

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0bb4e4a
feat(markup): added yfmLang autocomplete options
makhnatkin Jul 31, 2024
9828aec
Update src/markup/codemirror/yfm.ts
makhnatkin Jul 31, 2024
9e724dc
Update src/markup/codemirror/yfm.ts
makhnatkin Jul 31, 2024
3051ac6
Update src/markup/codemirror/yfm.ts
makhnatkin Jul 31, 2024
bad430e
feat(markup): fixed mdAutocomplete
makhnatkin Jul 31, 2024
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
117 changes: 65 additions & 52 deletions src/markup/codemirror/yfm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,66 @@ export const yfmNoteSnippets: Record<YfmNoteType, ReturnType<typeof snippet>> =
export const yfmCutSnippetTemplate = '{% cut "#{title}" %}\n\n#{}\n\n{% endcut %}\n\n';
export const yfmCutSnippet = snippet(yfmCutSnippetTemplate);

export function yfmLang(): Extension {
export interface LanguageData {
autocomplete: CompletionSource;
[key: string]: any;
}

export interface YfmLangOptions {
languageData?: LanguageData[];
}

const mdAutocomplete: LanguageData = {
autocomplete: (context) => {
// TODO: add more actions and re-enable
// let word = context.matchBefore(/\/.*/);
// if (word) {
// return {
// from: word.from,
// options: [
// ...yfmNoteTypes.map<Completion>((type, index) => ({
// label: `/yfm note ${type}`,
// displayLabel: `YFM Note ${capitalize(type)}`,
// type: 'text',
// apply: yfmNoteSnippets[type],
// boost: -index,
// })),
// {
// label: '/yfm cut',
// displayLabel: 'YFM Cut',
// type: 'text',
// apply: yfmCutSnippet,
// },
// ],
// };
// }
const word = context.matchBefore(/^.*/);
if (word?.text.startsWith('{%')) {
return {
from: word.from,
options: [
...yfmNoteTypes.map<Completion>((type, index) => ({
label: `{% note ${type}`,
displayLabel: capitalize(type),
type: 'text',
section: 'YFM Note',
apply: yfmNoteSnippets[type],
boost: -index,
})),
{
label: '{% cut',
displayLabel: 'YFM Cut',
type: 'text',
apply: yfmCutSnippet,
},
],
};
}
return null;
},
};

export function yfmLang({languageData = []}: YfmLangOptions = {}): Extension {
const mdSupport = markdown({
// defaultCodeLanguage: markdownLanguage,
base: markdownLanguage,
Expand All @@ -85,55 +144,9 @@ export function yfmLang(): Extension {
extensions: [UnderlineExtension, MonospaceExtension, MarkedExtension],
});

const mdAutocomplete: {autocomplete: CompletionSource} = {
autocomplete: (context) => {
// TODO: add more actions and re-enable
// let word = context.matchBefore(/\/.*/);
// if (word) {
// return {
// from: word.from,
// options: [
// ...yfmNoteTypes.map<Completion>((type, index) => ({
// label: `/yfm note ${type}`,
// displayLabel: `YFM Note ${capitalize(type)}`,
// type: 'text',
// apply: yfmNoteSnippets[type],
// boost: -index,
// })),
// {
// label: '/yfm cut',
// displayLabel: 'YFM Cut',
// type: 'text',
// apply: yfmCutSnippet,
// },
// ],
// };
// }
const word = context.matchBefore(/^.*/);
if (word?.text.startsWith('{%')) {
return {
from: word.from,
options: [
...yfmNoteTypes.map<Completion>((type, index) => ({
label: `{% note ${type}`,
displayLabel: capitalize(type),
type: 'text',
section: 'YFM Note',
apply: yfmNoteSnippets[type],
boost: -index,
})),
{
label: '{% cut',
displayLabel: 'YFM Cut',
type: 'text',
apply: yfmCutSnippet,
},
],
};
}
return null;
},
};

return [mdSupport, mdSupport.language.data.of(mdAutocomplete)];
return [
mdSupport,
mdSupport.language.data.of(mdAutocomplete),
languageData.map((item) => mdSupport.language.data.of(item)),
];
}