From 63c0c261fa0d8e4a30c97dc56f842f9326ee4606 Mon Sep 17 00:00:00 2001 From: RunDevelopment Date: Tue, 18 Dec 2018 16:05:05 +0100 Subject: [PATCH 01/12] First draft --- components.js | 2 +- components.json | 4 ++ components/prism-regex-javascript.js | 50 +++++++++++++++++++ components/prism-regex-javascript.min.js | 1 + plugins/show-language/prism-show-language.js | 2 +- .../show-language/prism-show-language.min.js | 2 +- 6 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 components/prism-regex-javascript.js create mode 100644 components/prism-regex-javascript.min.js diff --git a/components.js b/components.js index 04e3207f5e..c7a7b35f6e 100644 --- a/components.js +++ b/components.js @@ -1,2 +1,2 @@ -var components = {"core":{"meta":{"path":"components/prism-core.js","option":"mandatory"},"core":"Core"},"themes":{"meta":{"path":"themes/{id}.css","link":"index.html?theme={id}","exclusive":true},"prism":{"title":"Default","option":"default"},"prism-dark":"Dark","prism-funky":"Funky","prism-okaidia":{"title":"Okaidia","owner":"ocodia"},"prism-twilight":{"title":"Twilight","owner":"remybach"},"prism-coy":{"title":"Coy","owner":"tshedor"},"prism-solarizedlight":{"title":"Solarized Light","owner":"hectormatos2011 "},"prism-tomorrow":{"title":"Tomorrow Night","owner":"Rosey"}},"languages":{"meta":{"path":"components/prism-{id}","noCSS":true,"examplesPath":"examples/prism-{id}","addCheckAll":true},"markup":{"title":"Markup","alias":["html","xml","svg","mathml"],"aliasTitles":{"html":"HTML","xml":"XML","svg":"SVG","mathml":"MathML"},"option":"default"},"css":{"title":"CSS","option":"default","peerDependencies":"markup"},"clike":{"title":"C-like","option":"default","overrideExampleHeader":true},"javascript":{"title":"JavaScript","require":"clike","peerDependencies":"markup","alias":"js","option":"default"},"abap":{"title":"ABAP","owner":"dellagustin"},"actionscript":{"title":"ActionScript","require":"javascript","peerDependencies":"markup","owner":"Golmote"},"ada":{"title":"Ada","owner":"Lucretia"},"apacheconf":{"title":"Apache Configuration","owner":"GuiTeK"},"apl":{"title":"APL","owner":"ngn"},"applescript":{"title":"AppleScript","owner":"Golmote"},"arduino":{"title":"Arduino","require":"cpp","owner":"eisbehr-"},"arff":{"title":"ARFF","owner":"Golmote"},"asciidoc":{"title":"AsciiDoc","owner":"Golmote"},"asm6502":{"title":"6502 Assembly","owner":"kzurawel"},"aspnet":{"title":"ASP.NET (C#)","require":["markup","csharp"],"owner":"nauzilus"},"autohotkey":{"title":"AutoHotkey","owner":"aviaryan"},"autoit":{"title":"AutoIt","owner":"Golmote"},"bash":{"title":"Bash","alias":"shell","aliasTitles":{"shell":"Shell"},"owner":"zeitgeist87"},"basic":{"title":"BASIC","owner":"Golmote"},"batch":{"title":"Batch","owner":"Golmote"},"bison":{"title":"Bison","require":"c","owner":"Golmote"},"brainfuck":{"title":"Brainfuck","owner":"Golmote"},"bro":{"title":"Bro","owner":"wayward710"},"c":{"title":"C","require":"clike","owner":"zeitgeist87"},"csharp":{"title":"C#","require":"clike","alias":"dotnet","owner":"mvalipour"},"cpp":{"title":"C++","require":"c","owner":"zeitgeist87"},"cil":{"title":"CIL","owner":"sbrl"},"coffeescript":{"title":"CoffeeScript","require":"javascript","owner":"R-osey"},"clojure":{"title":"Clojure","owner":"troglotit"},"crystal":{"title":"Crystal","require":"ruby","owner":"MakeNowJust"},"csp":{"title":"Content-Security-Policy","owner":"ScottHelme"},"css-extras":{"title":"CSS Extras","require":"css","owner":"milesj"},"d":{"title":"D","require":"clike","owner":"Golmote"},"dart":{"title":"Dart","require":"clike","owner":"Golmote"},"diff":{"title":"Diff","owner":"uranusjr"},"django":{"title":"Django/Jinja2","require":"markup","peerDependencies":["css","javascript"],"alias":"jinja2","owner":"romanvm"},"docker":{"title":"Docker","alias":"dockerfile","owner":"JustinBeckwith"},"eiffel":{"title":"Eiffel","owner":"Conaclos"},"elixir":{"title":"Elixir","owner":"Golmote"},"elm":{"title":"Elm","owner":"zwilias"},"erb":{"title":"ERB","require":["ruby","markup-templating"],"owner":"Golmote"},"erlang":{"title":"Erlang","owner":"Golmote"},"fsharp":{"title":"F#","require":"clike","owner":"simonreynolds7"},"flow":{"title":"Flow","require":"javascript","owner":"Golmote"},"fortran":{"title":"Fortran","owner":"Golmote"},"gcode":{"title":"G-code","owner":"RunDevelopment"},"gedcom":{"title":"GEDCOM","owner":"Golmote"},"gherkin":{"title":"Gherkin","owner":"hason"},"git":{"title":"Git","owner":"lgiraudel"},"glsl":{"title":"GLSL","require":"clike","owner":"Golmote"},"gml":{"title":"GameMaker Language","alias":"gamemakerlanguage","require":"clike","owner":"LiarOnce"},"go":{"title":"Go","require":"clike","owner":"arnehormann"},"graphql":{"title":"GraphQL","owner":"Golmote"},"groovy":{"title":"Groovy","require":"clike","owner":"robfletcher"},"haml":{"title":"Haml","require":"ruby","peerDependencies":["css","coffeescript","erb","javascript","less","markdown","ruby","scss","textile"],"owner":"Golmote"},"handlebars":{"title":"Handlebars","require":"markup-templating","owner":"Golmote"},"haskell":{"title":"Haskell","owner":"bholst"},"haxe":{"title":"Haxe","require":"clike","owner":"Golmote"},"http":{"title":"HTTP","peerDependencies":["javascript","markup"],"owner":"danielgtaylor"},"hpkp":{"title":"HTTP Public-Key-Pins","owner":"ScottHelme"},"hsts":{"title":"HTTP Strict-Transport-Security","owner":"ScottHelme"},"ichigojam":{"title":"IchigoJam","owner":"BlueCocoa"},"icon":{"title":"Icon","owner":"Golmote"},"inform7":{"title":"Inform 7","owner":"Golmote"},"ini":{"title":"Ini","owner":"aviaryan"},"io":{"title":"Io","owner":"AlesTsurko"},"j":{"title":"J","owner":"Golmote"},"java":{"title":"Java","require":"clike","owner":"sherblot"},"javastacktrace":{"title":"Java stack trace","owner":"RunDevelopment"},"jolie":{"title":"Jolie","require":"clike","owner":"thesave"},"json":{"title":"JSON","alias":"jsonp","aliasTitles":{"jsonp":"JSONP"},"owner":"CupOfTea696"},"julia":{"title":"Julia","owner":"cdagnino"},"keyman":{"title":"Keyman","owner":"mcdurdin"},"kotlin":{"title":"Kotlin","require":"clike","owner":"Golmote"},"latex":{"title":"LaTeX","owner":"japborst"},"less":{"title":"Less","require":"css","owner":"Golmote"},"liquid":{"title":"Liquid","owner":"cinhtau"},"lisp":{"title":"Lisp","alias":["emacs","elisp","emacs-lisp"],"owner":"JuanCaicedo"},"livescript":{"title":"LiveScript","owner":"Golmote"},"lolcode":{"title":"LOLCODE","owner":"Golmote"},"lua":{"title":"Lua","owner":"Golmote"},"makefile":{"title":"Makefile","owner":"Golmote"},"markdown":{"title":"Markdown","require":"markup","owner":"Golmote"},"markup-templating":{"title":"Markup templating","require":"markup","owner":"Golmote"},"matlab":{"title":"MATLAB","owner":"Golmote"},"mel":{"title":"MEL","owner":"Golmote"},"mizar":{"title":"Mizar","owner":"Golmote"},"monkey":{"title":"Monkey","owner":"Golmote"},"n4js":{"title":"N4JS","require":"javascript","alias":"n4jsd","owner":"bsmith-n4"},"nasm":{"title":"NASM","owner":"rbmj"},"nginx":{"title":"nginx","owner":"westonganger","require":"clike"},"nim":{"title":"Nim","owner":"Golmote"},"nix":{"title":"Nix","owner":"Golmote"},"nsis":{"title":"NSIS","owner":"idleberg"},"objectivec":{"title":"Objective-C","require":"c","owner":"uranusjr"},"ocaml":{"title":"OCaml","owner":"Golmote"},"opencl":{"title":"OpenCL","require":"cpp","peerDependencies":["c","cpp"],"overrideExampleHeader":true,"owner":"Milania1"},"oz":{"title":"Oz","owner":"Golmote"},"parigp":{"title":"PARI/GP","owner":"Golmote"},"parser":{"title":"Parser","require":"markup","owner":"Golmote"},"pascal":{"title":"Pascal","alias":"objectpascal","aliasTitles":{"objectpascal":"Object Pascal"},"owner":"Golmote"},"perl":{"title":"Perl","owner":"Golmote"},"php":{"title":"PHP","require":["clike","markup-templating"],"owner":"milesj"},"php-extras":{"title":"PHP Extras","require":"php","owner":"milesj"},"plsql":{"title":"PL/SQL","require":"sql","owner":"Golmote"},"powershell":{"title":"PowerShell","owner":"nauzilus"},"processing":{"title":"Processing","require":"clike","owner":"Golmote"},"prolog":{"title":"Prolog","owner":"Golmote"},"properties":{"title":".properties","owner":"Golmote"},"protobuf":{"title":"Protocol Buffers","require":"clike","owner":"just-boris"},"pug":{"title":"Pug","require":"javascript","peerDependencies":["coffeescript","ejs","handlebars","hogan","less","livescript","markdown","mustache","plates","scss","stylus","swig"],"owner":"Golmote"},"puppet":{"title":"Puppet","owner":"Golmote"},"pure":{"title":"Pure","peerDependencies":["c","cpp","fortran","ats","dsp"],"owner":"Golmote"},"python":{"title":"Python","owner":"multipetros"},"q":{"title":"Q (kdb+ database)","owner":"Golmote"},"qore":{"title":"Qore","require":"clike","owner":"temnroegg"},"r":{"title":"R","owner":"Golmote"},"jsx":{"title":"React JSX","require":["markup","javascript"],"owner":"vkbansal"},"tsx":{"title":"React TSX","require":["jsx","typescript"]},"renpy":{"title":"Ren'py","owner":"HyuchiaDiego"},"reason":{"title":"Reason","require":"clike","owner":"Golmote"},"rest":{"title":"reST (reStructuredText)","owner":"Golmote"},"rip":{"title":"Rip","owner":"ravinggenius"},"roboconf":{"title":"Roboconf","owner":"Golmote"},"ruby":{"title":"Ruby","require":"clike","owner":"samflores"},"rust":{"title":"Rust","owner":"Golmote"},"sas":{"title":"SAS","owner":"Golmote"},"sass":{"title":"Sass (Sass)","require":"css","owner":"Golmote"},"scss":{"title":"Sass (Scss)","require":"css","owner":"MoOx"},"scala":{"title":"Scala","require":"java","owner":"jozic"},"scheme":{"title":"Scheme","owner":"bacchus123"},"smalltalk":{"title":"Smalltalk","owner":"Golmote"},"smarty":{"title":"Smarty","require":"markup-templating","owner":"Golmote"},"sql":{"title":"SQL","owner":"multipetros"},"soy":{"title":"Soy (Closure Template)","require":"markup-templating","owner":"Golmote"},"stylus":{"title":"Stylus","owner":"vkbansal"},"swift":{"title":"Swift","require":"clike","owner":"chrischares"},"tap":{"title":"TAP","owner":"isaacs","require":"yaml"},"tcl":{"title":"Tcl","owner":"PeterChaplin"},"textile":{"title":"Textile","require":"markup","peerDependencies":"css","owner":"Golmote"},"toml":{"title":"TOML","owner":"RunDevelopment"},"tt2":{"title":"Template Toolkit 2","require":["clike","markup-templating"],"owner":"gflohr"},"twig":{"title":"Twig","require":"markup","owner":"brandonkelly"},"typescript":{"title":"TypeScript","require":"javascript","alias":"ts","owner":"vkbansal"},"vbnet":{"title":"VB.Net","require":"basic","owner":"Bigsby"},"velocity":{"title":"Velocity","require":"markup","owner":"Golmote"},"verilog":{"title":"Verilog","owner":"a-rey"},"vhdl":{"title":"VHDL","owner":"a-rey"},"vim":{"title":"vim","owner":"westonganger"},"visual-basic":{"title":"Visual Basic","alias":"vb","owner":"Golmote"},"wasm":{"title":"WebAssembly","owner":"Golmote"},"wiki":{"title":"Wiki markup","require":"markup","owner":"Golmote"},"xeora":{"title":"Xeora","require":"markup","alias":"xeoracube","aliasTitles":{"xeoracube":"XeoraCube"},"owner":"freakmaxi"},"xojo":{"title":"Xojo (REALbasic)","owner":"Golmote"},"xquery":{"title":"XQuery","require":"markup","owner":"Golmote"},"yaml":{"title":"YAML","owner":"hason"}},"plugins":{"meta":{"path":"plugins/{id}/prism-{id}","link":"plugins/{id}/"},"line-highlight":"Line Highlight","line-numbers":{"title":"Line Numbers","owner":"kuba-kubula"},"show-invisibles":{"title":"Show Invisibles","after":["autolinker","data-uri-highlight"]},"autolinker":"Autolinker","wpd":"WebPlatform Docs","custom-class":{"title":"Custom Class","owner":"dvkndn","noCSS":true},"file-highlight":{"title":"File Highlight","noCSS":true},"show-language":{"title":"Show Language","owner":"nauzilus","noCSS":true,"require":"toolbar"},"jsonp-highlight":{"title":"JSONP Highlight","noCSS":true,"owner":"nauzilus"},"highlight-keywords":{"title":"Highlight Keywords","owner":"vkbansal","noCSS":true},"remove-initial-line-feed":{"title":"Remove initial line feed","owner":"Golmote","noCSS":true},"previewers":{"title":"Previewers","owner":"Golmote"},"autoloader":{"title":"Autoloader","owner":"Golmote","noCSS":true},"keep-markup":{"title":"Keep Markup","owner":"Golmote","after":"normalize-whitespace","noCSS":true},"command-line":{"title":"Command Line","owner":"chriswells0"},"unescaped-markup":"Unescaped Markup","normalize-whitespace":{"title":"Normalize Whitespace","owner":"zeitgeist87","after":"unescaped-markup","noCSS":true},"data-uri-highlight":{"title":"Data-URI Highlight","owner":"Golmote","noCSS":true},"toolbar":{"title":"Toolbar","owner":"mAAdhaTTah"},"copy-to-clipboard":{"title":"Copy to Clipboard Button","owner":"mAAdhaTTah","require":"toolbar","noCSS":true}}}; +var components = {"core":{"meta":{"path":"components/prism-core.js","option":"mandatory"},"core":"Core"},"themes":{"meta":{"path":"themes/{id}.css","link":"index.html?theme={id}","exclusive":true},"prism":{"title":"Default","option":"default"},"prism-dark":"Dark","prism-funky":"Funky","prism-okaidia":{"title":"Okaidia","owner":"ocodia"},"prism-twilight":{"title":"Twilight","owner":"remybach"},"prism-coy":{"title":"Coy","owner":"tshedor"},"prism-solarizedlight":{"title":"Solarized Light","owner":"hectormatos2011 "},"prism-tomorrow":{"title":"Tomorrow Night","owner":"Rosey"}},"languages":{"meta":{"path":"components/prism-{id}","noCSS":true,"examplesPath":"examples/prism-{id}","addCheckAll":true},"markup":{"title":"Markup","alias":["html","xml","svg","mathml"],"aliasTitles":{"html":"HTML","xml":"XML","svg":"SVG","mathml":"MathML"},"option":"default"},"css":{"title":"CSS","option":"default","peerDependencies":"markup"},"clike":{"title":"C-like","option":"default","overrideExampleHeader":true},"javascript":{"title":"JavaScript","require":"clike","peerDependencies":"markup","alias":"js","option":"default"},"abap":{"title":"ABAP","owner":"dellagustin"},"actionscript":{"title":"ActionScript","require":"javascript","peerDependencies":"markup","owner":"Golmote"},"ada":{"title":"Ada","owner":"Lucretia"},"apacheconf":{"title":"Apache Configuration","owner":"GuiTeK"},"apl":{"title":"APL","owner":"ngn"},"applescript":{"title":"AppleScript","owner":"Golmote"},"arduino":{"title":"Arduino","require":"cpp","owner":"eisbehr-"},"arff":{"title":"ARFF","owner":"Golmote"},"asciidoc":{"title":"AsciiDoc","owner":"Golmote"},"asm6502":{"title":"6502 Assembly","owner":"kzurawel"},"aspnet":{"title":"ASP.NET (C#)","require":["markup","csharp"],"owner":"nauzilus"},"autohotkey":{"title":"AutoHotkey","owner":"aviaryan"},"autoit":{"title":"AutoIt","owner":"Golmote"},"bash":{"title":"Bash","alias":"shell","aliasTitles":{"shell":"Shell"},"owner":"zeitgeist87"},"basic":{"title":"BASIC","owner":"Golmote"},"batch":{"title":"Batch","owner":"Golmote"},"bison":{"title":"Bison","require":"c","owner":"Golmote"},"brainfuck":{"title":"Brainfuck","owner":"Golmote"},"bro":{"title":"Bro","owner":"wayward710"},"c":{"title":"C","require":"clike","owner":"zeitgeist87"},"csharp":{"title":"C#","require":"clike","alias":"dotnet","owner":"mvalipour"},"cpp":{"title":"C++","require":"c","owner":"zeitgeist87"},"cil":{"title":"CIL","owner":"sbrl"},"coffeescript":{"title":"CoffeeScript","require":"javascript","owner":"R-osey"},"clojure":{"title":"Clojure","owner":"troglotit"},"crystal":{"title":"Crystal","require":"ruby","owner":"MakeNowJust"},"csp":{"title":"Content-Security-Policy","owner":"ScottHelme"},"css-extras":{"title":"CSS Extras","require":"css","owner":"milesj"},"d":{"title":"D","require":"clike","owner":"Golmote"},"dart":{"title":"Dart","require":"clike","owner":"Golmote"},"diff":{"title":"Diff","owner":"uranusjr"},"django":{"title":"Django/Jinja2","require":"markup","peerDependencies":["css","javascript"],"alias":"jinja2","owner":"romanvm"},"docker":{"title":"Docker","alias":"dockerfile","owner":"JustinBeckwith"},"eiffel":{"title":"Eiffel","owner":"Conaclos"},"elixir":{"title":"Elixir","owner":"Golmote"},"elm":{"title":"Elm","owner":"zwilias"},"erb":{"title":"ERB","require":["ruby","markup-templating"],"owner":"Golmote"},"erlang":{"title":"Erlang","owner":"Golmote"},"fsharp":{"title":"F#","require":"clike","owner":"simonreynolds7"},"flow":{"title":"Flow","require":"javascript","owner":"Golmote"},"fortran":{"title":"Fortran","owner":"Golmote"},"gcode":{"title":"G-code","owner":"RunDevelopment"},"gedcom":{"title":"GEDCOM","owner":"Golmote"},"gherkin":{"title":"Gherkin","owner":"hason"},"git":{"title":"Git","owner":"lgiraudel"},"glsl":{"title":"GLSL","require":"clike","owner":"Golmote"},"gml":{"title":"GameMaker Language","alias":"gamemakerlanguage","require":"clike","owner":"LiarOnce"},"go":{"title":"Go","require":"clike","owner":"arnehormann"},"graphql":{"title":"GraphQL","owner":"Golmote"},"groovy":{"title":"Groovy","require":"clike","owner":"robfletcher"},"haml":{"title":"Haml","require":"ruby","peerDependencies":["css","coffeescript","erb","javascript","less","markdown","ruby","scss","textile"],"owner":"Golmote"},"handlebars":{"title":"Handlebars","require":"markup-templating","owner":"Golmote"},"haskell":{"title":"Haskell","owner":"bholst"},"haxe":{"title":"Haxe","require":"clike","owner":"Golmote"},"http":{"title":"HTTP","peerDependencies":["javascript","markup"],"owner":"danielgtaylor"},"hpkp":{"title":"HTTP Public-Key-Pins","owner":"ScottHelme"},"hsts":{"title":"HTTP Strict-Transport-Security","owner":"ScottHelme"},"ichigojam":{"title":"IchigoJam","owner":"BlueCocoa"},"icon":{"title":"Icon","owner":"Golmote"},"inform7":{"title":"Inform 7","owner":"Golmote"},"ini":{"title":"Ini","owner":"aviaryan"},"io":{"title":"Io","owner":"AlesTsurko"},"j":{"title":"J","owner":"Golmote"},"java":{"title":"Java","require":"clike","owner":"sherblot"},"javastacktrace":{"title":"Java stack trace","owner":"RunDevelopment"},"jolie":{"title":"Jolie","require":"clike","owner":"thesave"},"json":{"title":"JSON","alias":"jsonp","aliasTitles":{"jsonp":"JSONP"},"owner":"CupOfTea696"},"julia":{"title":"Julia","owner":"cdagnino"},"keyman":{"title":"Keyman","owner":"mcdurdin"},"kotlin":{"title":"Kotlin","require":"clike","owner":"Golmote"},"latex":{"title":"LaTeX","owner":"japborst"},"less":{"title":"Less","require":"css","owner":"Golmote"},"liquid":{"title":"Liquid","owner":"cinhtau"},"lisp":{"title":"Lisp","alias":["emacs","elisp","emacs-lisp"],"owner":"JuanCaicedo"},"livescript":{"title":"LiveScript","owner":"Golmote"},"lolcode":{"title":"LOLCODE","owner":"Golmote"},"lua":{"title":"Lua","owner":"Golmote"},"makefile":{"title":"Makefile","owner":"Golmote"},"markdown":{"title":"Markdown","require":"markup","owner":"Golmote"},"markup-templating":{"title":"Markup templating","require":"markup","owner":"Golmote"},"matlab":{"title":"MATLAB","owner":"Golmote"},"mel":{"title":"MEL","owner":"Golmote"},"mizar":{"title":"Mizar","owner":"Golmote"},"monkey":{"title":"Monkey","owner":"Golmote"},"n4js":{"title":"N4JS","require":"javascript","alias":"n4jsd","owner":"bsmith-n4"},"nasm":{"title":"NASM","owner":"rbmj"},"nginx":{"title":"nginx","owner":"westonganger","require":"clike"},"nim":{"title":"Nim","owner":"Golmote"},"nix":{"title":"Nix","owner":"Golmote"},"nsis":{"title":"NSIS","owner":"idleberg"},"objectivec":{"title":"Objective-C","require":"c","owner":"uranusjr"},"ocaml":{"title":"OCaml","owner":"Golmote"},"opencl":{"title":"OpenCL","require":"cpp","peerDependencies":["c","cpp"],"overrideExampleHeader":true,"owner":"Milania1"},"oz":{"title":"Oz","owner":"Golmote"},"parigp":{"title":"PARI/GP","owner":"Golmote"},"parser":{"title":"Parser","require":"markup","owner":"Golmote"},"pascal":{"title":"Pascal","alias":"objectpascal","aliasTitles":{"objectpascal":"Object Pascal"},"owner":"Golmote"},"perl":{"title":"Perl","owner":"Golmote"},"php":{"title":"PHP","require":["clike","markup-templating"],"owner":"milesj"},"php-extras":{"title":"PHP Extras","require":"php","owner":"milesj"},"plsql":{"title":"PL/SQL","require":"sql","owner":"Golmote"},"powershell":{"title":"PowerShell","owner":"nauzilus"},"processing":{"title":"Processing","require":"clike","owner":"Golmote"},"prolog":{"title":"Prolog","owner":"Golmote"},"properties":{"title":".properties","owner":"Golmote"},"protobuf":{"title":"Protocol Buffers","require":"clike","owner":"just-boris"},"pug":{"title":"Pug","require":"javascript","peerDependencies":["coffeescript","ejs","handlebars","hogan","less","livescript","markdown","mustache","plates","scss","stylus","swig"],"owner":"Golmote"},"puppet":{"title":"Puppet","owner":"Golmote"},"pure":{"title":"Pure","peerDependencies":["c","cpp","fortran","ats","dsp"],"owner":"Golmote"},"python":{"title":"Python","owner":"multipetros"},"q":{"title":"Q (kdb+ database)","owner":"Golmote"},"qore":{"title":"Qore","require":"clike","owner":"temnroegg"},"r":{"title":"R","owner":"Golmote"},"jsx":{"title":"React JSX","require":["markup","javascript"],"owner":"vkbansal"},"tsx":{"title":"React TSX","require":["jsx","typescript"]},"renpy":{"title":"Ren'py","owner":"HyuchiaDiego"},"reason":{"title":"Reason","require":"clike","owner":"Golmote"},"regex-javascript":{"title":"Regex (Javascript)","owner":"RunDevelopment"},"rest":{"title":"reST (reStructuredText)","owner":"Golmote"},"rip":{"title":"Rip","owner":"ravinggenius"},"roboconf":{"title":"Roboconf","owner":"Golmote"},"ruby":{"title":"Ruby","require":"clike","owner":"samflores"},"rust":{"title":"Rust","owner":"Golmote"},"sas":{"title":"SAS","owner":"Golmote"},"sass":{"title":"Sass (Sass)","require":"css","owner":"Golmote"},"scss":{"title":"Sass (Scss)","require":"css","owner":"MoOx"},"scala":{"title":"Scala","require":"java","owner":"jozic"},"scheme":{"title":"Scheme","owner":"bacchus123"},"smalltalk":{"title":"Smalltalk","owner":"Golmote"},"smarty":{"title":"Smarty","require":"markup-templating","owner":"Golmote"},"sql":{"title":"SQL","owner":"multipetros"},"soy":{"title":"Soy (Closure Template)","require":"markup-templating","owner":"Golmote"},"stylus":{"title":"Stylus","owner":"vkbansal"},"swift":{"title":"Swift","require":"clike","owner":"chrischares"},"tap":{"title":"TAP","owner":"isaacs","require":"yaml"},"tcl":{"title":"Tcl","owner":"PeterChaplin"},"textile":{"title":"Textile","require":"markup","peerDependencies":"css","owner":"Golmote"},"toml":{"title":"TOML","owner":"RunDevelopment"},"tt2":{"title":"Template Toolkit 2","require":["clike","markup-templating"],"owner":"gflohr"},"twig":{"title":"Twig","require":"markup","owner":"brandonkelly"},"typescript":{"title":"TypeScript","require":"javascript","alias":"ts","owner":"vkbansal"},"vbnet":{"title":"VB.Net","require":"basic","owner":"Bigsby"},"velocity":{"title":"Velocity","require":"markup","owner":"Golmote"},"verilog":{"title":"Verilog","owner":"a-rey"},"vhdl":{"title":"VHDL","owner":"a-rey"},"vim":{"title":"vim","owner":"westonganger"},"visual-basic":{"title":"Visual Basic","alias":"vb","owner":"Golmote"},"wasm":{"title":"WebAssembly","owner":"Golmote"},"wiki":{"title":"Wiki markup","require":"markup","owner":"Golmote"},"xeora":{"title":"Xeora","require":"markup","alias":"xeoracube","aliasTitles":{"xeoracube":"XeoraCube"},"owner":"freakmaxi"},"xojo":{"title":"Xojo (REALbasic)","owner":"Golmote"},"xquery":{"title":"XQuery","require":"markup","owner":"Golmote"},"yaml":{"title":"YAML","owner":"hason"}},"plugins":{"meta":{"path":"plugins/{id}/prism-{id}","link":"plugins/{id}/"},"line-highlight":"Line Highlight","line-numbers":{"title":"Line Numbers","owner":"kuba-kubula"},"show-invisibles":{"title":"Show Invisibles","after":["autolinker","data-uri-highlight"]},"autolinker":"Autolinker","wpd":"WebPlatform Docs","custom-class":{"title":"Custom Class","owner":"dvkndn","noCSS":true},"file-highlight":{"title":"File Highlight","noCSS":true},"show-language":{"title":"Show Language","owner":"nauzilus","noCSS":true,"require":"toolbar"},"jsonp-highlight":{"title":"JSONP Highlight","noCSS":true,"owner":"nauzilus"},"highlight-keywords":{"title":"Highlight Keywords","owner":"vkbansal","noCSS":true},"remove-initial-line-feed":{"title":"Remove initial line feed","owner":"Golmote","noCSS":true},"previewers":{"title":"Previewers","owner":"Golmote"},"autoloader":{"title":"Autoloader","owner":"Golmote","noCSS":true},"keep-markup":{"title":"Keep Markup","owner":"Golmote","after":"normalize-whitespace","noCSS":true},"command-line":{"title":"Command Line","owner":"chriswells0"},"unescaped-markup":"Unescaped Markup","normalize-whitespace":{"title":"Normalize Whitespace","owner":"zeitgeist87","after":"unescaped-markup","noCSS":true},"data-uri-highlight":{"title":"Data-URI Highlight","owner":"Golmote","noCSS":true},"toolbar":{"title":"Toolbar","owner":"mAAdhaTTah"},"copy-to-clipboard":{"title":"Copy to Clipboard Button","owner":"mAAdhaTTah","require":"toolbar","noCSS":true}}}; if (typeof module !== 'undefined' && module.exports) { module.exports = components; } \ No newline at end of file diff --git a/components.json b/components.json index 653ccc800b..67fa2dd455 100644 --- a/components.json +++ b/components.json @@ -649,6 +649,10 @@ "require": "clike", "owner": "Golmote" }, + "regex-javascript": { + "title": "Regex (Javascript)", + "owner": "RunDevelopment" + }, "rest": { "title": "reST (reStructuredText)", "owner": "Golmote" diff --git a/components/prism-regex-javascript.js b/components/prism-regex-javascript.js new file mode 100644 index 0000000000..dcfde35840 --- /dev/null +++ b/components/prism-regex-javascript.js @@ -0,0 +1,50 @@ +(function (Prism) { + + var escape = /\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-z]|0[0-7]{,2}|[^wsdb\d])/i + var charClass = /\\[wsd]|\./i + var rangeChar = '(?:[^\\\\-]|' + escape.source + ')'; + + Prism.languages.regex = { + 'group': { + pattern: /((?:^|[^\\])(?:\\\\)*)\((?:[^\\()]|\\[\s\S])*\)/, + lookbehind: true, + inside: { + // TODO: doesn't work for (?:) + 'punctuation': /^\((?:\?(?:]))?|\)$/, + 'content': { + pattern: /[\s\S]+/, + inside: null + } + } + }, + 'charset': { + pattern: /((?:^|[^\\])(?:\\\\)*)\[(?:[^\\]|\\[\s\S])*\]/, + lookbehind: true, + inside: { + 'punctuation': /^\[\^?|\]$/, + 'content': { + pattern: /[\s\S]+/, + inside: { + 'range': { + pattern: RegExp(rangeChar + '-' + rangeChar, 'i'), + inside: { + 'escape': escape, + 'punctuation': /-/ + } + }, + 'char-class': charClass, + 'escape': escape, + } + } + } + }, + 'escape': escape, + 'char-class': charClass, + 'backreference': /\\[1-9]/, + 'anchor': /[$^]|\\b/i, + 'quantifiers': /[+*?|]|\{(?:\d+,?\d*|,\d+)\}/ + }; + + Prism.languages.regex['group'].inside['content'].inside = Prism.languages.regex; + +}(Prism)) diff --git a/components/prism-regex-javascript.min.js b/components/prism-regex-javascript.min.js new file mode 100644 index 0000000000..c44c6d3c1c --- /dev/null +++ b/components/prism-regex-javascript.min.js @@ -0,0 +1 @@ +!function(e){var n=/\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-z]|0[0-7]{,2}|[^wsdb\d])/i,a=/\\[wsd]|\./i,i="(?:[^\\\\-]|"+n.source+")";e.languages.regex={group:{pattern:/((?:^|[^\\])(?:\\\\)*)\((?:[^\\()]|\\[\s\S])*\)/,lookbehind:!0,inside:{punctuation:/^\((?:\?(?:]))?|\)$/,content:{pattern:/[\s\S]+/,inside:null}}},charset:{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\]|\\[\s\S])*\]/,lookbehind:!0,inside:{punctuation:/^\[\^?|\]$/,content:{pattern:/[\s\S]+/,inside:{range:{pattern:RegExp(i+"-"+i,"i"),inside:{escape:n,punctuation:/-/}},"char-class":a,escape:n}}}},escape:n,"char-class":a,backreference:/\\[1-9]/,anchor:/[$^]|\\b/i,quantifiers:/[+*?|]|\{(?:\d+,?\d*|,\d+)\}/},e.languages.regex.group.inside.content.inside=e.languages.regex}(Prism); \ No newline at end of file diff --git a/plugins/show-language/prism-show-language.js b/plugins/show-language/prism-show-language.js index 38675bb6b7..574ce0f010 100644 --- a/plugins/show-language/prism-show-language.js +++ b/plugins/show-language/prism-show-language.js @@ -11,7 +11,7 @@ if (!Prism.plugins.toolbar) { } // The languages map is built automatically with gulp -var Languages = /*languages_placeholder[*/{"html":"HTML","xml":"XML","svg":"SVG","mathml":"MathML","css":"CSS","clike":"C-like","javascript":"JavaScript","abap":"ABAP","actionscript":"ActionScript","apacheconf":"Apache Configuration","apl":"APL","applescript":"AppleScript","arff":"ARFF","asciidoc":"AsciiDoc","asm6502":"6502 Assembly","aspnet":"ASP.NET (C#)","autohotkey":"AutoHotkey","autoit":"AutoIt","shell":"Shell","basic":"BASIC","csharp":"C#","cpp":"C++","cil":"CIL","coffeescript":"CoffeeScript","csp":"Content-Security-Policy","css-extras":"CSS Extras","django":"Django/Jinja2","erb":"ERB","fsharp":"F#","gcode":"G-code","gedcom":"GEDCOM","glsl":"GLSL","gml":"GameMaker Language","graphql":"GraphQL","http":"HTTP","hpkp":"HTTP Public-Key-Pins","hsts":"HTTP Strict-Transport-Security","ichigojam":"IchigoJam","inform7":"Inform 7","javastacktrace":"Java stack trace","json":"JSON","jsonp":"JSONP","latex":"LaTeX","livescript":"LiveScript","lolcode":"LOLCODE","markup-templating":"Markup templating","matlab":"MATLAB","mel":"MEL","n4js":"N4JS","nasm":"NASM","nginx":"nginx","nsis":"NSIS","objectivec":"Objective-C","ocaml":"OCaml","opencl":"OpenCL","parigp":"PARI/GP","objectpascal":"Object Pascal","php":"PHP","php-extras":"PHP Extras","plsql":"PL/SQL","powershell":"PowerShell","properties":".properties","protobuf":"Protocol Buffers","q":"Q (kdb+ database)","jsx":"React JSX","tsx":"React TSX","renpy":"Ren'py","rest":"reST (reStructuredText)","sas":"SAS","sass":"Sass (Sass)","scss":"Sass (Scss)","sql":"SQL","soy":"Soy (Closure Template)","tap":"TAP","toml":"TOML","tt2":"Template Toolkit 2","typescript":"TypeScript","vbnet":"VB.Net","vhdl":"VHDL","vim":"vim","visual-basic":"Visual Basic","wasm":"WebAssembly","wiki":"Wiki markup","xeoracube":"XeoraCube","xojo":"Xojo (REALbasic)","xquery":"XQuery","yaml":"YAML"}/*]*/; +var Languages = /*languages_placeholder[*/{"html":"HTML","xml":"XML","svg":"SVG","mathml":"MathML","css":"CSS","clike":"C-like","javascript":"JavaScript","abap":"ABAP","actionscript":"ActionScript","apacheconf":"Apache Configuration","apl":"APL","applescript":"AppleScript","arff":"ARFF","asciidoc":"AsciiDoc","asm6502":"6502 Assembly","aspnet":"ASP.NET (C#)","autohotkey":"AutoHotkey","autoit":"AutoIt","shell":"Shell","basic":"BASIC","csharp":"C#","cpp":"C++","cil":"CIL","coffeescript":"CoffeeScript","csp":"Content-Security-Policy","css-extras":"CSS Extras","django":"Django/Jinja2","erb":"ERB","fsharp":"F#","gcode":"G-code","gedcom":"GEDCOM","glsl":"GLSL","gml":"GameMaker Language","graphql":"GraphQL","http":"HTTP","hpkp":"HTTP Public-Key-Pins","hsts":"HTTP Strict-Transport-Security","ichigojam":"IchigoJam","inform7":"Inform 7","javastacktrace":"Java stack trace","json":"JSON","jsonp":"JSONP","latex":"LaTeX","livescript":"LiveScript","lolcode":"LOLCODE","markup-templating":"Markup templating","matlab":"MATLAB","mel":"MEL","n4js":"N4JS","nasm":"NASM","nginx":"nginx","nsis":"NSIS","objectivec":"Objective-C","ocaml":"OCaml","opencl":"OpenCL","parigp":"PARI/GP","objectpascal":"Object Pascal","php":"PHP","php-extras":"PHP Extras","plsql":"PL/SQL","powershell":"PowerShell","properties":".properties","protobuf":"Protocol Buffers","q":"Q (kdb+ database)","jsx":"React JSX","tsx":"React TSX","renpy":"Ren'py","regex-javascript":"Regex (Javascript)","rest":"reST (reStructuredText)","sas":"SAS","sass":"Sass (Sass)","scss":"Sass (Scss)","sql":"SQL","soy":"Soy (Closure Template)","tap":"TAP","toml":"TOML","tt2":"Template Toolkit 2","typescript":"TypeScript","vbnet":"VB.Net","vhdl":"VHDL","vim":"vim","visual-basic":"Visual Basic","wasm":"WebAssembly","wiki":"Wiki markup","xeoracube":"XeoraCube","xojo":"Xojo (REALbasic)","xquery":"XQuery","yaml":"YAML"}/*]*/; Prism.plugins.toolbar.registerButton('show-language', function(env) { var pre = env.element.parentNode; if (!pre || !/pre/i.test(pre.nodeName)) { diff --git a/plugins/show-language/prism-show-language.min.js b/plugins/show-language/prism-show-language.min.js index 7f4dd60fbf..a8eb003622 100644 --- a/plugins/show-language/prism-show-language.min.js +++ b/plugins/show-language/prism-show-language.min.js @@ -1 +1 @@ -!function(){if("undefined"!=typeof self&&self.Prism&&self.document){if(!Prism.plugins.toolbar)return console.warn("Show Languages plugin loaded before Toolbar plugin."),void 0;var e={html:"HTML",xml:"XML",svg:"SVG",mathml:"MathML",css:"CSS",clike:"C-like",javascript:"JavaScript",abap:"ABAP",actionscript:"ActionScript",apacheconf:"Apache Configuration",apl:"APL",applescript:"AppleScript",arff:"ARFF",asciidoc:"AsciiDoc",asm6502:"6502 Assembly",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",autoit:"AutoIt",shell:"Shell",basic:"BASIC",csharp:"C#",cpp:"C++",cil:"CIL",coffeescript:"CoffeeScript",csp:"Content-Security-Policy","css-extras":"CSS Extras",django:"Django/Jinja2",erb:"ERB",fsharp:"F#",gcode:"G-code",gedcom:"GEDCOM",glsl:"GLSL",gml:"GameMaker Language",graphql:"GraphQL",http:"HTTP",hpkp:"HTTP Public-Key-Pins",hsts:"HTTP Strict-Transport-Security",ichigojam:"IchigoJam",inform7:"Inform 7",javastacktrace:"Java stack trace",json:"JSON",jsonp:"JSONP",latex:"LaTeX",livescript:"LiveScript",lolcode:"LOLCODE","markup-templating":"Markup templating",matlab:"MATLAB",mel:"MEL",n4js:"N4JS",nasm:"NASM",nginx:"nginx",nsis:"NSIS",objectivec:"Objective-C",ocaml:"OCaml",opencl:"OpenCL",parigp:"PARI/GP",objectpascal:"Object Pascal",php:"PHP","php-extras":"PHP Extras",plsql:"PL/SQL",powershell:"PowerShell",properties:".properties",protobuf:"Protocol Buffers",q:"Q (kdb+ database)",jsx:"React JSX",tsx:"React TSX",renpy:"Ren'py",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",soy:"Soy (Closure Template)",tap:"TAP",toml:"TOML",tt2:"Template Toolkit 2",typescript:"TypeScript",vbnet:"VB.Net",vhdl:"VHDL",vim:"vim","visual-basic":"Visual Basic",wasm:"WebAssembly",wiki:"Wiki markup",xeoracube:"XeoraCube",xojo:"Xojo (REALbasic)",xquery:"XQuery",yaml:"YAML"};Prism.plugins.toolbar.registerButton("show-language",function(a){var t=a.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var s=t.getAttribute("data-language")||e[a.language]||a.language&&a.language.substring(0,1).toUpperCase()+a.language.substring(1);if(s){var r=document.createElement("span");return r.textContent=s,r}}})}}(); \ No newline at end of file +!function(){if("undefined"!=typeof self&&self.Prism&&self.document){if(!Prism.plugins.toolbar)return console.warn("Show Languages plugin loaded before Toolbar plugin."),void 0;var e={html:"HTML",xml:"XML",svg:"SVG",mathml:"MathML",css:"CSS",clike:"C-like",javascript:"JavaScript",abap:"ABAP",actionscript:"ActionScript",apacheconf:"Apache Configuration",apl:"APL",applescript:"AppleScript",arff:"ARFF",asciidoc:"AsciiDoc",asm6502:"6502 Assembly",aspnet:"ASP.NET (C#)",autohotkey:"AutoHotkey",autoit:"AutoIt",shell:"Shell",basic:"BASIC",csharp:"C#",cpp:"C++",cil:"CIL",coffeescript:"CoffeeScript",csp:"Content-Security-Policy","css-extras":"CSS Extras",django:"Django/Jinja2",erb:"ERB",fsharp:"F#",gcode:"G-code",gedcom:"GEDCOM",glsl:"GLSL",gml:"GameMaker Language",graphql:"GraphQL",http:"HTTP",hpkp:"HTTP Public-Key-Pins",hsts:"HTTP Strict-Transport-Security",ichigojam:"IchigoJam",inform7:"Inform 7",javastacktrace:"Java stack trace",json:"JSON",jsonp:"JSONP",latex:"LaTeX",livescript:"LiveScript",lolcode:"LOLCODE","markup-templating":"Markup templating",matlab:"MATLAB",mel:"MEL",n4js:"N4JS",nasm:"NASM",nginx:"nginx",nsis:"NSIS",objectivec:"Objective-C",ocaml:"OCaml",opencl:"OpenCL",parigp:"PARI/GP",objectpascal:"Object Pascal",php:"PHP","php-extras":"PHP Extras",plsql:"PL/SQL",powershell:"PowerShell",properties:".properties",protobuf:"Protocol Buffers",q:"Q (kdb+ database)",jsx:"React JSX",tsx:"React TSX",renpy:"Ren'py","regex-javascript":"Regex (Javascript)",rest:"reST (reStructuredText)",sas:"SAS",sass:"Sass (Sass)",scss:"Sass (Scss)",sql:"SQL",soy:"Soy (Closure Template)",tap:"TAP",toml:"TOML",tt2:"Template Toolkit 2",typescript:"TypeScript",vbnet:"VB.Net",vhdl:"VHDL",vim:"vim","visual-basic":"Visual Basic",wasm:"WebAssembly",wiki:"Wiki markup",xeoracube:"XeoraCube",xojo:"Xojo (REALbasic)",xquery:"XQuery",yaml:"YAML"};Prism.plugins.toolbar.registerButton("show-language",function(a){var t=a.element.parentNode;if(t&&/pre/i.test(t.nodeName)){var s=t.getAttribute("data-language")||e[a.language]||a.language&&a.language.substring(0,1).toUpperCase()+a.language.substring(1);if(s){var r=document.createElement("span");return r.textContent=s,r}}})}}(); \ No newline at end of file From 530eb1733cdf7820d50d7c8c646d5ce185aba898 Mon Sep 17 00:00:00 2001 From: RunDevelopment Date: Sun, 30 Dec 2018 00:33:00 +0100 Subject: [PATCH 02/12] Renamed, improved, included --- components.js | 2 +- components.json | 11 ++- components/prism-regex-javascript.js | 50 ---------- components/prism-regex-javascript.min.js | 1 - components/prism-regex.js | 91 +++++++++++++++++++ components/prism-regex.min.js | 1 + plugins/show-language/prism-show-language.js | 2 +- .../show-language/prism-show-language.min.js | 2 +- 8 files changed, 104 insertions(+), 56 deletions(-) delete mode 100644 components/prism-regex-javascript.js delete mode 100644 components/prism-regex-javascript.min.js create mode 100644 components/prism-regex.js create mode 100644 components/prism-regex.min.js diff --git a/components.js b/components.js index 9135add77e..eb176c3ac8 100644 --- a/components.js +++ b/components.js @@ -1,2 +1,2 @@ -var components = {"core":{"meta":{"path":"components/prism-core.js","option":"mandatory"},"core":"Core"},"themes":{"meta":{"path":"themes/{id}.css","link":"index.html?theme={id}","exclusive":true},"prism":{"title":"Default","option":"default"},"prism-dark":"Dark","prism-funky":"Funky","prism-okaidia":{"title":"Okaidia","owner":"ocodia"},"prism-twilight":{"title":"Twilight","owner":"remybach"},"prism-coy":{"title":"Coy","owner":"tshedor"},"prism-solarizedlight":{"title":"Solarized Light","owner":"hectormatos2011 "},"prism-tomorrow":{"title":"Tomorrow Night","owner":"Rosey"}},"languages":{"meta":{"path":"components/prism-{id}","noCSS":true,"examplesPath":"examples/prism-{id}","addCheckAll":true},"markup":{"title":"Markup","alias":["html","xml","svg","mathml"],"aliasTitles":{"html":"HTML","xml":"XML","svg":"SVG","mathml":"MathML"},"option":"default"},"css":{"title":"CSS","option":"default","peerDependencies":"markup"},"clike":{"title":"C-like","option":"default","overrideExampleHeader":true},"javascript":{"title":"JavaScript","require":"clike","peerDependencies":"markup","alias":"js","option":"default"},"abap":{"title":"ABAP","owner":"dellagustin"},"actionscript":{"title":"ActionScript","require":"javascript","peerDependencies":"markup","owner":"Golmote"},"ada":{"title":"Ada","owner":"Lucretia"},"apacheconf":{"title":"Apache Configuration","owner":"GuiTeK"},"apl":{"title":"APL","owner":"ngn"},"applescript":{"title":"AppleScript","owner":"Golmote"},"arduino":{"title":"Arduino","require":"cpp","owner":"eisbehr-"},"arff":{"title":"ARFF","owner":"Golmote"},"asciidoc":{"title":"AsciiDoc","owner":"Golmote"},"asm6502":{"title":"6502 Assembly","owner":"kzurawel"},"aspnet":{"title":"ASP.NET (C#)","require":["markup","csharp"],"owner":"nauzilus"},"autohotkey":{"title":"AutoHotkey","owner":"aviaryan"},"autoit":{"title":"AutoIt","owner":"Golmote"},"bash":{"title":"Bash","alias":"shell","aliasTitles":{"shell":"Shell"},"owner":"zeitgeist87"},"basic":{"title":"BASIC","owner":"Golmote"},"batch":{"title":"Batch","owner":"Golmote"},"bison":{"title":"Bison","require":"c","owner":"Golmote"},"brainfuck":{"title":"Brainfuck","owner":"Golmote"},"bro":{"title":"Bro","owner":"wayward710"},"c":{"title":"C","require":"clike","owner":"zeitgeist87"},"csharp":{"title":"C#","require":"clike","alias":"dotnet","owner":"mvalipour"},"cpp":{"title":"C++","require":"c","owner":"zeitgeist87"},"cil":{"title":"CIL","owner":"sbrl"},"coffeescript":{"title":"CoffeeScript","require":"javascript","owner":"R-osey"},"clojure":{"title":"Clojure","owner":"troglotit"},"crystal":{"title":"Crystal","require":"ruby","owner":"MakeNowJust"},"csp":{"title":"Content-Security-Policy","owner":"ScottHelme"},"css-extras":{"title":"CSS Extras","require":"css","owner":"milesj"},"d":{"title":"D","require":"clike","owner":"Golmote"},"dart":{"title":"Dart","require":"clike","owner":"Golmote"},"diff":{"title":"Diff","owner":"uranusjr"},"django":{"title":"Django/Jinja2","require":"markup","peerDependencies":["css","javascript"],"alias":"jinja2","owner":"romanvm"},"docker":{"title":"Docker","alias":"dockerfile","owner":"JustinBeckwith"},"eiffel":{"title":"Eiffel","owner":"Conaclos"},"elixir":{"title":"Elixir","owner":"Golmote"},"elm":{"title":"Elm","owner":"zwilias"},"erb":{"title":"ERB","require":["ruby","markup-templating"],"owner":"Golmote"},"erlang":{"title":"Erlang","owner":"Golmote"},"fsharp":{"title":"F#","require":"clike","owner":"simonreynolds7"},"flow":{"title":"Flow","require":"javascript","owner":"Golmote"},"fortran":{"title":"Fortran","owner":"Golmote"},"gcode":{"title":"G-code","owner":"RunDevelopment"},"gedcom":{"title":"GEDCOM","owner":"Golmote"},"gherkin":{"title":"Gherkin","owner":"hason"},"git":{"title":"Git","owner":"lgiraudel"},"glsl":{"title":"GLSL","require":"clike","owner":"Golmote"},"gml":{"title":"GameMaker Language","alias":"gamemakerlanguage","require":"clike","owner":"LiarOnce"},"go":{"title":"Go","require":"clike","owner":"arnehormann"},"graphql":{"title":"GraphQL","owner":"Golmote"},"groovy":{"title":"Groovy","require":"clike","owner":"robfletcher"},"haml":{"title":"Haml","require":"ruby","peerDependencies":["css","coffeescript","erb","javascript","less","markdown","ruby","scss","textile"],"owner":"Golmote"},"handlebars":{"title":"Handlebars","require":"markup-templating","owner":"Golmote"},"haskell":{"title":"Haskell","owner":"bholst"},"haxe":{"title":"Haxe","require":"clike","owner":"Golmote"},"http":{"title":"HTTP","peerDependencies":["javascript","markup"],"owner":"danielgtaylor"},"hpkp":{"title":"HTTP Public-Key-Pins","owner":"ScottHelme"},"hsts":{"title":"HTTP Strict-Transport-Security","owner":"ScottHelme"},"ichigojam":{"title":"IchigoJam","owner":"BlueCocoa"},"icon":{"title":"Icon","owner":"Golmote"},"inform7":{"title":"Inform 7","owner":"Golmote"},"ini":{"title":"Ini","owner":"aviaryan"},"io":{"title":"Io","owner":"AlesTsurko"},"j":{"title":"J","owner":"Golmote"},"java":{"title":"Java","require":"clike","owner":"sherblot"},"javastacktrace":{"title":"Java stack trace","owner":"RunDevelopment"},"jolie":{"title":"Jolie","require":"clike","owner":"thesave"},"json":{"title":"JSON","alias":"jsonp","aliasTitles":{"jsonp":"JSONP"},"owner":"CupOfTea696"},"julia":{"title":"Julia","owner":"cdagnino"},"keyman":{"title":"Keyman","owner":"mcdurdin"},"kotlin":{"title":"Kotlin","require":"clike","owner":"Golmote"},"latex":{"title":"LaTeX","owner":"japborst"},"less":{"title":"Less","require":"css","owner":"Golmote"},"liquid":{"title":"Liquid","owner":"cinhtau"},"lisp":{"title":"Lisp","alias":["emacs","elisp","emacs-lisp"],"owner":"JuanCaicedo"},"livescript":{"title":"LiveScript","owner":"Golmote"},"lolcode":{"title":"LOLCODE","owner":"Golmote"},"lua":{"title":"Lua","owner":"Golmote"},"makefile":{"title":"Makefile","owner":"Golmote"},"markdown":{"title":"Markdown","require":"markup","owner":"Golmote"},"markup-templating":{"title":"Markup templating","require":"markup","owner":"Golmote"},"matlab":{"title":"MATLAB","owner":"Golmote"},"mel":{"title":"MEL","owner":"Golmote"},"mizar":{"title":"Mizar","owner":"Golmote"},"monkey":{"title":"Monkey","owner":"Golmote"},"n4js":{"title":"N4JS","require":"javascript","alias":"n4jsd","owner":"bsmith-n4"},"nasm":{"title":"NASM","owner":"rbmj"},"nginx":{"title":"nginx","owner":"westonganger","require":"clike"},"nim":{"title":"Nim","owner":"Golmote"},"nix":{"title":"Nix","owner":"Golmote"},"nsis":{"title":"NSIS","owner":"idleberg"},"objectivec":{"title":"Objective-C","require":"c","owner":"uranusjr"},"ocaml":{"title":"OCaml","owner":"Golmote"},"opencl":{"title":"OpenCL","require":"cpp","peerDependencies":["c","cpp"],"overrideExampleHeader":true,"owner":"Milania1"},"oz":{"title":"Oz","owner":"Golmote"},"parigp":{"title":"PARI/GP","owner":"Golmote"},"parser":{"title":"Parser","require":"markup","owner":"Golmote"},"pascal":{"title":"Pascal","alias":"objectpascal","aliasTitles":{"objectpascal":"Object Pascal"},"owner":"Golmote"},"perl":{"title":"Perl","owner":"Golmote"},"php":{"title":"PHP","require":["clike","markup-templating"],"owner":"milesj"},"php-extras":{"title":"PHP Extras","require":"php","owner":"milesj"},"plsql":{"title":"PL/SQL","require":"sql","owner":"Golmote"},"powershell":{"title":"PowerShell","owner":"nauzilus"},"processing":{"title":"Processing","require":"clike","owner":"Golmote"},"prolog":{"title":"Prolog","owner":"Golmote"},"properties":{"title":".properties","owner":"Golmote"},"protobuf":{"title":"Protocol Buffers","require":"clike","owner":"just-boris"},"pug":{"title":"Pug","require":"javascript","peerDependencies":["coffeescript","ejs","handlebars","hogan","less","livescript","markdown","mustache","plates","scss","stylus","swig"],"owner":"Golmote"},"puppet":{"title":"Puppet","owner":"Golmote"},"pure":{"title":"Pure","peerDependencies":["c","cpp","fortran","ats","dsp"],"owner":"Golmote"},"python":{"title":"Python","owner":"multipetros"},"q":{"title":"Q (kdb+ database)","owner":"Golmote"},"qore":{"title":"Qore","require":"clike","owner":"temnroegg"},"r":{"title":"R","owner":"Golmote"},"jsx":{"title":"React JSX","require":["markup","javascript"],"owner":"vkbansal"},"tsx":{"title":"React TSX","require":["jsx","typescript"]},"renpy":{"title":"Ren'py","owner":"HyuchiaDiego"},"reason":{"title":"Reason","require":"clike","owner":"Golmote"},"regex-javascript":{"title":"Regex (Javascript)","owner":"RunDevelopment"},"rest":{"title":"reST (reStructuredText)","owner":"Golmote"},"rip":{"title":"Rip","owner":"ravinggenius"},"roboconf":{"title":"Roboconf","owner":"Golmote"},"ruby":{"title":"Ruby","require":"clike","owner":"samflores"},"rust":{"title":"Rust","owner":"Golmote"},"sas":{"title":"SAS","owner":"Golmote"},"sass":{"title":"Sass (Sass)","require":"css","owner":"Golmote"},"scss":{"title":"Sass (Scss)","require":"css","owner":"MoOx"},"scala":{"title":"Scala","require":"java","owner":"jozic"},"scheme":{"title":"Scheme","owner":"bacchus123"},"smalltalk":{"title":"Smalltalk","owner":"Golmote"},"smarty":{"title":"Smarty","require":"markup-templating","owner":"Golmote"},"sql":{"title":"SQL","owner":"multipetros"},"soy":{"title":"Soy (Closure Template)","require":"markup-templating","owner":"Golmote"},"stylus":{"title":"Stylus","owner":"vkbansal"},"swift":{"title":"Swift","require":"clike","owner":"chrischares"},"tap":{"title":"TAP","owner":"isaacs","require":"yaml"},"tcl":{"title":"Tcl","owner":"PeterChaplin"},"textile":{"title":"Textile","require":"markup","peerDependencies":"css","owner":"Golmote"},"toml":{"title":"TOML","owner":"RunDevelopment"},"tt2":{"title":"Template Toolkit 2","require":["clike","markup-templating"],"owner":"gflohr"},"twig":{"title":"Twig","require":"markup","owner":"brandonkelly"},"typescript":{"title":"TypeScript","require":"javascript","alias":"ts","owner":"vkbansal"},"vala":{"title":"Vala","require":"clike","owner":"TemplarVolk"},"vbnet":{"title":"VB.Net","require":"basic","owner":"Bigsby"},"velocity":{"title":"Velocity","require":"markup","owner":"Golmote"},"verilog":{"title":"Verilog","owner":"a-rey"},"vhdl":{"title":"VHDL","owner":"a-rey"},"vim":{"title":"vim","owner":"westonganger"},"visual-basic":{"title":"Visual Basic","alias":"vb","owner":"Golmote"},"wasm":{"title":"WebAssembly","owner":"Golmote"},"wiki":{"title":"Wiki markup","require":"markup","owner":"Golmote"},"xeora":{"title":"Xeora","require":"markup","alias":"xeoracube","aliasTitles":{"xeoracube":"XeoraCube"},"owner":"freakmaxi"},"xojo":{"title":"Xojo (REALbasic)","owner":"Golmote"},"xquery":{"title":"XQuery","require":"markup","owner":"Golmote"},"yaml":{"title":"YAML","owner":"hason"}},"plugins":{"meta":{"path":"plugins/{id}/prism-{id}","link":"plugins/{id}/"},"line-highlight":"Line Highlight","line-numbers":{"title":"Line Numbers","owner":"kuba-kubula"},"show-invisibles":{"title":"Show Invisibles","after":["autolinker","data-uri-highlight"]},"autolinker":"Autolinker","wpd":"WebPlatform Docs","custom-class":{"title":"Custom Class","owner":"dvkndn","noCSS":true},"file-highlight":{"title":"File Highlight","noCSS":true},"show-language":{"title":"Show Language","owner":"nauzilus","noCSS":true,"require":"toolbar"},"jsonp-highlight":{"title":"JSONP Highlight","noCSS":true,"owner":"nauzilus"},"highlight-keywords":{"title":"Highlight Keywords","owner":"vkbansal","noCSS":true},"remove-initial-line-feed":{"title":"Remove initial line feed","owner":"Golmote","noCSS":true},"previewers":{"title":"Previewers","owner":"Golmote"},"autoloader":{"title":"Autoloader","owner":"Golmote","noCSS":true},"keep-markup":{"title":"Keep Markup","owner":"Golmote","after":"normalize-whitespace","noCSS":true},"command-line":{"title":"Command Line","owner":"chriswells0"},"unescaped-markup":"Unescaped Markup","normalize-whitespace":{"title":"Normalize Whitespace","owner":"zeitgeist87","after":"unescaped-markup","noCSS":true},"data-uri-highlight":{"title":"Data-URI Highlight","owner":"Golmote","noCSS":true},"toolbar":{"title":"Toolbar","owner":"mAAdhaTTah"},"copy-to-clipboard":{"title":"Copy to Clipboard Button","owner":"mAAdhaTTah","require":"toolbar","noCSS":true}}}; +var components = {"core":{"meta":{"path":"components/prism-core.js","option":"mandatory"},"core":"Core"},"themes":{"meta":{"path":"themes/{id}.css","link":"index.html?theme={id}","exclusive":true},"prism":{"title":"Default","option":"default"},"prism-dark":"Dark","prism-funky":"Funky","prism-okaidia":{"title":"Okaidia","owner":"ocodia"},"prism-twilight":{"title":"Twilight","owner":"remybach"},"prism-coy":{"title":"Coy","owner":"tshedor"},"prism-solarizedlight":{"title":"Solarized Light","owner":"hectormatos2011 "},"prism-tomorrow":{"title":"Tomorrow Night","owner":"Rosey"}},"languages":{"meta":{"path":"components/prism-{id}","noCSS":true,"examplesPath":"examples/prism-{id}","addCheckAll":true},"markup":{"title":"Markup","alias":["html","xml","svg","mathml"],"aliasTitles":{"html":"HTML","xml":"XML","svg":"SVG","mathml":"MathML"},"option":"default"},"css":{"title":"CSS","option":"default","peerDependencies":"markup"},"clike":{"title":"C-like","option":"default","overrideExampleHeader":true},"javascript":{"title":"JavaScript","require":"clike","peerDependencies":"markup","alias":"js","option":"default"},"abap":{"title":"ABAP","owner":"dellagustin"},"actionscript":{"title":"ActionScript","require":"javascript","peerDependencies":"markup","owner":"Golmote"},"ada":{"title":"Ada","owner":"Lucretia"},"apacheconf":{"title":"Apache Configuration","owner":"GuiTeK"},"apl":{"title":"APL","owner":"ngn"},"applescript":{"title":"AppleScript","owner":"Golmote"},"arduino":{"title":"Arduino","require":"cpp","owner":"eisbehr-"},"arff":{"title":"ARFF","owner":"Golmote"},"asciidoc":{"title":"AsciiDoc","owner":"Golmote"},"asm6502":{"title":"6502 Assembly","owner":"kzurawel"},"aspnet":{"title":"ASP.NET (C#)","require":["markup","csharp"],"owner":"nauzilus"},"autohotkey":{"title":"AutoHotkey","owner":"aviaryan"},"autoit":{"title":"AutoIt","owner":"Golmote"},"bash":{"title":"Bash","alias":"shell","aliasTitles":{"shell":"Shell"},"owner":"zeitgeist87"},"basic":{"title":"BASIC","owner":"Golmote"},"batch":{"title":"Batch","owner":"Golmote"},"bison":{"title":"Bison","require":"c","owner":"Golmote"},"brainfuck":{"title":"Brainfuck","owner":"Golmote"},"bro":{"title":"Bro","owner":"wayward710"},"c":{"title":"C","require":"clike","owner":"zeitgeist87"},"csharp":{"title":"C#","require":"clike","alias":"dotnet","owner":"mvalipour"},"cpp":{"title":"C++","require":"c","owner":"zeitgeist87"},"cil":{"title":"CIL","owner":"sbrl"},"coffeescript":{"title":"CoffeeScript","require":"javascript","owner":"R-osey"},"clojure":{"title":"Clojure","owner":"troglotit"},"crystal":{"title":"Crystal","require":"ruby","owner":"MakeNowJust"},"csp":{"title":"Content-Security-Policy","owner":"ScottHelme"},"css-extras":{"title":"CSS Extras","require":"css","owner":"milesj"},"d":{"title":"D","require":"clike","owner":"Golmote"},"dart":{"title":"Dart","require":"clike","owner":"Golmote"},"diff":{"title":"Diff","owner":"uranusjr"},"django":{"title":"Django/Jinja2","require":"markup","peerDependencies":["css","javascript"],"alias":"jinja2","owner":"romanvm"},"docker":{"title":"Docker","alias":"dockerfile","owner":"JustinBeckwith"},"eiffel":{"title":"Eiffel","owner":"Conaclos"},"elixir":{"title":"Elixir","owner":"Golmote"},"elm":{"title":"Elm","owner":"zwilias"},"erb":{"title":"ERB","require":["ruby","markup-templating"],"owner":"Golmote"},"erlang":{"title":"Erlang","owner":"Golmote"},"fsharp":{"title":"F#","require":"clike","owner":"simonreynolds7"},"flow":{"title":"Flow","require":"javascript","owner":"Golmote"},"fortran":{"title":"Fortran","owner":"Golmote"},"gcode":{"title":"G-code","owner":"RunDevelopment"},"gedcom":{"title":"GEDCOM","owner":"Golmote"},"gherkin":{"title":"Gherkin","owner":"hason"},"git":{"title":"Git","owner":"lgiraudel"},"glsl":{"title":"GLSL","require":"clike","owner":"Golmote"},"gml":{"title":"GameMaker Language","alias":"gamemakerlanguage","require":"clike","owner":"LiarOnce"},"go":{"title":"Go","require":"clike","owner":"arnehormann"},"graphql":{"title":"GraphQL","owner":"Golmote"},"groovy":{"title":"Groovy","require":"clike","owner":"robfletcher"},"haml":{"title":"Haml","require":"ruby","peerDependencies":["css","coffeescript","erb","javascript","less","markdown","ruby","scss","textile"],"owner":"Golmote"},"handlebars":{"title":"Handlebars","require":"markup-templating","owner":"Golmote"},"haskell":{"title":"Haskell","owner":"bholst"},"haxe":{"title":"Haxe","require":"clike","owner":"Golmote"},"http":{"title":"HTTP","peerDependencies":["javascript","markup"],"owner":"danielgtaylor"},"hpkp":{"title":"HTTP Public-Key-Pins","owner":"ScottHelme"},"hsts":{"title":"HTTP Strict-Transport-Security","owner":"ScottHelme"},"ichigojam":{"title":"IchigoJam","owner":"BlueCocoa"},"icon":{"title":"Icon","owner":"Golmote"},"inform7":{"title":"Inform 7","owner":"Golmote"},"ini":{"title":"Ini","owner":"aviaryan"},"io":{"title":"Io","owner":"AlesTsurko"},"j":{"title":"J","owner":"Golmote"},"java":{"title":"Java","require":"clike","owner":"sherblot"},"javastacktrace":{"title":"Java stack trace","owner":"RunDevelopment"},"jolie":{"title":"Jolie","require":"clike","owner":"thesave"},"json":{"title":"JSON","alias":"jsonp","aliasTitles":{"jsonp":"JSONP"},"owner":"CupOfTea696"},"julia":{"title":"Julia","owner":"cdagnino"},"keyman":{"title":"Keyman","owner":"mcdurdin"},"kotlin":{"title":"Kotlin","require":"clike","owner":"Golmote"},"latex":{"title":"LaTeX","owner":"japborst"},"less":{"title":"Less","require":"css","owner":"Golmote"},"liquid":{"title":"Liquid","owner":"cinhtau"},"lisp":{"title":"Lisp","alias":["emacs","elisp","emacs-lisp"],"owner":"JuanCaicedo"},"livescript":{"title":"LiveScript","owner":"Golmote"},"lolcode":{"title":"LOLCODE","owner":"Golmote"},"lua":{"title":"Lua","owner":"Golmote"},"makefile":{"title":"Makefile","owner":"Golmote"},"markdown":{"title":"Markdown","require":"markup","owner":"Golmote"},"markup-templating":{"title":"Markup templating","require":"markup","owner":"Golmote"},"matlab":{"title":"MATLAB","owner":"Golmote"},"mel":{"title":"MEL","owner":"Golmote"},"mizar":{"title":"Mizar","owner":"Golmote"},"monkey":{"title":"Monkey","owner":"Golmote"},"n4js":{"title":"N4JS","require":"javascript","alias":"n4jsd","owner":"bsmith-n4"},"nasm":{"title":"NASM","owner":"rbmj"},"nginx":{"title":"nginx","owner":"westonganger","require":"clike"},"nim":{"title":"Nim","owner":"Golmote"},"nix":{"title":"Nix","owner":"Golmote"},"nsis":{"title":"NSIS","owner":"idleberg"},"objectivec":{"title":"Objective-C","require":"c","owner":"uranusjr"},"ocaml":{"title":"OCaml","owner":"Golmote"},"opencl":{"title":"OpenCL","require":"cpp","peerDependencies":["c","cpp"],"overrideExampleHeader":true,"owner":"Milania1"},"oz":{"title":"Oz","owner":"Golmote"},"parigp":{"title":"PARI/GP","owner":"Golmote"},"parser":{"title":"Parser","require":"markup","owner":"Golmote"},"pascal":{"title":"Pascal","alias":"objectpascal","aliasTitles":{"objectpascal":"Object Pascal"},"owner":"Golmote"},"perl":{"title":"Perl","owner":"Golmote"},"php":{"title":"PHP","require":["clike","markup-templating"],"owner":"milesj"},"php-extras":{"title":"PHP Extras","require":"php","owner":"milesj"},"plsql":{"title":"PL/SQL","require":"sql","owner":"Golmote"},"powershell":{"title":"PowerShell","owner":"nauzilus"},"processing":{"title":"Processing","require":"clike","owner":"Golmote"},"prolog":{"title":"Prolog","owner":"Golmote"},"properties":{"title":".properties","owner":"Golmote"},"protobuf":{"title":"Protocol Buffers","require":"clike","owner":"just-boris"},"pug":{"title":"Pug","require":"javascript","peerDependencies":["coffeescript","ejs","handlebars","hogan","less","livescript","markdown","mustache","plates","scss","stylus","swig"],"owner":"Golmote"},"puppet":{"title":"Puppet","owner":"Golmote"},"pure":{"title":"Pure","peerDependencies":["c","cpp","fortran","ats","dsp"],"owner":"Golmote"},"python":{"title":"Python","owner":"multipetros"},"q":{"title":"Q (kdb+ database)","owner":"Golmote"},"qore":{"title":"Qore","require":"clike","owner":"temnroegg"},"r":{"title":"R","owner":"Golmote"},"jsx":{"title":"React JSX","require":["markup","javascript"],"owner":"vkbansal"},"tsx":{"title":"React TSX","require":["jsx","typescript"]},"renpy":{"title":"Ren'py","owner":"HyuchiaDiego"},"reason":{"title":"Reason","require":"clike","owner":"Golmote"},"regex":{"title":"Regex","peerDependencies":["actionscript","coffeescript","flow","javascript","typescript"],"owner":"RunDevelopment"},"rest":{"title":"reST (reStructuredText)","owner":"Golmote"},"rip":{"title":"Rip","owner":"ravinggenius"},"roboconf":{"title":"Roboconf","owner":"Golmote"},"ruby":{"title":"Ruby","require":"clike","owner":"samflores"},"rust":{"title":"Rust","owner":"Golmote"},"sas":{"title":"SAS","owner":"Golmote"},"sass":{"title":"Sass (Sass)","require":"css","owner":"Golmote"},"scss":{"title":"Sass (Scss)","require":"css","owner":"MoOx"},"scala":{"title":"Scala","require":"java","owner":"jozic"},"scheme":{"title":"Scheme","owner":"bacchus123"},"smalltalk":{"title":"Smalltalk","owner":"Golmote"},"smarty":{"title":"Smarty","require":"markup-templating","owner":"Golmote"},"sql":{"title":"SQL","owner":"multipetros"},"soy":{"title":"Soy (Closure Template)","require":"markup-templating","owner":"Golmote"},"stylus":{"title":"Stylus","owner":"vkbansal"},"swift":{"title":"Swift","require":"clike","owner":"chrischares"},"tap":{"title":"TAP","owner":"isaacs","require":"yaml"},"tcl":{"title":"Tcl","owner":"PeterChaplin"},"textile":{"title":"Textile","require":"markup","peerDependencies":"css","owner":"Golmote"},"toml":{"title":"TOML","owner":"RunDevelopment"},"tt2":{"title":"Template Toolkit 2","require":["clike","markup-templating"],"owner":"gflohr"},"twig":{"title":"Twig","require":"markup","owner":"brandonkelly"},"typescript":{"title":"TypeScript","require":"javascript","alias":"ts","owner":"vkbansal"},"vala":{"title":"Vala","require":"clike","owner":"TemplarVolk"},"vbnet":{"title":"VB.Net","require":"basic","owner":"Bigsby"},"velocity":{"title":"Velocity","require":"markup","owner":"Golmote"},"verilog":{"title":"Verilog","owner":"a-rey"},"vhdl":{"title":"VHDL","owner":"a-rey"},"vim":{"title":"vim","owner":"westonganger"},"visual-basic":{"title":"Visual Basic","alias":"vb","owner":"Golmote"},"wasm":{"title":"WebAssembly","owner":"Golmote"},"wiki":{"title":"Wiki markup","require":"markup","owner":"Golmote"},"xeora":{"title":"Xeora","require":"markup","alias":"xeoracube","aliasTitles":{"xeoracube":"XeoraCube"},"owner":"freakmaxi"},"xojo":{"title":"Xojo (REALbasic)","owner":"Golmote"},"xquery":{"title":"XQuery","require":"markup","owner":"Golmote"},"yaml":{"title":"YAML","owner":"hason"}},"plugins":{"meta":{"path":"plugins/{id}/prism-{id}","link":"plugins/{id}/"},"line-highlight":"Line Highlight","line-numbers":{"title":"Line Numbers","owner":"kuba-kubula"},"show-invisibles":{"title":"Show Invisibles","after":["autolinker","data-uri-highlight"]},"autolinker":"Autolinker","wpd":"WebPlatform Docs","custom-class":{"title":"Custom Class","owner":"dvkndn","noCSS":true},"file-highlight":{"title":"File Highlight","noCSS":true},"show-language":{"title":"Show Language","owner":"nauzilus","noCSS":true,"require":"toolbar"},"jsonp-highlight":{"title":"JSONP Highlight","noCSS":true,"owner":"nauzilus"},"highlight-keywords":{"title":"Highlight Keywords","owner":"vkbansal","noCSS":true},"remove-initial-line-feed":{"title":"Remove initial line feed","owner":"Golmote","noCSS":true},"previewers":{"title":"Previewers","owner":"Golmote"},"autoloader":{"title":"Autoloader","owner":"Golmote","noCSS":true},"keep-markup":{"title":"Keep Markup","owner":"Golmote","after":"normalize-whitespace","noCSS":true},"command-line":{"title":"Command Line","owner":"chriswells0"},"unescaped-markup":"Unescaped Markup","normalize-whitespace":{"title":"Normalize Whitespace","owner":"zeitgeist87","after":"unescaped-markup","noCSS":true},"data-uri-highlight":{"title":"Data-URI Highlight","owner":"Golmote","noCSS":true},"toolbar":{"title":"Toolbar","owner":"mAAdhaTTah"},"copy-to-clipboard":{"title":"Copy to Clipboard Button","owner":"mAAdhaTTah","require":"toolbar","noCSS":true}}}; if (typeof module !== 'undefined' && module.exports) { module.exports = components; } \ No newline at end of file diff --git a/components.json b/components.json index a5509f58d3..95a74da538 100644 --- a/components.json +++ b/components.json @@ -649,8 +649,15 @@ "require": "clike", "owner": "Golmote" }, - "regex-javascript": { - "title": "Regex (Javascript)", + "regex": { + "title": "Regex", + "peerDependencies": [ + "actionscript", + "coffeescript", + "flow", + "javascript", + "typescript" + ], "owner": "RunDevelopment" }, "rest": { diff --git a/components/prism-regex-javascript.js b/components/prism-regex-javascript.js deleted file mode 100644 index dcfde35840..0000000000 --- a/components/prism-regex-javascript.js +++ /dev/null @@ -1,50 +0,0 @@ -(function (Prism) { - - var escape = /\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-z]|0[0-7]{,2}|[^wsdb\d])/i - var charClass = /\\[wsd]|\./i - var rangeChar = '(?:[^\\\\-]|' + escape.source + ')'; - - Prism.languages.regex = { - 'group': { - pattern: /((?:^|[^\\])(?:\\\\)*)\((?:[^\\()]|\\[\s\S])*\)/, - lookbehind: true, - inside: { - // TODO: doesn't work for (?:) - 'punctuation': /^\((?:\?(?:]))?|\)$/, - 'content': { - pattern: /[\s\S]+/, - inside: null - } - } - }, - 'charset': { - pattern: /((?:^|[^\\])(?:\\\\)*)\[(?:[^\\]|\\[\s\S])*\]/, - lookbehind: true, - inside: { - 'punctuation': /^\[\^?|\]$/, - 'content': { - pattern: /[\s\S]+/, - inside: { - 'range': { - pattern: RegExp(rangeChar + '-' + rangeChar, 'i'), - inside: { - 'escape': escape, - 'punctuation': /-/ - } - }, - 'char-class': charClass, - 'escape': escape, - } - } - } - }, - 'escape': escape, - 'char-class': charClass, - 'backreference': /\\[1-9]/, - 'anchor': /[$^]|\\b/i, - 'quantifiers': /[+*?|]|\{(?:\d+,?\d*|,\d+)\}/ - }; - - Prism.languages.regex['group'].inside['content'].inside = Prism.languages.regex; - -}(Prism)) diff --git a/components/prism-regex-javascript.min.js b/components/prism-regex-javascript.min.js deleted file mode 100644 index c44c6d3c1c..0000000000 --- a/components/prism-regex-javascript.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(e){var n=/\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-z]|0[0-7]{,2}|[^wsdb\d])/i,a=/\\[wsd]|\./i,i="(?:[^\\\\-]|"+n.source+")";e.languages.regex={group:{pattern:/((?:^|[^\\])(?:\\\\)*)\((?:[^\\()]|\\[\s\S])*\)/,lookbehind:!0,inside:{punctuation:/^\((?:\?(?:]))?|\)$/,content:{pattern:/[\s\S]+/,inside:null}}},charset:{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\]|\\[\s\S])*\]/,lookbehind:!0,inside:{punctuation:/^\[\^?|\]$/,content:{pattern:/[\s\S]+/,inside:{range:{pattern:RegExp(i+"-"+i,"i"),inside:{escape:n,punctuation:/-/}},"char-class":a,escape:n}}}},escape:n,"char-class":a,backreference:/\\[1-9]/,anchor:/[$^]|\\b/i,quantifiers:/[+*?|]|\{(?:\d+,?\d*|,\d+)\}/},e.languages.regex.group.inside.content.inside=e.languages.regex}(Prism); \ No newline at end of file diff --git a/components/prism-regex.js b/components/prism-regex.js new file mode 100644 index 0000000000..bbb25cd231 --- /dev/null +++ b/components/prism-regex.js @@ -0,0 +1,91 @@ +(function (Prism) { + + var escape = /\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|[^bBdDkpPsSwW1-9])/ + var charClass = /\\[wsd]|\.|\\p{[^{}]+}/i + + var rangeChar = '(?:[^\\\\-]|' + escape.source + ')'; + var range = RegExp(rangeChar + '-' + rangeChar); + + // the name of a capturing group + var groupName = { + pattern: /(<)[^<>]+(?=>)/, + lookbehind: true, + alias: 'variable' + }; + + var backreference = [ + /\\[1-9]/, + { + pattern: /\\k<[^<>]+>/, + inside: { + 'group-name': groupName + } + } + ]; + + Prism.languages.regex = { + 'char-set': { + pattern: /((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/, + lookbehind: true, + inside: { + 'punctuation': /^\[\^?|\]$/, + 'content': { + pattern: /[\s\S]+/, + lookbehind: true, + inside: { + 'range': { + pattern: range, + inside: { + 'escape': escape, + 'punctuation': /-/ + } + }, + 'escape': escape, + 'char-class': charClass, + 'backreference': backreference + } + } + } + }, + 'escape': escape, + 'char-class': charClass, + 'backreference': backreference, + 'group': [ + { + // (), (?), (?>), (?:), (?=), (?!), (?<=), (?]+>|[>:]|]+(?=>)/,lookbehind:!0,alias:"variable"},s=[/\\[1-9]/,{pattern:/\\k<[^<>]+>/,inside:{"group-name":t}}];e.languages.regex={"char-set":{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{punctuation:/^\[\^?|\]$/,content:{pattern:/[\s\S]+/,lookbehind:!0,inside:{range:{pattern:i,inside:{escape:a,punctuation:/-/}},escape:a,"char-class":n,backreference:s}}}},escape:a,"char-class":n,backreference:s,group:[{pattern:/\((?:\?(?:<[^<>]+>|[>:]| Date: Sun, 30 Dec 2018 00:33:08 +0100 Subject: [PATCH 03/12] Added tests --- .../javascript!+regex/regex_inclusion.test | 36 ++++++++++++ tests/languages/regex/anchor_feature.test | 17 ++++++ .../regex/backreference_feature.test | 26 +++++++++ tests/languages/regex/char-class_feature.test | 25 ++++++++ tests/languages/regex/charset_feature.test | 38 ++++++++++++ tests/languages/regex/escape_feature.test | 42 ++++++++++++++ tests/languages/regex/group_feature.test | 40 +++++++++++++ tests/languages/regex/quantifier_feature.test | 17 ++++++ tests/languages/regex/range_feature.test | 58 +++++++++++++++++++ 9 files changed, 299 insertions(+) create mode 100644 tests/languages/javascript!+regex/regex_inclusion.test create mode 100644 tests/languages/regex/anchor_feature.test create mode 100644 tests/languages/regex/backreference_feature.test create mode 100644 tests/languages/regex/char-class_feature.test create mode 100644 tests/languages/regex/charset_feature.test create mode 100644 tests/languages/regex/escape_feature.test create mode 100644 tests/languages/regex/group_feature.test create mode 100644 tests/languages/regex/quantifier_feature.test create mode 100644 tests/languages/regex/range_feature.test diff --git a/tests/languages/javascript!+regex/regex_inclusion.test b/tests/languages/javascript!+regex/regex_inclusion.test new file mode 100644 index 0000000000..e2b1245aa3 --- /dev/null +++ b/tests/languages/javascript!+regex/regex_inclusion.test @@ -0,0 +1,36 @@ +/a+(?:[a-z]|\d)?/im; + +---------------------------------------------------- + +[ + ["regex", [ + ["delimiter", "/"], + ["language-regex", [ + "a", + ["quantifier", "+"], + ["group", ["(?:"]], + ["char-set", [ + ["punctuation", "["], + ["content", [ + ["range", [ + "a", + ["punctuation", "-"], + "z" + ]] + ]], + ["punctuation", "]"] + ]], + ["alternation", "|"], + ["char-class", "\\d"], + ["group", ")"], + ["quantifier", "?"] + ]], + ["delimiter", "/"], + ["flags", "im"] + ]], + ["punctuation", ";"] +] + +---------------------------------------------------- + +Checks for regex inclusion in JavaScript. diff --git a/tests/languages/regex/anchor_feature.test b/tests/languages/regex/anchor_feature.test new file mode 100644 index 0000000000..e3348104d6 --- /dev/null +++ b/tests/languages/regex/anchor_feature.test @@ -0,0 +1,17 @@ +^ +$ +\b +\B + +---------------------------------------------------- + +[ + ["anchor", "^"], + ["anchor", "$"], + ["anchor", "\\b"], + ["anchor", "\\B"] +] + +---------------------------------------------------- + +Checks for anchors. diff --git a/tests/languages/regex/backreference_feature.test b/tests/languages/regex/backreference_feature.test new file mode 100644 index 0000000000..fab6226d04 --- /dev/null +++ b/tests/languages/regex/backreference_feature.test @@ -0,0 +1,26 @@ +\1 \2 \3 \4 \5 \6 \7 \8 \9 +\k + +---------------------------------------------------- + +[ + ["backreference", "\\1"], + ["backreference", "\\2"], + ["backreference", "\\3"], + ["backreference", "\\4"], + ["backreference", "\\5"], + ["backreference", "\\6"], + ["backreference", "\\7"], + ["backreference", "\\8"], + ["backreference", "\\9"], + + ["backreference", [ + "\\k<", + ["group-name", "name"], + ">" + ]] +] + +---------------------------------------------------- + +Checks for backreferences. diff --git a/tests/languages/regex/char-class_feature.test b/tests/languages/regex/char-class_feature.test new file mode 100644 index 0000000000..bf983afc8f --- /dev/null +++ b/tests/languages/regex/char-class_feature.test @@ -0,0 +1,25 @@ +. +\w \W +\s \S +\d \D +\p{ASCII} +\P{ASCII} + +---------------------------------------------------- + +[ + ["char-class", "."], + ["char-class", "\\w"], + ["char-class", "\\W"], + ["char-class", "\\s"], + ["char-class", "\\S"], + ["char-class", "\\d"], + ["char-class", "\\D"], + + ["char-class", "\\p{ASCII}"], + ["char-class", "\\P{ASCII}"] +] + +---------------------------------------------------- + +Checks for character classes. diff --git a/tests/languages/regex/charset_feature.test b/tests/languages/regex/charset_feature.test new file mode 100644 index 0000000000..84f3110e77 --- /dev/null +++ b/tests/languages/regex/charset_feature.test @@ -0,0 +1,38 @@ +[] +[^] +[foo] +[\]] + +---------------------------------------------------- + +[ + ["char-set", [ + ["punctuation", "["], + ["punctuation", "]"] + ]], + + ["char-set", [ + ["punctuation", "[^"], + ["punctuation", "]"] + ]], + + ["char-set", [ + ["punctuation", "["], + ["content", [ + "foo" + ]], + ["punctuation", "]"] + ]], + + ["char-set", [ + ["punctuation", "["], + ["content", [ + ["escape", "\\]"] + ]], + ["punctuation", "]"] + ]] +] + +---------------------------------------------------- + +Checks for character sets. diff --git a/tests/languages/regex/escape_feature.test b/tests/languages/regex/escape_feature.test new file mode 100644 index 0000000000..17840f92da --- /dev/null +++ b/tests/languages/regex/escape_feature.test @@ -0,0 +1,42 @@ +\0 \\ \. \+ +\xFF +\uFFFF \u{12345} +\cA \cZ +\01 \077 \377 +\n \r \t \f \a + +\[ \] + +---------------------------------------------------- + +[ + ["escape", "\\0"], + ["escape", "\\\\"], + ["escape", "\\."], + ["escape", "\\+"], + + ["escape", "\\xFF"], + + ["escape", "\\uFFFF"], + ["escape", "\\u{12345}"], + + ["escape", "\\cA"], + ["escape", "\\cZ"], + + ["escape", "\\01"], + ["escape", "\\077"], + ["escape", "\\377"], + + ["escape", "\\n"], + ["escape", "\\r"], + ["escape", "\\t"], + ["escape", "\\f"], + ["escape", "\\a"], + + ["escape", "\\["], + ["escape", "\\]"] +] + +---------------------------------------------------- + +Checks for escapes. diff --git a/tests/languages/regex/group_feature.test b/tests/languages/regex/group_feature.test new file mode 100644 index 0000000000..68e0a65232 --- /dev/null +++ b/tests/languages/regex/group_feature.test @@ -0,0 +1,40 @@ +() +(?:) +(?>) +(?=) (?!) +(?<=) (?) + +---------------------------------------------------- + +[ + ["group", ["("]], + ["group", ")"], + + ["group", ["(?:"]], + ["group", ")"], + + ["group", ["(?>"]], + ["group", ")"], + + ["group", ["(?="]], + ["group", ")"], + ["group", ["(?!"]], + ["group", ")"], + + ["group", ["(?<="]], + ["group", ")"], + ["group", ["(?"] + ], + ["group", ")"] +] + +---------------------------------------------------- + +Checks for groups. diff --git a/tests/languages/regex/quantifier_feature.test b/tests/languages/regex/quantifier_feature.test new file mode 100644 index 0000000000..87246d65bd --- /dev/null +++ b/tests/languages/regex/quantifier_feature.test @@ -0,0 +1,17 @@ +* + ? +{2} {2,} {0,1} + +---------------------------------------------------- + +[ + ["quantifier", "*"], + ["quantifier", "+"], + ["quantifier", "?"], + ["quantifier", "{2}"], + ["quantifier", "{2,}"], + ["quantifier", "{0,1}"] +] + +---------------------------------------------------- + +Checks for quantifiers. diff --git a/tests/languages/regex/range_feature.test b/tests/languages/regex/range_feature.test new file mode 100644 index 0000000000..8f5d6c6af1 --- /dev/null +++ b/tests/languages/regex/range_feature.test @@ -0,0 +1,58 @@ +[a-zA-Z0-9] +[\xa1-Z\u00FF-\u{256}] +[^-aaa-] + +---------------------------------------------------- + +[ + ["char-set", [ + ["punctuation", "["], + ["content", [ + ["range", [ + "a", + ["punctuation", "-"], + "z" + ]], + ["range", [ + "A", + ["punctuation", "-"], + "Z" + ]], + ["range", [ + "0", + ["punctuation", "-"], + "9" + ]] + ]], + ["punctuation", "]"] + ]], + + ["char-set", [ + ["punctuation", "["], + ["content", [ + ["range", [ + ["escape", "\\xa1"], + ["punctuation", "-"], + "Z" + ]], + ["range", [ + ["escape", "\\u00FF"], + ["punctuation", "-"], + ["escape", "\\u{256}"] + ]] + ]], + ["punctuation", "]"] + ]], + + ["char-set", [ + ["punctuation", "[^"], + ["content", [ + "-aaa-" + ]], + ["punctuation", "]"] + ]] +] + +---------------------------------------------------- + +Checks for character ranges in sets. From 210c225c7659a5a7da04e884682e334974d3560a Mon Sep 17 00:00:00 2001 From: RunDevelopment Date: Sun, 30 Dec 2018 00:49:25 +0100 Subject: [PATCH 04/12] Renaming --- components/prism-regex.js | 22 +++++++++---------- components/prism-regex.min.js | 2 +- .../javascript!+regex/regex_inclusion.test | 6 ++--- tests/languages/regex/charset_feature.test | 16 +++++++------- tests/languages/regex/range_feature.test | 22 +++++++++---------- 5 files changed, 33 insertions(+), 35 deletions(-) diff --git a/components/prism-regex.js b/components/prism-regex.js index bbb25cd231..6eee5c440a 100644 --- a/components/prism-regex.js +++ b/components/prism-regex.js @@ -28,7 +28,7 @@ pattern: /((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/, lookbehind: true, inside: { - 'punctuation': /^\[\^?|\]$/, + 'char-set-punctuation': /^\[\^?|\]$/, 'content': { pattern: /[\s\S]+/, lookbehind: true, @@ -37,7 +37,7 @@ pattern: range, inside: { 'escape': escape, - 'punctuation': /-/ + 'delimiter': /-/ } }, 'escape': escape, @@ -66,15 +66,6 @@ }; - var inlineRegex = { - 'flags': /[a-z]+$/, - 'delimiter': /^\/|\/$/, - 'language-regex': { - pattern: /[\s\S]+/, - inside: Prism.languages.regex - } - }; - [ 'actionscript', 'coffescript', @@ -84,7 +75,14 @@ ].forEach(function (lang) { var grammar = Prism.languages[lang]; if (grammar) { - grammar['regex'].inside = inlineRegex; + grammar['regex'].inside = { + 'flags': /[a-z]+$/, + 'delimiter': /^\/|\/$/, + 'language-regex': { + pattern: /[\s\S]+/, + inside: Prism.languages.regex + } + }; } }); diff --git a/components/prism-regex.min.js b/components/prism-regex.min.js index 05cc14c654..d0da53e7a2 100644 --- a/components/prism-regex.min.js +++ b/components/prism-regex.min.js @@ -1 +1 @@ -!function(e){var a=/\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|[^bBdDkpPsSwW1-9])/,n=/\\[wsd]|\.|\\p{[^{}]+}/i,r="(?:[^\\\\-]|"+a.source+")",i=RegExp(r+"-"+r),t={pattern:/(<)[^<>]+(?=>)/,lookbehind:!0,alias:"variable"},s=[/\\[1-9]/,{pattern:/\\k<[^<>]+>/,inside:{"group-name":t}}];e.languages.regex={"char-set":{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{punctuation:/^\[\^?|\]$/,content:{pattern:/[\s\S]+/,lookbehind:!0,inside:{range:{pattern:i,inside:{escape:a,punctuation:/-/}},escape:a,"char-class":n,backreference:s}}}},escape:a,"char-class":n,backreference:s,group:[{pattern:/\((?:\?(?:<[^<>]+>|[>:]|]+(?=>)/,lookbehind:!0,alias:"variable"},s=[/\\[1-9]/,{pattern:/\\k<[^<>]+>/,inside:{"group-name":t}}];e.languages.regex={"char-set":{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"char-set-punctuation":/^\[\^?|\]$/,content:{pattern:/[\s\S]+/,lookbehind:!0,inside:{range:{pattern:i,inside:{escape:a,delimiter:/-/}},escape:a,"char-class":n,backreference:s}}}},escape:a,"char-class":n,backreference:s,group:[{pattern:/\((?:\?(?:<[^<>]+>|[>:]| Date: Sun, 30 Dec 2018 01:21:26 +0100 Subject: [PATCH 05/12] Add regex for Vala --- components/prism-regex.js | 3 ++- components/prism-regex.min.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/prism-regex.js b/components/prism-regex.js index 6eee5c440a..8cca96a388 100644 --- a/components/prism-regex.js +++ b/components/prism-regex.js @@ -71,7 +71,8 @@ 'coffescript', 'flow', 'javascript', - 'typescript' + 'typescript', + 'vala' ].forEach(function (lang) { var grammar = Prism.languages[lang]; if (grammar) { diff --git a/components/prism-regex.min.js b/components/prism-regex.min.js index d0da53e7a2..bbbfcfe387 100644 --- a/components/prism-regex.min.js +++ b/components/prism-regex.min.js @@ -1 +1 @@ -!function(e){var a=/\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|[^bBdDkpPsSwW1-9])/,n=/\\[wsd]|\.|\\p{[^{}]+}/i,r="(?:[^\\\\-]|"+a.source+")",i=RegExp(r+"-"+r),t={pattern:/(<)[^<>]+(?=>)/,lookbehind:!0,alias:"variable"},s=[/\\[1-9]/,{pattern:/\\k<[^<>]+>/,inside:{"group-name":t}}];e.languages.regex={"char-set":{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"char-set-punctuation":/^\[\^?|\]$/,content:{pattern:/[\s\S]+/,lookbehind:!0,inside:{range:{pattern:i,inside:{escape:a,delimiter:/-/}},escape:a,"char-class":n,backreference:s}}}},escape:a,"char-class":n,backreference:s,group:[{pattern:/\((?:\?(?:<[^<>]+>|[>:]|]+(?=>)/,lookbehind:!0,alias:"variable"},s=[/\\[1-9]/,{pattern:/\\k<[^<>]+>/,inside:{"group-name":t}}];e.languages.regex={"char-set":{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"char-set-punctuation":/^\[\^?|\]$/,content:{pattern:/[\s\S]+/,lookbehind:!0,inside:{range:{pattern:i,inside:{escape:a,delimiter:/-/}},escape:a,"char-class":n,backreference:s}}}},escape:a,"char-class":n,backreference:s,group:[{pattern:/\((?:\?(?:<[^<>]+>|[>:]| Date: Sun, 30 Dec 2018 01:36:20 +0100 Subject: [PATCH 06/12] Renaming, refactoring --- components/prism-regex.js | 28 ++++--- components/prism-regex.min.js | 2 +- .../javascript!+regex/regex_inclusion.test | 18 ++--- tests/languages/regex/char-class_feature.test | 25 ------- tests/languages/regex/charclass_feature.test | 25 +++++++ tests/languages/regex/charset_feature.test | 33 ++++----- tests/languages/regex/range_feature.test | 73 +++++++++---------- 7 files changed, 96 insertions(+), 108 deletions(-) delete mode 100644 tests/languages/regex/char-class_feature.test create mode 100644 tests/languages/regex/charclass_feature.test diff --git a/components/prism-regex.js b/components/prism-regex.js index 8cca96a388..f932c874bc 100644 --- a/components/prism-regex.js +++ b/components/prism-regex.js @@ -24,31 +24,29 @@ ]; Prism.languages.regex = { - 'char-set': { + 'charset': { pattern: /((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/, lookbehind: true, inside: { - 'char-set-punctuation': /^\[\^?|\]$/, - 'content': { - pattern: /[\s\S]+/, + 'charset-negation': { + pattern: /(^\[)\^/, lookbehind: true, + }, + 'charset-punctuation': /^\[|\]$/, + 'range': { + pattern: range, inside: { - 'range': { - pattern: range, - inside: { - 'escape': escape, - 'delimiter': /-/ - } - }, 'escape': escape, - 'char-class': charClass, - 'backreference': backreference + 'range-punctuation': /-/ } - } + }, + 'escape': escape, + 'charclass': charClass, + 'backreference': backreference } }, 'escape': escape, - 'char-class': charClass, + 'charclass': charClass, 'backreference': backreference, 'group': [ { diff --git a/components/prism-regex.min.js b/components/prism-regex.min.js index bbbfcfe387..77d3bfd3fb 100644 --- a/components/prism-regex.min.js +++ b/components/prism-regex.min.js @@ -1 +1 @@ -!function(e){var a=/\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|[^bBdDkpPsSwW1-9])/,n=/\\[wsd]|\.|\\p{[^{}]+}/i,r="(?:[^\\\\-]|"+a.source+")",i=RegExp(r+"-"+r),t={pattern:/(<)[^<>]+(?=>)/,lookbehind:!0,alias:"variable"},s=[/\\[1-9]/,{pattern:/\\k<[^<>]+>/,inside:{"group-name":t}}];e.languages.regex={"char-set":{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"char-set-punctuation":/^\[\^?|\]$/,content:{pattern:/[\s\S]+/,lookbehind:!0,inside:{range:{pattern:i,inside:{escape:a,delimiter:/-/}},escape:a,"char-class":n,backreference:s}}}},escape:a,"char-class":n,backreference:s,group:[{pattern:/\((?:\?(?:<[^<>]+>|[>:]|]+(?=>)/,lookbehind:!0,alias:"variable"},s=[/\\[1-9]/,{pattern:/\\k<[^<>]+>/,inside:{"group-name":t}}];e.languages.regex={charset:{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"charset-negation":{pattern:/(^\[)\^/,lookbehind:!0},"charset-punctuation":/^\[|\]$/,range:{pattern:i,inside:{escape:a,"range-punctuation":/-/}},escape:a,charclass:n,backreference:s}},escape:a,charclass:n,backreference:s,group:[{pattern:/\((?:\?(?:<[^<>]+>|[>:]| Date: Fri, 25 Jan 2019 20:48:23 +0100 Subject: [PATCH 07/12] Added remaining Java/C# groups and anchors --- components/prism-regex.js | 15 ++++++++------ components/prism-regex.min.js | 2 +- tests/languages/regex/anchor_feature.test | 8 ++++++++ tests/languages/regex/group_feature.test | 24 +++++++++++++++++++++++ 4 files changed, 42 insertions(+), 7 deletions(-) diff --git a/components/prism-regex.js b/components/prism-regex.js index f932c874bc..fffacd39f5 100644 --- a/components/prism-regex.js +++ b/components/prism-regex.js @@ -1,6 +1,6 @@ (function (Prism) { - var escape = /\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|[^bBdDkpPsSwW1-9])/ + var escape = /\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|[^dDkpPsSwW1-9ABbGZz])/ var charClass = /\\[wsd]|\.|\\p{[^{}]+}/i var rangeChar = '(?:[^\\\\-]|' + escape.source + ')'; @@ -8,7 +8,7 @@ // the name of a capturing group var groupName = { - pattern: /(<)[^<>]+(?=>)/, + pattern: /(<|')[^<>']+(?=[>']$)/, lookbehind: true, alias: 'variable' }; @@ -16,7 +16,7 @@ var backreference = [ /\\[1-9]/, { - pattern: /\\k<[^<>]+>/, + pattern: /\\k<[^<>']+>/, inside: { 'group-name': groupName } @@ -50,15 +50,18 @@ 'backreference': backreference, 'group': [ { - // (), (?), (?>), (?:), (?=), (?!), (?<=), (?]+>|[>:]|), (?'name'), (?>), (?:), (?=), (?!), (?<=), (?']+>|'[^<>']+'|[>:]|]+(?=>)/,lookbehind:!0,alias:"variable"},s=[/\\[1-9]/,{pattern:/\\k<[^<>]+>/,inside:{"group-name":t}}];e.languages.regex={charset:{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"charset-negation":{pattern:/(^\[)\^/,lookbehind:!0},"charset-punctuation":/^\[|\]$/,range:{pattern:i,inside:{escape:a,"range-punctuation":/-/}},escape:a,charclass:n,backreference:s}},escape:a,charclass:n,backreference:s,group:[{pattern:/\((?:\?(?:<[^<>]+>|[>:]|']+(?=[>']$)/,lookbehind:!0,alias:"variable"},s=[/\\[1-9]/,{pattern:/\\k<[^<>']+>/,inside:{"group-name":t}}];e.languages.regex={charset:{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"charset-negation":{pattern:/(^\[)\^/,lookbehind:!0},"charset-punctuation":/^\[|\]$/,range:{pattern:i,inside:{escape:a,"range-punctuation":/-/}},escape:a,charclass:n,backreference:s}},escape:a,charclass:n,backreference:s,group:[{pattern:/\((?:\?(?:<[^<>']+>|'[^<>']+'|[>:]|) (?=) (?!) (?<=) (?) +(?'name') + +(?i) +(?i:) +(?idmsuxU-idmsuxU) +(?idmsux-idmsux:X) ---------------------------------------------------- @@ -32,6 +39,23 @@ ["group-name", "name"], ">"] ], + ["group", ")"], + + ["group", [ + "(?'", + ["group-name", "name"], + "'"] + ], + ["group", ")"], + + ["group", ["(?i"]], + ["group", ")"], + ["group", ["(?i:"]], + ["group", ")"], + ["group", ["(?idmsuxU-idmsuxU"]], + ["group", ")"], + ["group", ["(?idmsux-idmsux:"]], + "X", ["group", ")"] ] From fc0320390a39f9ec9854fcfbaad2cdcda0c4d21b Mon Sep 17 00:00:00 2001 From: RunDevelopment Date: Fri, 25 Jan 2019 21:16:49 +0100 Subject: [PATCH 08/12] New escape handling --- components/prism-regex.js | 18 ++++++++++++------ components/prism-regex.min.js | 2 +- tests/languages/regex/charset_feature.test | 5 +++-- tests/languages/regex/escape_feature.test | 10 +++++----- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/components/prism-regex.js b/components/prism-regex.js index fffacd39f5..47d97f8404 100644 --- a/components/prism-regex.js +++ b/components/prism-regex.js @@ -1,6 +1,10 @@ (function (Prism) { - var escape = /\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|[^dDkpPsSwW1-9ABbGZz])/ + var specialEscape = { + pattern: /\\[\\(){}[\]^$+*?|.]/, + alias: 'escape' + }; + var escape = /\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|.)/ var charClass = /\\[wsd]|\.|\\p{[^{}]+}/i var rangeChar = '(?:[^\\\\-]|' + escape.source + ')'; @@ -14,7 +18,7 @@ }; var backreference = [ - /\\[1-9]/, + /\\(?![123][0-7]{2})[1-9]/, // a backreference which is not an octal escape { pattern: /\\k<[^<>']+>/, inside: { @@ -40,14 +44,17 @@ 'range-punctuation': /-/ } }, - 'escape': escape, + 'special-escape': specialEscape, 'charclass': charClass, - 'backreference': backreference + 'backreference': backreference, + 'escape': escape } }, - 'escape': escape, + 'special-escape': specialEscape, 'charclass': charClass, 'backreference': backreference, + 'anchor': /[$^]|\\[ABbGZz]/, + 'escape': escape, 'group': [ { // https://docs.oracle.com/javase/10/docs/api/java/util/regex/Pattern.html @@ -61,7 +68,6 @@ }, /\)/ ], - 'anchor': /[$^]|\\[ABbGZz]/, 'quantifier': /[+*?]|\{(?:\d+,?\d*)\}/, 'alternation': /\|/ }; diff --git a/components/prism-regex.min.js b/components/prism-regex.min.js index 8bf6224443..48788667b4 100644 --- a/components/prism-regex.min.js +++ b/components/prism-regex.min.js @@ -1 +1 @@ -!function(e){var a=/\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|[^dDkpPsSwW1-9ABbGZz])/,n=/\\[wsd]|\.|\\p{[^{}]+}/i,r="(?:[^\\\\-]|"+a.source+")",i=RegExp(r+"-"+r),t={pattern:/(<|')[^<>']+(?=[>']$)/,lookbehind:!0,alias:"variable"},s=[/\\[1-9]/,{pattern:/\\k<[^<>']+>/,inside:{"group-name":t}}];e.languages.regex={charset:{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"charset-negation":{pattern:/(^\[)\^/,lookbehind:!0},"charset-punctuation":/^\[|\]$/,range:{pattern:i,inside:{escape:a,"range-punctuation":/-/}},escape:a,charclass:n,backreference:s}},escape:a,charclass:n,backreference:s,group:[{pattern:/\((?:\?(?:<[^<>']+>|'[^<>']+'|[>:]|']+(?=[>']$)/,lookbehind:!0,alias:"variable"},c=[/\\(?![123][0-7]{2})[1-9]/,{pattern:/\\k<[^<>']+>/,inside:{"group-name":t}}];e.languages.regex={charset:{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"charset-negation":{pattern:/(^\[)\^/,lookbehind:!0},"charset-punctuation":/^\[|\]$/,range:{pattern:s,inside:{escape:n,"range-punctuation":/-/}},"special-escape":a,charclass:r,backreference:c,escape:n}},"special-escape":a,charclass:r,backreference:c,anchor:/[$^]|\\[ABbGZz]/,escape:n,group:[{pattern:/\((?:\?(?:<[^<>']+>|'[^<>']+'|[>:]| Date: Sun, 3 Mar 2019 22:46:10 +0100 Subject: [PATCH 09/12] Fixed regex u{} escape --- components/prism-regex.js | 2 +- tests/languages/regex/escape_feature.test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/prism-regex.js b/components/prism-regex.js index 47d97f8404..89b61bd665 100644 --- a/components/prism-regex.js +++ b/components/prism-regex.js @@ -4,7 +4,7 @@ pattern: /\\[\\(){}[\]^$+*?|.]/, alias: 'escape' }; - var escape = /\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|.)/ + var escape = /\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{[\da-fA-F]+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|.)/ var charClass = /\\[wsd]|\.|\\p{[^{}]+}/i var rangeChar = '(?:[^\\\\-]|' + escape.source + ')'; diff --git a/tests/languages/regex/escape_feature.test b/tests/languages/regex/escape_feature.test index 7d33f7c84d..460faa7001 100644 --- a/tests/languages/regex/escape_feature.test +++ b/tests/languages/regex/escape_feature.test @@ -1,6 +1,6 @@ \0 \\ \. \+ \xFF -\uFFFF \u{12345} +\uFFFF \u{10FFFF} \cA \cZ \01 \077 \377 \n \r \t \f \a @@ -18,7 +18,7 @@ ["escape", "\\xFF"], ["escape", "\\uFFFF"], - ["escape", "\\u{12345}"], + ["escape", "\\u{10FFFF}"], ["escape", "\\cA"], ["escape", "\\cZ"], From adaefd9fcbbe2f87b47a50fdff6b47f273d74568 Mon Sep 17 00:00:00 2001 From: RunDevelopment Date: Sun, 3 Mar 2019 22:46:52 +0100 Subject: [PATCH 10/12] Rebuild Prism --- components/prism-regex.min.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/prism-regex.min.js b/components/prism-regex.min.js index 48788667b4..3be3c306dc 100644 --- a/components/prism-regex.min.js +++ b/components/prism-regex.min.js @@ -1 +1 @@ -!function(e){var a={pattern:/\\[\\(){}[\]^$+*?|.]/,alias:"escape"},n=/\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{\d+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|.)/,r=/\\[wsd]|\.|\\p{[^{}]+}/i,i="(?:[^\\\\-]|"+n.source+")",s=RegExp(i+"-"+i),t={pattern:/(<|')[^<>']+(?=[>']$)/,lookbehind:!0,alias:"variable"},c=[/\\(?![123][0-7]{2})[1-9]/,{pattern:/\\k<[^<>']+>/,inside:{"group-name":t}}];e.languages.regex={charset:{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"charset-negation":{pattern:/(^\[)\^/,lookbehind:!0},"charset-punctuation":/^\[|\]$/,range:{pattern:s,inside:{escape:n,"range-punctuation":/-/}},"special-escape":a,charclass:r,backreference:c,escape:n}},"special-escape":a,charclass:r,backreference:c,anchor:/[$^]|\\[ABbGZz]/,escape:n,group:[{pattern:/\((?:\?(?:<[^<>']+>|'[^<>']+'|[>:]|']+(?=[>']$)/,lookbehind:!0,alias:"variable"},c=[/\\(?![123][0-7]{2})[1-9]/,{pattern:/\\k<[^<>']+>/,inside:{"group-name":t}}];e.languages.regex={charset:{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"charset-negation":{pattern:/(^\[)\^/,lookbehind:!0},"charset-punctuation":/^\[|\]$/,range:{pattern:s,inside:{escape:n,"range-punctuation":/-/}},"special-escape":a,charclass:r,backreference:c,escape:n}},"special-escape":a,charclass:r,backreference:c,anchor:/[$^]|\\[ABbGZz]/,escape:n,group:[{pattern:/\((?:\?(?:<[^<>']+>|'[^<>']+'|[>:]| Date: Mon, 4 Mar 2019 23:06:07 +0100 Subject: [PATCH 11/12] Added missing Vala dependency --- components.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components.json b/components.json index f4c1d28f80..249d49d6be 100644 --- a/components.json +++ b/components.json @@ -741,7 +741,8 @@ "coffeescript", "flow", "javascript", - "typescript" + "typescript", + "vala" ], "owner": "RunDevelopment" }, From 1d0908b584d9cd8b8ca6001ac584cadc1bd6b18e Mon Sep 17 00:00:00 2001 From: RunDevelopment Date: Mon, 4 Mar 2019 23:16:19 +0100 Subject: [PATCH 12/12] Changed token names to ensure that highlighting doesn't change --- components/prism-regex.js | 4 ++-- components/prism-regex.min.js | 2 +- tests/languages/javascript!+regex/regex_inclusion.test | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/prism-regex.js b/components/prism-regex.js index 89b61bd665..ec94277045 100644 --- a/components/prism-regex.js +++ b/components/prism-regex.js @@ -84,8 +84,8 @@ var grammar = Prism.languages[lang]; if (grammar) { grammar['regex'].inside = { - 'flags': /[a-z]+$/, - 'delimiter': /^\/|\/$/, + 'regex-flags': /[a-z]+$/, + 'regex-delimiter': /^\/|\/$/, 'language-regex': { pattern: /[\s\S]+/, inside: Prism.languages.regex diff --git a/components/prism-regex.min.js b/components/prism-regex.min.js index 3be3c306dc..0d81ff3e1b 100644 --- a/components/prism-regex.min.js +++ b/components/prism-regex.min.js @@ -1 +1 @@ -!function(e){var a={pattern:/\\[\\(){}[\]^$+*?|.]/,alias:"escape"},n=/\\(?:x[\da-fA-F]{2}|u[\da-fA-F]{4}|u\{[\da-fA-F]+\}|c[a-zA-Z]|0[0-7]{0,2}|[123][0-7]{2}|.)/,r=/\\[wsd]|\.|\\p{[^{}]+}/i,i="(?:[^\\\\-]|"+n.source+")",s=RegExp(i+"-"+i),t={pattern:/(<|')[^<>']+(?=[>']$)/,lookbehind:!0,alias:"variable"},c=[/\\(?![123][0-7]{2})[1-9]/,{pattern:/\\k<[^<>']+>/,inside:{"group-name":t}}];e.languages.regex={charset:{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"charset-negation":{pattern:/(^\[)\^/,lookbehind:!0},"charset-punctuation":/^\[|\]$/,range:{pattern:s,inside:{escape:n,"range-punctuation":/-/}},"special-escape":a,charclass:r,backreference:c,escape:n}},"special-escape":a,charclass:r,backreference:c,anchor:/[$^]|\\[ABbGZz]/,escape:n,group:[{pattern:/\((?:\?(?:<[^<>']+>|'[^<>']+'|[>:]|']+(?=[>']$)/,lookbehind:!0,alias:"variable"},c=[/\\(?![123][0-7]{2})[1-9]/,{pattern:/\\k<[^<>']+>/,inside:{"group-name":t}}];e.languages.regex={charset:{pattern:/((?:^|[^\\])(?:\\\\)*)\[(?:[^\\\]]|\\[\s\S])*\]/,lookbehind:!0,inside:{"charset-negation":{pattern:/(^\[)\^/,lookbehind:!0},"charset-punctuation":/^\[|\]$/,range:{pattern:s,inside:{escape:n,"range-punctuation":/-/}},"special-escape":a,charclass:r,backreference:c,escape:n}},"special-escape":a,charclass:r,backreference:c,anchor:/[$^]|\\[ABbGZz]/,escape:n,group:[{pattern:/\((?:\?(?:<[^<>']+>|'[^<>']+'|[>:]|