diff --git a/package-lock.json b/package-lock.json index ffd2f90..d4a8414 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5352,9 +5352,9 @@ } }, "highlight.js": { - "version": "9.16.2", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.16.2.tgz", - "integrity": "sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==" + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.0.2.tgz", + "integrity": "sha512-2gMT2MHU6/2OjAlnaOE2LFdr9dwviDN3Q2lSw7Ois3/5uTtahbgYTkr4EPoY828ps+2eQWiixPTF8+phU6Ofkg==" }, "hook-std": { "version": "2.0.0", @@ -13457,6 +13457,12 @@ "typescript": "3.5.x" }, "dependencies": { + "highlight.js": { + "version": "9.18.1", + "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz", + "integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==", + "dev": true + }, "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", diff --git a/package.json b/package.json index 6daf64f..ae2c753 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "homepage": "https://github.com/felixfbecker/cli-highlight#readme", "dependencies": { "chalk": "^3.0.0", - "highlight.js": "^9.6.0", + "highlight.js": "^10.0.0", "mz": "^2.4.0", "parse5": "^5.1.1", "parse5-htmlparser2-tree-adapter": "^5.1.1", diff --git a/src/test/__snapshots__/test.ts.snap b/src/test/__snapshots__/test.ts.snap index 3a9d69c..a68c0cc 100644 --- a/src/test/__snapshots__/test.ts.snap +++ b/src/test/__snapshots__/test.ts.snap @@ -64,30 +64,30 @@ exports[`highlight() should color ARM Assembly correctly 1`] = ` .global connect connect: - mov  r3, #2 ; s->sin_family = AF_INET - strh  r3, [sp] - ldr  r3, =server_port ; s->sin_port = server_port - ldr  r3, [r3] - strh  r3, [sp, #2] - ldr  r3, =server_addr ; s->sin_addr = server_addr - ldr  r3, [r3] - str  r3, [sp, #4] - mov  r3, #0 ; bzero(&s->sin_zero) - str  r3, [sp, #8] - str  r3, [sp, #12] - mov  r1, sp ; const struct sockaddr *addr = sp - - ldr  r7, =connect_call - ldr  r7, [r7] - swi  #0 - - add  sp, sp, #16 - pop  {r0} ; pop sockfd - - pop  {r7} - pop  {fp, ip, lr} - mov  sp, ip - bx  lr + mov r3, #2 ; s->sin_family = AF_INET + strh r3, [sp] + ldr r3, =server_port ; s->sin_port = server_port + ldr r3, [r3] + strh r3, [sp, #2] + ldr r3, =server_addr ; s->sin_addr = server_addr + ldr r3, [r3] + str r3, [sp, #4] + mov r3, #0 ; bzero(&s->sin_zero) + str r3, [sp, #8] + str r3, [sp, #12] + mov r1, sp ; const struct sockaddr *addr = sp + + ldr r7, =connect_call + ldr r7, [r7] + swi #0 + + add sp, sp, #16 + pop {r0} ; pop sockfd + + pop {r7} + pop {fp, ip, lr} + mov sp, ip + bx lr .data socket_call: .long 281 @@ -185,7 +185,7 @@ RewriteRule . index.php [NC,L] ExpiresActive On ExpiresByType application/x-javascript \\"access plus 1 days\\" -Order Deny,Allow +Order Deny,Allow Allow from All @@ -483,7 +483,7 @@ exports[`highlight() should color Brainfuck correctly 1`] = ` `; exports[`highlight() should color HTML correctly 1`] = ` -" +" <html> <head> <title>Hello World! @@ -585,7 +585,7 @@ exports[`highlight() should color YAML correctly 1`] = ` `; exports[`highlight() should color Zephir correctly 1`] = ` -"function testBefore( a, var b = 5, int c = 10) +"function testBefore( a, var b = 5, int c = 10) { a->method1(); @@ -613,25 +613,25 @@ exports[`highlight() should color Zephir correctly 1`] = ` } // See fn is allowed like shortcut - public fn method2() -> - { + public fn method2() ->  + { call_user_func(function() { echo \\"hello\\"; }); [1, 2, 3, 4, 5]->walk( - function(int! x) { + function(int! x) { return x * x; } ); [1, 2, 3, 4, 5]->walk( - function(_, int key) { echo key; } + function(_, int key) { echo key; } ); array input = [1, 2, 3, 4, 5]; input->walk( - function(_, int key) { echo key; } + function(_, int key) { echo key; } ); @@ -1109,7 +1109,7 @@ exports[`highlight() should color csp correctly 1`] = ` `; exports[`highlight() should color css correctly 1`] = ` -"@font-face { +"@font-face { font-family: Chunkfive; src: url('Chunkfive.otf'); } @@ -1118,8 +1118,8 @@ body, .usertext { font-family: Chunkfive, sans; } -@import url(print.css); -@media print { +@import url(print.css); +@media print { a[href^=http]::after { content: attr(href) } @@ -1181,9 +1181,9 @@ exports[`highlight() should color dart correctly 1`] = ` part 'app2.dart'; -/** - * Class description and [link](http://dartlang.org/). - */ +/** + * Class description and [link](http://dartlang.org/). + */ @Awesome('it works!') class SomeClass extends BaseClass implements Comparable { factory SomeClass(num param); @@ -1192,7 +1192,7 @@ exports[`highlight() should color dart correctly 1`] = ` double z = 0.0; } - /// **Sum** function + /// **Sum** function int sum(int a, int b) => a + b; ElementList els() => querySelectorAll('.dart'); @@ -1552,22 +1552,22 @@ guy = Person.new first_name: \\"Guy\\" guy.name defmodule ListServer do - @moduledoc \\"\\"\\" + @moduledoc \\"\\"\\"  This module provides an easy to use ListServer, useful for keeping  lists of things. - \\"\\"\\" + \\"\\"\\" use GenServer.Behaviour alias Foo.Bar ### Public API - @doc \\"\\"\\" + @doc \\"\\"\\"  Starts and links a new ListServer, returning {:ok, pid}   ## Example   iex> {:ok, pid} = ListServer.start_link  - \\"\\"\\" + \\"\\"\\" def start_link do :gen_server.start_link({:local, :list}, __MODULE__, [], []) end @@ -3220,8 +3220,8 @@ exports[`highlight() should color lua correctly 1`] = ` } } function signal_mt.__index:emit(... --[[ Comment in params ]]) - for _, slot in ipairs(self) do - slot(self, ...) + for _, slot in ipairs(self) do + slot(self, ...) end end local function create_signal() @@ -4057,7 +4057,7 @@ exports[`highlight() should color perl correctly 1`] = ` __DATA__ @@ layouts/default.html.ep - + <html> <head><title><%= title %> <body><%= content %> @@ -4083,7 +4083,7 @@ comp3=\\"192.168.0.3\\" # options -set block-policy return +set block-policy return set loginterface egress set skip on lo @@ -4110,7 +4110,7 @@ comp3=\\"192.168.0.3\\" pass in on egress inet proto tcp to (egress) port 80 rdr-to $comp3 -pass in inet proto icmp all icmp-type $icmp_types +pass in inet proto icmp all icmp-type $icmp_types pass in on $int_if " @@ -4123,14 +4123,14 @@ exports[`highlight() should color php correctly 1`] = ` interface Factory { - static function _factory(); + static function _factory(); } abstract class URI extends BaseURI implements Factory { abstract function test(); - public static $st1 = 1; + public static $st1 = 1; const ME = \\"Yo\\"; var $list = NULL; private $var; @@ -4140,7 +4140,7 @@ exports[`highlight() should color php correctly 1`] = `  *  * @return URI  */ - static public function _factory($stats = array(), $uri = 'http') + static public function _factory($stats = array(), $uri = 'http')  { echo __METHOD__; $uri = explode(':', $uri, 0b10); @@ -4153,8 +4153,8 @@ exports[`highlight() should color php correctly 1`] = ` throw new Zend_Uri_Exception('Illegal scheme'); } - $this->var = 0 - self::$st; - $this->list = list(Array(\\"1\\"=> 2, 2=>self::ME, 3 => \\\\Location\\\\Web\\\\URI::class)); + $this->var = 0 - self::$st; + $this->list = list(Array(\\"1\\"=> 2, 2=>self::ME, 3 => \\\\Location\\\\Web\\\\URI::class)); return [ 'uri' => $uri, @@ -4197,7 +4197,7 @@ exports[`highlight() should color pony correctly 1`] = ` `; exports[`highlight() should color powershell correctly 1`] = ` -"$initialDate = [datetime]'2013/1/8' +"$initialDate = [datetime]'2013/1/8' $rollingDate = $initialDate @@ -4206,8 +4206,8 @@ $rollingDate = $initialDate $results = $client.DownloadString(\\"http://not.a.real.url\\") Write-Host \\"$rollingDate.ToShortDateString() - $results\\" $rollingDate = $rollingDate.AddDays(21) - $username = [System.Environment]::UserName -} until ($rollingDate -ge [datetime]'2013/12/31') + $username = [System.Environment]::UserName +} until ($rollingDate -ge [datetime]'2013/12/31') " `; @@ -4833,28 +4833,28 @@ foo_matrix = [1, 2, 3; 4, 5,  `; exports[`highlight() should color scss correctly 1`] = ` -"@import \\"compass/reset\\"; +"@import \\"compass/reset\\"; // variables $colorGreen: #008000; $colorGreenDark: darken($colorGreen, 10); -@mixin container { +@mixin container { max-width: 980px; } // mixins with parameters -@mixin button($color:green) { - @if ($color == green) { +@mixin button($color:green) { + @if ($color == green) { background-color: #008000; } - @else if ($color == red) { + @else if ($color == red) { background-color: #B22222; } } button { - @include button(red); + @include button(red); } div, @@ -4886,7 +4886,7 @@ ul { } .banner { - @extend .container; + @extend .container; } a { @@ -4895,15 +4895,15 @@ a { &:visited { color: #c458cb; } } -@for $i from 1 through 5 { +@for $i from 1 through 5 { .span#{$i} { width: 20px*$i; } } -@mixin mobile { - @media screen and (max-width : 600px) { - @content; +@mixin mobile { + @media screen and (max-width : 600px) { + @content; } }" `; @@ -5116,41 +5116,41 @@ exports[`highlight() should color stan correctly 1`] = ` // Taken from stan-reference-2.8.0.pdf p.66 data { - int N; // num individuals - int K; // num ind predictors - int J; // num groups - int L; // num group predictors - int jj[N]; // group for individual - matrix[N,K] x; // individual predictors - row_vector[L] u[J]; // group predictors - vector[N] y; // outcomes + int<lower=0> N; // num individuals + int<lower=1> K; // num ind predictors + int<lower=1> J; // num groups + int<lower=1> L; // num group predictors + int<lower=1,upper=J> jj[N]; // group for individual + matrix[N,K] x; // individual predictors + row_vector[L] u[J]; // group predictors + vector[N] y; // outcomes } parameters { - corr_matrix[K] Omega; // prior correlation - vector[K] tau; // prior scale - matrix[L,K] gamma; // group coeffs - vector[K] beta[J]; // indiv coeffs by group - real sigma; // prediction error scale + corr_matrix[K] Omega; // prior correlation + vector<lower=0>[K] tau; // prior scale + matrix[L,K] gamma; // group coeffs + vector[K] beta[J]; // indiv coeffs by group + real<lower=0> sigma; // prediction error scale } model { - tau ~ cauchy(0,2.5); - Omega ~ lkj_corr(2); - to_vector(gamma) ~ normal(0, 5); + tau ~ cauchy(0,2.5); + Omega ~ lkj_corr(2); + to_vector(gamma) ~ normal(0, 5); { - row_vector[K] u_gamma[J]; + row_vector[K] u_gamma[J]; for (j in 1:J) u_gamma[j] <- u[j] * gamma; - beta ~ multi_normal(u_gamma, quad_form_diag(Omega, tau)); + beta ~ multi_normal(u_gamma, quad_form_diag(Omega, tau)); } { - vector[N] x_beta_jj; + vector[N] x_beta_jj; for (n in 1:N) x_beta_jj[n] <- x[n] * beta[jj[n]]; - y ~ normal(x_beta_jj, sigma); + y ~ normal(x_beta_jj, sigma); } } -# Note: Octothorpes indicate comments, too! +# Note: Octothorpes indicate comments, too! " `; @@ -5989,7 +5989,7 @@ exports[`highlight() should color xl correctly 1`] = ` `; exports[`highlight() should color xml correctly 1`] = ` -" +" <title>Title <style>body {width: 500px;}