Merge branch '5.2' into 5.3

[GitHub/WoltLab/WCF.git] / wcfsetup / install / files / js / 3rdParty / prism / components / prism-elixir.js

diff --git a/wcfsetup/install/files/js/3rdParty/prism/components/prism-elixir.js b/wcfsetup/install/files/js/3rdParty/prism/components/prism-elixir.js
index a38beda6c8c07b65e2598ddf6bc83438e28bd87d..2ebdf3784083589addf0624709d38984a4cad7ae 100644 (file)
--- a/wcfsetup/install/files/js/3rdParty/prism/components/prism-elixir.js
+++ b/wcfsetup/install/files/js/3rdParty/prism/components/prism-elixir.js
@@ -9,7 +9,7 @@ Prism.languages.elixir = {
        'string': [
                {
                        // ~s"""foo""" (multi-line), ~s'''foo''' (multi-line), ~s/foo/, ~s|foo|, ~s"foo", ~s'foo', ~s(foo), ~s[foo], ~s{foo} (with interpolation care), ~s<foo>
-                       pattern: /~[cCsSwW](?:("""|''')(?:\\[\s\S]|(?!\1)[^\\])+\1|([\/|"'])(?:\\.|(?!\2)[^\\\r\n])+\2|\((?:\\.|[^\\)\r\n])+\)|\[(?:\\.|[^\\\]\r\n])+\]|\{(?:\\.|#\{[^}]+\}|[^\\}\r\n])+\}|<(?:\\.|[^\\>\r\n])+>)[csa]?/,
+                       pattern: /~[cCsSwW](?:("""|''')(?:\\[\s\S]|(?!\1)[^\\])+\1|([\/|"'])(?:\\.|(?!\2)[^\\\r\n])+\2|\((?:\\.|[^\\)\r\n])+\)|\[(?:\\.|[^\\\]\r\n])+\]|\{(?:\\.|#\{[^}]+\}|#(?!\{)|[^#\\}\r\n])+\}|<(?:\\.|[^\\>\r\n])+>)[csa]?/,
                        greedy: true,
                        inside: {
                                // See interpolation below
@@ -38,7 +38,7 @@ Prism.languages.elixir = {
                alias: 'symbol'
        },
        // Look-ahead prevents bad highlighting of the :: operator
-       'attr-name': /\w+:(?!:)/,
+       'attr-name': /\w+\??:(?!:)/,
        'capture': {
                // Look-behind prevents bad highlighting of the && operator
                pattern: /(^|[^&])&(?:[^&\s\d()][^\s()]*|(?=\())/,