Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(regression): remove overly strict invalid tag format check in Swig parser #5691

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
merged 7 commits into from
Oct 24, 2025
Merged

fix(regression): remove overly strict invalid tag format check in Swig parser #5691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
37403c0
fix(regression): remove overly strict invalid tag format check in Swi…
D-Sketon Sep 21, 2025
989b59d
Merge branch 'master' into fix/8.0.0-1
D-Sketon Oct 1, 2025
f888875
Merge branch 'master' into fix/8.0.0-1
D-Sketon Oct 7, 2025
dd4e3ed
Merge branch 'master' into fix/8.0.0-1
D-Sketon Oct 16, 2025
863dd2e
Merge branch 'master' into fix/8.0.0-1
D-Sketon Oct 24, 2025
92017bd
Merge branch 'master' into fix/8.0.0-1
D-Sketon Oct 24, 2025
392953c
Merge branch 'master' into fix/8.0.0-1
stevenjoezhang Oct 24, 2025
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
8 changes: 1 addition & 7 deletions lib/hexo/post.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,7 @@ class PostRenderEscape {
swig_string_quote = '';
}
}
// {% } or {% %
if (((char !== '%' && next_char === '}') || (char === '%' && next_char !== '}')) && swig_string_quote === '') {
// From swig back to plain text
swig_tag_name = '';
state = STATE_PLAINTEXT;
pushAndReset(`{%${str.slice(buffer_start, idx)}${char}`);
} else if (char === '%' && next_char === '}' && swig_string_quote === '') { // From swig back to plain text
if (char === '%' && next_char === '}' && swig_string_quote === '') { // From swig back to plain text
idx++;
if (swig_tag_name !== '' && str.includes(`end${swig_tag_name}`)) {
state = STATE_SWIG_FULL_TAG;
Expand Down
47 changes: 47 additions & 0 deletions test/scripts/hexo/post.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1525,6 +1525,53 @@ describe('Post', () => {
data.content.should.contains('22222');
});

it('render() - tags with swig character', async () => {
const tagSpy = spy();
hexo.extend.tag.register('testTag', (args, content) => {
tagSpy(args, content);
return '';
}, {
ends: true
});
let content = '{% testTag 111 222 %}\n3333\n{% endtestTag %}';
await post.render('', {
content,
engine: 'markdown'
});
tagSpy.calledOnce.should.be.true;
tagSpy.firstCall.args[0].should.eql(['111', '222']);
tagSpy.firstCall.args[1].should.eql('3333');

content = '{% testTag 111% % 222 %}\n333\n{% endtestTag %}';
await post.render('', {
content,
engine: 'markdown'
});
tagSpy.calledTwice.should.be.true;
tagSpy.secondCall.args[0].should.eql(['111%', '%', '222']);
tagSpy.secondCall.args[1].should.eql('333');

content = '{% testTag 111 } 222} %}\n333\n{% endtestTag %}';
await post.render('', {
content,
engine: 'markdown'
});
tagSpy.calledThrice.should.be.true;
tagSpy.thirdCall.args[0].should.eql(['111', '}', '222}']);
tagSpy.thirdCall.args[1].should.eql('333');

content = '{% testTag 111 222 %}\n333% % } %}\n{% endtestTag %}';
await post.render('', {
content,
engine: 'markdown'
});
tagSpy.callCount.should.eql(4);
tagSpy.getCall(3).args[0].should.eql(['111', '222']);
tagSpy.getCall(3).args[1].should.eql('333% % } %}');

hexo.extend.tag.unregister('testTag');
});

it('render() - incomplete tags throw error', async () => {
const content = 'nunjucks should throw {# } error';

Expand Down
Loading