mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-03-25 02:41:07 +01:00
Small tweak
This commit is contained in:
@@ -10,28 +10,20 @@ import { parser as twigParser } from './twig';
|
|||||||
|
|
||||||
export function twig(base: LanguageSupport, autocomplete?: GenericCompletionConfig) {
|
export function twig(base: LanguageSupport, autocomplete?: GenericCompletionConfig) {
|
||||||
const language = mixLanguage(base);
|
const language = mixLanguage(base);
|
||||||
|
const completion = language.data.of({ autocomplete: completions });
|
||||||
|
const completionBase = base.language.data.of({ autocomplete: completions });
|
||||||
const additionalCompletion = autocomplete
|
const additionalCompletion = autocomplete
|
||||||
? [language.data.of({ autocomplete: genericCompletion(autocomplete) })]
|
? [language.data.of({ autocomplete: genericCompletion(autocomplete) })]
|
||||||
: [];
|
: [];
|
||||||
const completion = language.data.of({
|
|
||||||
autocomplete: completions,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (base) {
|
return [
|
||||||
const completionBase = base.language.data.of({
|
language,
|
||||||
autocomplete: completions,
|
completion,
|
||||||
});
|
completionBase,
|
||||||
return [
|
base.support,
|
||||||
language,
|
placeholders,
|
||||||
completion,
|
...additionalCompletion,
|
||||||
completionBase,
|
];
|
||||||
base.support,
|
|
||||||
// placeholders,
|
|
||||||
...additionalCompletion,
|
|
||||||
];
|
|
||||||
} else {
|
|
||||||
return [language, completion, placeholders];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function mixLanguage(base: LanguageSupport): LRLanguage {
|
function mixLanguage(base: LanguageSupport): LRLanguage {
|
||||||
@@ -39,7 +31,6 @@ function mixLanguage(base: LanguageSupport): LRLanguage {
|
|||||||
|
|
||||||
const parser = twigParser.configure({
|
const parser = twigParser.configure({
|
||||||
wrap: parseMixed((node) => {
|
wrap: parseMixed((node) => {
|
||||||
console.log('HELLO', node.type.name, node.type.isTop);
|
|
||||||
// If the base language is text, we can overwrite at the top
|
// If the base language is text, we can overwrite at the top
|
||||||
if (base.language.name !== textLanguageName && !node.type.isTop) {
|
if (base.language.name !== textLanguageName && !node.type.isTop) {
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
Reference in New Issue
Block a user