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

Jump to bottom

Markup: Added support for CSS and JS inside of CDATAs #1660

Merged
merged 5 commits into from Mar 4, 2019
Merged

Markup: Added support for CSS and JS inside of CDATAs #1660

merged 5 commits into from Mar 4, 2019

Conversation

RunDevelopment
Copy link
Member

This PR adds resolves #1656.

image

ExE-Boss
ExE-Boss approved these changes Dec 24, 2018
View reviewed changes
Copy link
Contributor

@ExE-Boss ExE-Boss left a comment •
edited

Choose a reason for hiding this comment

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

LGTM, r+

P.S.: What about the case when there are multiple CDATA sections in the script or style elements?

Or when the CDATA section has non‑whitespace characters before or after the CDATA tags?

@RunDevelopment
Copy link
Member Author

I should have asked this a lot sooner but is that even valid (X)HTML?

It looks valid but I wasn't able to get any browser to parse a CDATA in a script element (in HTML) correctly when containing a "</script>" string. I think HTML ignores CDATAs because script and style tags are parsed like CDATA content anyway (without the closing ]]> of course).
I wasn't even able to get XHTML to recognize CDATA at all.
(All findings for Chrome, FF, IE)

So, what is this change for?
Because if it's for XML, then you won't like #1603.

@ExE-Boss
Copy link
Contributor

It’s for XHTML, and from my testing (in Firefox) XHTML supports CDATA.

Also, are you sure you weren’t accidentally loading the XHTML document as HTML?

@RunDevelopment
Copy link
Member Author

RunDevelopment commented Dec 24, 2018 •
edited

Are you sure you weren’t accidentally loading the XHTML document as HTML?

Pretty sure. I got an error message that the <!CDATA[[ inside script cannot be parsed which I don't get in HTML.
But maybe I'm doing something wrong. Could you please provide an example of a valid XHTML page with CDATAs?

Edit:

I got it working. It's <![CDATA[ and not <!CDATA[[. My bad.

@RunDevelopment
Copy link
Member Author

Any number of CDATA can now be included in <style> and <script> tags.

The whole job is done by Prism.languages.markup.tag.addInlined (rename this?) which adds support for languages which are contained by special tags such as <style>.

(I actually wanted to add this function to markup instead of markup.tag but that means that addInlined will be lost after insertBefore.)

ExE-Boss
ExE-Boss approved these changes Jan 19, 2019
View reviewed changes
Copy link
Contributor

@ExE-Boss ExE-Boss left a comment

Choose a reason for hiding this comment

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

LGTM, r+

@ExE-Boss
Copy link
Contributor

This needs rebasing.

(also, I thought this was merged already)

@ExE-Boss ExE-Boss mentioned this pull request Feb 13, 2019
Closed
@ExE-Boss
Copy link
Contributor

ExE-Boss commented Mar 3, 2019

review?(@mAAdhaTTah)

@RunDevelopment
Copy link
Member Author

Sorry @ExE-Boss!
I completely forgot about this. I'll make it ready tomorrow.

@RunDevelopment RunDevelopment merged commit 5712770 into PrismJS:master Mar 4, 2019
@RunDevelopment RunDevelopment deleted the cdata-script-style branch March 4, 2019 22:12
This was referenced Mar 9, 2019
Closed
Merged
@ExE-Boss ExE-Boss mentioned this pull request Mar 25, 2019
Merged
schalkneethling pushed a commit to mdn/kuma that referenced this pull request Mar 27, 2019
@ExE-Boss
Fix bug 1538693: Update Prism to version 1.16 (#5313)
7e31be1 
Resolves [bug 1538693](https://bugzilla.mozilla.org/show_bug.cgi?id=1538693).

<!--
# ------------------------ >8 ------------------------
Remove everything below this line from the commit message
-->

<details><summary>
<h2>Kuma affecting changes:</h2>
<table><td>
📝 <strong>Note:</strong> See <a href="https://github.com/PrismJS/prism/releases/tag/v1.16.0">PrismJS/prism@v1.16.0</a> for a full list of changes.
</td></table></summary>

### Updated components

* __C__
	* Improve C language (PrismJS/prism#1697) PrismJS/prism@7eccea5c
* __C-like__
	* Simplify function pattern of C-like language (PrismJS/prism#1552) PrismJS/prism@b520e1b6
* __C/C++/Java__
	* Operator fixes (PrismJS/prism#1528) PrismJS/prism@7af8f8be
* __CSS__
	* Fix tokenizing !important (PrismJS/prism#1585) PrismJS/prism@c1d6cb85
	* Added the comma to the list of CSS punctuation PrismJS/prism@7ea2ff28
	* CSS: Comma punctuation (PrismJS/prism#1632) PrismJS/prism@1b812386
	* Reuse CSS selector pattern in CSS Extras (PrismJS/prism#1637) PrismJS/prism@e2f2fd19
	* Fixed CSS extra variable (PrismJS/prism#1649) PrismJS/prism@9de47d3a
	* Identify CSS units and variables (PrismJS/prism#1450) PrismJS/prism@5fcee966
	* Allow multiline CSS at-rules (PrismJS/prism#1676) PrismJS/prism@4f6f3c7d
	* CSS: Highlight attribute selector (PrismJS/prism#1671) PrismJS/prism@245b59d4
	* CSS: Selectors can contain any string (PrismJS/prism#1638) PrismJS/prism@a2d445d0
	* CSS extras: Highlighting for pseudo class arguments (PrismJS/prism#1650) PrismJS/prism@70a40414
* __Java__
	* Add Java 10 support (PrismJS/prism#1549) PrismJS/prism@8c981a22
	* Added module keywords to Java. (PrismJS/prism#1655) PrismJS/prism@6e250a5f
	* Improve Java (PrismJS/prism#1474) PrismJS/prism@81bd8f0b
* __JavaScript__
	* Fix regex for `catch` and `finally` (PrismJS/prism#1527) PrismJS/prism@ebd1b9a6
	* Highlighting of supposed classes and functions (PrismJS/prism#1482) PrismJS/prism@c40f6047
	* Added support for JS BigInt literals (PrismJS/prism#1542) PrismJS/prism@2b62e57b
	* Fixed lowercase supposed class names (PrismJS/prism#1544) PrismJS/prism@a47c05ad
	* Fixes regex for JS examples (PrismJS/prism#1591) PrismJS/prism@b41fb8f1
	* Improve regex detection in JS (PrismJS/prism#1473) PrismJS/prism@2a4758ab
	* Identify JavaScript function parameters (PrismJS/prism#1446) PrismJS/prism@0cc8c56a
	* Improved JavaScript parameter recognization (PrismJS/prism#1722) PrismJS/prism@57a92035
	* Make `undefined` a keyword in JS (PrismJS/prism#1740) PrismJS/prism@d9fa29a8
	* Fix `function-variable` in JS (PrismJS/prism#1739) PrismJS/prism@bfbea4d6
	* Improved JS constant pattern (PrismJS/prism#1737) PrismJS/prism@7bcec584
	* Improved JS function pattern (PrismJS/prism#1736) PrismJS/prism@8378ac83
	* JS: Fixed variables named "async" (PrismJS/prism#1738) PrismJS/prism@3560c643
	* JS: Keyword fix (PrismJS/prism#1808) PrismJS/prism@f2d8e1c7
* __JSON__ / __JSONP__
	* Fix bugs in JSON language (PrismJS/prism#1479) PrismJS/prism@74fe81c6
	* Adds support for comments in JSON (PrismJS/prism#1595) PrismJS/prism@8720b3e6
	* Cleaned up JSON (PrismJS/prism#1596) PrismJS/prism@da474c77
	* Added `keyword` alias to JSON's `null` (PrismJS/prism#1733) PrismJS/prism@eee06649
	* Fix JSONP support (PrismJS/prism#1745) PrismJS/prism@b5041cf9
	* Fixed JSON/JSONP examples (PrismJS/prism#1765) PrismJS/prism@ae4842db
* __Markup__
	* Decouple XML from Markup (PrismJS/prism#1603) PrismJS/prism@0030a4ef
	* Fix for markup attributes (PrismJS/prism#1752) PrismJS/prism@c3862a24
	* Markup: Added support for CSS and JS inside of CDATAs (PrismJS/prism#1660) PrismJS/prism@57127701
	* Markup `addInline` improvements (PrismJS/prism#1798) PrismJS/prism@af67c32e
* __Rust__
	* Add missing keywords (PrismJS/prism#1634) PrismJS/prism@3590edde

### Updated plugins

* Better class name detection for plugins (PrismJS/prism#1772) PrismJS/prism@c9762c6f
* __Line Numbers__
	* Added inheritance for the `line-numbers` class (PrismJS/prism#1799) PrismJS/prism@14be7489

### Other changes

* __Core__
	* `insertBefore` now correctly updates references (PrismJS/prism#1531) PrismJS/prism@9dfec340
	* Invoke `callback` after `after-highlight` hook (PrismJS/prism#1588) PrismJS/prism@bfbe4464
	* Improve `Prism.util.type` performance (PrismJS/prism#1545) PrismJS/prism@2864fe24
	* Remove unused `insertBefore` overload (PrismJS/prism#1631) PrismJS/prism@39686e12
	* Ignore duplicates in insertBefore (PrismJS/prism#1628) PrismJS/prism@d33d259c
	* Remove the Prism.tokenize language parameter (PrismJS/prism#1654) PrismJS/prism@fbf0b094
	* Call `insert-before` hook properly (PrismJS/prism#1709) PrismJS/prism@393ab164
	* Improved languages.DFS and util.clone (PrismJS/prism#1506) PrismJS/prism@152a68ef
	* Core: Avoid redeclaring variables in util.clone (PrismJS/prism#1778) PrismJS/prism@b06f532f
	* Made prism-core a little more editor friendly (PrismJS/prism#1776) PrismJS/prism@bac09f0a
	* Applied Array.isArray (PrismJS/prism#1804) PrismJS/prism@11d0f75e

</details>

---

review?(@jwhitlock)
This was referenced Oct 26, 2019
Open
Open
@snyk-bot snyk-bot mentioned this pull request Mar 8, 2020
Open
@snyk-bot snyk-bot mentioned this pull request Mar 21, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ExE-Boss ExE-Boss ExE-Boss approved these changes

Assignees
No one assigned
Labels
bug language-definitions needs review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix case when <script> or <style> contains a <!⁠[CDATA[…]]> section
2 participants
@RunDevelopment @ExE-Boss