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

(twig) update list of filter and tags #2090

Merged
merged 5 commits into from Oct 25, 2019
Merged

(twig) update list of filter and tags #2090

merged 5 commits into from Oct 25, 2019

Conversation

javiereguiluz
Copy link
Contributor

Updated according to the latest Twig documentation which can be found here: https://twig.symfony.com/doc/2.x/

@marcoscaceres
Copy link
Contributor

@javiereguiluz could you please check why TravisCI is failing?

@marcoscaceres
Copy link
Contributor

Looks like this change causes the related test for this language to fail... @javiereguiluz or @weaverryan could you please update the test to reflect the new output.

@javiereguiluz
Copy link
Contributor Author

I'll need some help trying to fix the tests. I can't even run the test on my machine: node tools/build.js shows some errors and npm run test fails too 😢 Thanks!

@egor-rogov
Copy link
Collaborator

@javiereguiluz,
what (exact) error messages you got?

You can also look into Travis job log (Details link to the right of "The Travis CI build failed" message). It shows that template_tags markup test is failed and gives you found/expected strings.

@joshgoebel
Copy link
Member

@javiereguiluz Can you look into the failing tests and provide an updated PR?

@joshgoebel
Copy link
Member

@javiereguiluz Still around? Ping.

@joshgoebel joshgoebel added language enhancement An enhancement or new feature labels Oct 24, 2019
Copy link

@weaverryan weaverryan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Javier - I have some simple ideas that I think will get the tests passing :)

'merge nl2br number_format raw replace reverse round slice sort split ' +
'striptags title trim upper url_encode',
'abs batch capitalize column convert_encoding date date_modify default ' +
'escape filter first format inky inline_css join json_encode keys last ' +

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now inky_to_html

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And does inky stay as deprecated?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. We could do either: inky is deprecated... but it was from such a new feature, that it only existed for some months before being deprecated. Having it or removing it - both are probably fine.

src/languages/twig.js Show resolved Hide resolved
@joshgoebel
Copy link
Member

@weaverryan Any chance you have the motivation to jump in here and push this to competition? You could branch from this branch and just lay the tiny changes you need to fix the relevancy on top and make a new PR.

@joshgoebel joshgoebel added this to Backlog in Highlight.js Oct 25, 2019
@javiereguiluz
Copy link
Contributor Author

@yyyc514 I'm really sorry for not having replied to your messages. I did the the changes proposed by Ryan. Let's see if it fixes the issues. Thanks.

@joshgoebel joshgoebel changed the title Updated the list of Twig filter and tags (twig) update list of filter and tags Oct 25, 2019
contains: [
FUNCTIONS
]
};

var TAGS = 'autoescape block do embed extends filter flush for ' +
'if import include macro sandbox set spaceless use verbatim';
var TAGS = 'apply autoescape block deprecated do embed extends filter flush for from' +
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing a space here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So you broke the if endif tags...

@joshgoebel joshgoebel moved this from Backlog to In Progress in Highlight.js Oct 25, 2019
@joshgoebel
Copy link
Member

@javiereguiluz Thanks so much for contributing! Sorry it took so long to get to this!

@joshgoebel
Copy link
Member

This should go out in 9.15.11 over the weekend.

@joshgoebel joshgoebel merged commit 5411884 into highlightjs:master Oct 25, 2019
Highlight.js automation moved this from In Progress to Done Oct 25, 2019
@javiereguiluz
Copy link
Contributor Author

@yyyc514 thanks a lot for merging this! I apologize again for not having replied to your requests on time. Cheers!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement An enhancement or new feature language
Projects
No open projects
Highlight.js
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

5 participants