This commit is contained in:
Matt Vague 2021-04-04 18:19:14 -07:00
parent 5e4b3f14ae
commit 9928c69e43

View file

@ -27,8 +27,6 @@ const EMPTY_ELEMENTS: string[] = [
export const conf: languages.LanguageConfiguration = { export const conf: languages.LanguageConfiguration = {
wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g, wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g,
// TODO support if,else,elseif,for,in and other built in keywords
brackets: [ brackets: [
['<!--', '-->'], ['<!--', '-->'],
['<', '>'], ['<', '>'],
@ -164,11 +162,9 @@ export const language = <languages.IMonarchLanguage>{
symbol: /[=><!]+/, symbol: /[=><!]+/,
identifier: /[a-zA-Z_][\w]*/, identifier: /[a-zA-Z_][\w]*/,
// The main tokenizer for our languages
tokenizer: { tokenizer: {
root: [ root: [
[/\{\%\s*comment\s*\%\}/, 'comment.start.liquid', '@comment'], [/\{\%\s*comment\s*\%\}/, 'comment.start.liquid', '@comment'],
// [/\{\%\s*raw\s*\%\}/, 'delimiter.tag', '@raw'],
[/\{\{/, { token: '@rematch', switchTo: '@liquidState.root' }], [/\{\{/, { token: '@rematch', switchTo: '@liquidState.root' }],
[/\{\%/, { token: '@rematch', switchTo: '@liquidState.root' }], [/\{\%/, { token: '@rematch', switchTo: '@liquidState.root' }],
[/(<)(\w+)(\/>)/, ['delimiter.html', 'tag.html', 'delimiter.html']], [/(<)(\w+)(\/>)/, ['delimiter.html', 'tag.html', 'delimiter.html']],