Repository navigation
Javascript lexer improvements - #773
gitaarik wants to merge 2 commits into
Conversation
Sorry, something went wrong.
Codecov Report
@@ Coverage Diff @@
## master #773 +/- ##
=============================
=============================
Continue to review full report at Codecov.
|
Sorry, something went wrong.
|
Hi @akx . I've been working on this feature for a while. In my setup I need these changes. However I have some problems when using my own fork in my project. So I have some questions regarding using a fork of babel in my project, and also what needs to be done to get this merged, so I don't have to use my fork anymore. In my project, which uses Pipenv. Inside the Pipfile, I use a VCS descriptor to specify my python-babel fork: babel = {editable = true, ref = "javascript-improvements-1", git = "https://github.com/gitaarik/babel"}
This works partly. When I run python-babel's babel.messages.extract.extract_from_dir, it finds gettext() functions that it didn't found before. However, when I run my Django devserver, on some requests (not all of them, I'm not sure yet why it only happens on some requests), the request fails with a exception coming from python-babel: RuntimeError: The babel data files are not available. This usually happens because you are using a source checkout from Babel and you did not build the data files. Just make sure to run "python setup.py import_cldr" before installing the library. I noticed that when I go into the virtualenv directory (which is created by Pipenv and can be retrieved with pipenv --venv) and then from there go to src/babel/, I can run the command python setup.py import_cld to generate the locale files and then it seems to work. I will have to look into the possibilities to integrate this in my project in a way that the locale files would be generated when I build and deploy my project. In the mean time it would be good for us if the changes would eventually be merged into the official package. So I have two questions:
|
Sorry, something went wrong.
|
Closing this MR now, because I splitted this one up in 2 separate MRs:
Please review and reply in the appropriate new MRs. |
Sorry, something went wrong.
Add option parse_template_string that improves parsing of javascript templates expressions, like:
`${gettext('my text')}`And it also works with nested expressions like:
${`some text ${gettext('my text')} more text`}You have to enable template string extraction with an option in the option_map:
extract_from_dir( # ... options_map={ '**': {'parse_template_string': True} } )Then it should work.
On this branch I also fixed another issue that I was facing. In a JS library that I use, there was regex with a / inside a character class [a-z]. The babel JS lexer thought this closed the regex, but JavaScript allows this as a normal match character within a character class, and does not close the regex. I updated the regex so that it will cover this exception.