rouge 3.26.0 → 3.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b4023b528780340984bedccbe7068091fe13e092ec69c43972849924928eaf0
-  data.tar.gz: 20d90c29a74768ad39ffd84202396ba17be6c67c4d91daef83c7aa11b8bf55a2
+  metadata.gz: acc37e14414bcaa3f67dda77f1b746f8035cfc972dc807610b4a1ef4fcffe848
+  data.tar.gz: 2380291e01345a7251f229dddf858d612f64d89f7ef93d7b75b2c44fa9a093a6
 SHA512:
-  metadata.gz: 5ce0c09ee43cf473c4e86dcc74fa84c735cc045080a47fc46e31a40553e8e0e106069b1f8cc2c23bcf76f80a5ba9749717e47a8385e970456b035bdb9ea626aa
-  data.tar.gz: 1a54b8b602cc6bca9b1f04c9eebc5353962f6476866f04b48092ffde45511408c6fbfb096fe0b450aa55bf8922ccbb62dd61363e4d71ef198651f49a6a0dac95
+  metadata.gz: a4d60e1f37e66b4991b040ff82db8cc59983f37923a7f8b41a44a149407167467b443cd6ac8bb47f8800588e82301be1d58c14175bb1513a728952be21144ed8
+  data.tar.gz: 6f0e6ab3786ac315f0a2d658d02091bb3b8a0b6cd75ef3aac6dc2a116eee9dd5a45b1a4c9ef11f40f0f6338ae50d7c0f0b219e9ab20de950e4ae865f3824e002

data/Gemfile

@@ -8,9 +8,11 @@ gem 'rake'
 
 gem 'minitest', '>= 5.0'
 gem 'minitest-power_assert'
+gem 'power_assert', '~> 1.2'
 
 gem 'parallel', '~> 1.13.0' if RUBY_VERSION < '2.2.0'
-gem 'rubocop', '~> 0.49.1'
+gem 'rubocop', '~> 1.0', '<= 1.11'
+gem 'rubocop-performance'
 
 # don't try to install redcarpet under jruby
 gem 'redcarpet', :platforms => :ruby
@@ -36,5 +38,8 @@ group :development do
   else
     gem 'sinatra'
   end
+
+  # Ruby 3 no longer ships with a web server
+  gem 'puma' if RUBY_VERSION >= '3'
   gem 'shotgun'
 end

data/lib/rouge/cli.rb

@@ -174,35 +174,38 @@ module Rouge
         yield %[usage: rougify highlight <filename> [options...]]
         yield %[       rougify highlight [options...]]
         yield %[]
-        yield %[--input-file|-i <filename>  specify a file to read, or - to use stdin]
+        yield %[--input-file|-i <filename>   specify a file to read, or - to use stdin]
         yield %[]
-        yield %[--lexer|-l <lexer>          specify the lexer to use.]
-        yield %[                            If not provided, rougify will try to guess]
-        yield %[                            based on --mimetype, the filename, and the]
-        yield %[                            file contents.]
+        yield %[--lexer|-l <lexer>           specify the lexer to use.]
+        yield %[                             If not provided, rougify will try to guess]
+        yield %[                             based on --mimetype, the filename, and the]
+        yield %[                             file contents.]
         yield %[]
-        yield %[--formatter|-f <opts>       specify the output formatter to use.]
-        yield %[                            If not provided, rougify will default to]
-        yield %[                            terminal256.]
+        yield %[--formatter-preset|-f <opts> specify the output formatter to use.]
+        yield %[                             If not provided, rougify will default to]
+        yield %[                             terminal256. options are: terminal256,]
+        yield %[                             terminal-truecolor, html, html-pygments,]
+        yield %[                             html-inline, html-line-table, html-table,]
+        yield %[                             null/raw/tokens, or tex.]
         yield %[]
-        yield %[--theme|-t <theme>          specify the theme to use for highlighting]
-        yield %[                            the file. (only applies to some formatters)]
+        yield %[--theme|-t <theme>           specify the theme to use for highlighting]
+        yield %[                             the file. (only applies to some formatters)]
         yield %[]
-        yield %[--mimetype|-m <mimetype>    specify a mimetype for lexer guessing]
+        yield %[--mimetype|-m <mimetype>     specify a mimetype for lexer guessing]
         yield %[]
-        yield %[--lexer-opts|-L <opts>      specify lexer options in CGI format]
-        yield %[                            (opt1=val1&opt2=val2)]
+        yield %[--lexer-opts|-L <opts>       specify lexer options in CGI format]
+        yield %[                             (opt1=val1&opt2=val2)]
         yield %[]
-        yield %[--formatter-opts|-F <opts>  specify formatter options in CGI format]
-        yield %[                            (opt1=val1&opt2=val2)]
+        yield %[--formatter-opts|-F <opts>   specify formatter options in CGI format]
+        yield %[                             (opt1=val1&opt2=val2)]
         yield %[]
-        yield %[--require|-r <filename>     require a filename or library before]
-        yield %[                            highlighting]
+        yield %[--require|-r <filename>      require a filename or library before]
+        yield %[                             highlighting]
         yield %[]
-        yield %[--escape                    allow the use of escapes between <! and !>]
+        yield %[--escape                     allow the use of escapes between <! and !>]
         yield %[]
-        yield %[--escape-with <l> <r>       allow the use of escapes between custom]
-        yield %[                            delimiters. implies --escape]
+        yield %[--escape-with <l> <r>        allow the use of escapes between custom]
+        yield %[                             delimiters. implies --escape]
       end
 
       # There is no consistent way to do this, but this is used elsewhere,

data/lib/rouge/demos/brainfuck

@@ -2,4 +2,4 @@
 	This is a sample
 	comment.
 ]
-.[>+<-]>,
+.[>+<-]>,

data/lib/rouge/demos/brightscript

@@ -3,4 +3,4 @@ function main(args as dynamic) as void
     'Create a scene and load /components/helloworld.xml'
     scene = screen.CreateScene("HelloWorld")
     screen.show()
-end function
+end function

data/lib/rouge/demos/bsl

@@ -4,4 +4,4 @@
     Сообщить("Привет мир");
 КонецПроцедуры
 
-#КонецОбласти
+#КонецОбласти

data/lib/rouge/demos/cfscript

@@ -15,4 +15,4 @@ component accessors="true" {
 
     return foo;
   }
-}
+}

data/lib/rouge/demos/coq

@@ -10,4 +10,4 @@ Section with_T.
     end.
 End with_T.
 
-Definition a_string := "hello \" world".
+Definition a_string := "hello \" world".

data/lib/rouge/demos/csvs

@@ -5,4 +5,4 @@ Transaction_Date: xDate
 Transaction_ID: notEmpty
 Originator_Name: notEmpty
 Originator_Address: any("yes","no")
-Originator_Country: notEmpty
+Originator_Country: notEmpty

data/lib/rouge/demos/dafny

@@ -0,0 +1,16 @@
+module A {
+  const i: int := 56_78
+}
+
+method m(b: bool, s: string) {
+  var x: string;
+  var i: int;
+  if b then i := 1; else i := 2;
+  i := if b 1 else 2;
+  assert b;
+  assume b;
+  print s;
+  expect b;
+}
+
+function f(i: int): int { i + 1 }

data/lib/rouge/demos/datastudio

@@ -18,4 +18,3 @@ select * from TABLE1 where COL1 like %VAR1%; //utiliser la variable VAR1 dans un
 
 select * from TEST_TABLE; //exécution d'une requête Select pour ramener des valeurs
 Affect_LastColumns("TEST1"); //création du paramètre TEST1
-

data/lib/rouge/demos/ecl

@@ -15,4 +15,3 @@ somePeople := allPeople(LastName = 'Smith');
 
 //  Outputs  ---
 somePeople;
-

data/lib/rouge/demos/erlang

@@ -4,4 +4,4 @@
 
 %% Compute rectangle and circle area.
 area({rectangle, Width, Ht}) -> Width * Ht;
-area({circle, R})            -> 3.14159 * R * R.
+area({circle, R})            -> 3.14159 * R * R.

data/lib/rouge/demos/fluent

@@ -0,0 +1,13 @@
+# Simple things are simple.
+hello-user = Hello, {$userName}!
+
+# Complex things are possible.
+shared-photos =
+    {$userName} {$photoCount ->
+        [one] added a new photo
+       *[other] added {$photoCount} new photos
+    } to {$userGender ->
+        [male] his stream
+        [female] her stream
+       *[other] their stream
+    }.

data/lib/rouge/demos/fsharp

@@ -9,4 +9,4 @@ let rec existsLeaf test tree =
       || existsLeaf test right
 
 let hasEvenLeaf tree =
-  existsLeaf (fun n -> n % 2 = 0) tree
+  existsLeaf (fun n -> n % 2 = 0) tree

data/lib/rouge/demos/glsl

@@ -11,4 +11,4 @@ void main()
 {
     vertexColor = color;
     gl_Position = vec4(position, 0.0, 1.0);
-}
+}

data/lib/rouge/demos/haxe

@@ -2,4 +2,3 @@
 public static function hello(arg : String) {
     return 'Hello $arg';
 }
-

data/lib/rouge/demos/idris

@@ -0,0 +1,13 @@
+import Data.Vect
+
+insert : Ord elem =>
+         (x : elem) -> (xsSorted : Vect len elem) -> Vect (S len) elem
+insert x [] = [x]
+insert x (y :: xs) = case x < y of
+                          True => x :: y :: xs
+                          False => y :: insert x xs
+
+insSort : Ord elem => Vect n elem -> Vect n elem
+insSort [] = []
+insSort (x :: xs) = let xsSorted = insSort xs in
+                        insert x xsSorted

data/lib/rouge/demos/isabelle

@@ -0,0 +1,16 @@
+theory demo imports Main begin
+
+section ‹Inductive predicates for lists›
+
+datatype 'a list = Nil ("[]") | Cons 'a "'a list" ("_ # _")
+
+fun length :: "'a list ⇒ nat" where
+  "length [] = 0" | "length (x # xs) = 1 + length xs"
+
+inductive ζ :: "'a list ⇒ nat ⇒ bool" where
+Nil[intro!]:  "ζ [] 0" |
+Cons[intro]: "ζ xs l ⟹ ζ (x # xs) (1 + l)"
+
+(* Not the answer? *)
+lemma "ζ xs 42"
+  oops

data/lib/rouge/demos/lean

@@ -0,0 +1,8 @@
+open nat
+
+def add : nat → nat → nat
+| m zero := m
+| m (succ n) := succ (add m n)
+
+-- encode definition as an axiom
+axiom add_zero (n : nat) : n + 0 = n

data/lib/rouge/demos/meson

@@ -0,0 +1,10 @@
+project('tutorial', 'c', version: '0.2.3')
+executable('demo', 'main.c')
+
+version_array = meson.project_version().split('.')
+api_version = '@0@.@1@'.format(version_array[0], version_array[1])
+
+d = dependency('foo', required : get_option('myfeature'))
+if d.found()
+  app = executable('app', 'app.c', dependencies : [d])
+endif

data/lib/rouge/demos/nesasm

@@ -8,4 +8,4 @@ Reset:
 	lda #$3f	; $3F -> A register
         ldy #$00	; $00 -> Y register
         sta PPU_ADDR	; write #HIGH byte first
-        sty PPU_ADDR    ; $3F00 -> PPU address
+        sty PPU_ADDR    ; $3F00 -> PPU address

data/lib/rouge/demos/nial

@@ -0,0 +1,35 @@
+% Functional Recursion: ;
+fact IS RECUR [ 0 =, 1 first, pass, product, -1 +] % from wikipedia; 
+ 
+% Product of a range: ; 
+fact IS * count;
+
+% Plain recursion: ;
+fact IS OPERATION x {
+  if x = 0 then 1 else x * fact (x - 1) endif
+  };
+
+% While loop: ;
+fact IS OPERATION x {
+prod := 1;
+  WHILE x > 0 DO
+      prod := prod * x;
+      x := x - 1;
+  ENDWHILE;
+  prod
+}
+
+     % A basic divide by zero error: ;
+     1 / 0
+# OUTPUT:
+?div
+
+     % Errors are also values called faults, giving you their location: ;
+     5 / 5 10 0 8
+# OUTPUT:
+1. 0.5 ?div 0.625
+
+     % You can also define custom faults using 'fault': ;
+     fault 'this is an error'
+# OUTPUT:
+this is an error

data/lib/rouge/demos/opentype_feature_file

@@ -3,4 +3,3 @@ languagesystem DFLT dflt;
 feature liga {
     sub f i by f_i;
 } liga;
-

data/lib/rouge/demos/plsql

@@ -0,0 +1,2 @@
+SELECT q'{a quoted string}' AS s, TO_CHAR(SYSDATE,'MM/DD/YYYY') AS "Current Date" FROM DUAL
+WHERE 1=1;

data/lib/rouge/demos/smarty

@@ -9,4 +9,3 @@
 </ul>
 
 <div class="{if $foo}class1{else}class2{/if}">{$foo.bar.baz}</div>
-

data/lib/rouge/demos/stan

@@ -0,0 +1,13 @@
+data {
+  int<lower=0> N;
+  vector[N] x;
+  vector[N] y;
+}
+parameters {
+  real alpha;
+  real beta;
+  real<lower=0> sigma;
+}
+model {
+  y ~ normal(alpha + beta * x, sigma);
+}

data/lib/rouge/demos/stata

@@ -0,0 +1,14 @@
+* Run a series of linear regressions
+sysuse auto, clear
+foreach v of varlist mpg weight-turn {
+	regress price `v', robust
+}
+
+regress price i.foreign
+local num_obs = e(N)
+global myglobal = 4
+
+* Generate and manipulate variables
+generate newvar1 = "string"
+generate newvar2 = 34 - `num_obs'
+replace newvar2 = $myglobal

data/lib/rouge/demos/syzlang

@@ -0,0 +1,15 @@
+include <linux/test.h>
+
+resource fd_test[fd]
+
+openat$test(fd const[AT_FDCWD], file ptr[in, string["/dev/test"]], flags flags[open_flags], mode const[0]) fd_test
+
+ioctl$TEST(fd fd_test, cmd const[TEST], arg ptr[in, test])
+
+test {
+	number	int32
+	size	len[data, int32]
+	data	array[int8]
+}
+
+_ = TEST

data/lib/rouge/demos/syzprog

@@ -0,0 +1,8 @@
+# Source: https://github.com/google/syzkaller/blob/master/sys/linux/test/vusb_hid
+
+r0 = syz_usb_connect$hid(0x0, 0x36, &(0x7f0000000040)=ANY=[@ANYBLOB="12010000000018105e04da07000000000001090224000100000000090400000903000000092100000001222200090581030800000000"], 0x0)
+syz_usb_control_io$hid(r0, 0x0, 0x0)
+syz_usb_control_io$hid(r0, &(0x7f00000001c0)={0x24, 0x0, 0x0, &(0x7f0000000000)={0x0, 0x22, 0x22, {[@global=@item_012={0x2, 0x1, 0x9, "2313"}, @global=@item_012={0x2, 0x1, 0x0, "e53f"}, @global=@item_4={0x3, 0x1, 0x0, '\f\x00'}, @local=@item_012={0x2, 0x2, 0x2, "9000"}, @global=@item_4={0x3, 0x1, 0x0, "0900be00"}, @main=@item_4={0x3, 0x0, 0x8, '\x00'}, @local=@item_4={0x3, 0x2, 0x0, "09007a15"}, @local=@item_4={0x3, 0x2, 0x0, "5d8c3dda"}]}}, 0x0}, 0x0)
+syz_usb_ep_write(r0, 0x81, 0x7, &(0x7f0000000000)='BBBBBBB')
+syz_usb_ep_write(r0, 0x81, 0x7, &(0x7f0000000000)='BBBBBBB')
+syz_usb_ep_write(r0, 0x81, 0x7, &(0x7f0000000000)='BBBBBBB')

data/lib/rouge/formatter.rb

@@ -42,8 +42,8 @@ module Rouge
     end
 
     # Format a token stream.  Delegates to {#format}.
-    def self.format(tokens, *a, &b)
-      new(*a).format(tokens, &b)
+    def self.format(tokens, *args, **kwargs, &b)
+      new(*args, **kwargs).format(tokens, &b)
     end
 
     def initialize(opts={})

data/lib/rouge/formatters/html_inline.rb

@@ -28,4 +28,3 @@ module Rouge
     end
   end
 end
-

data/lib/rouge/guessers/disambiguation.rb

@@ -131,6 +131,13 @@ module Rouge
         next TeX if matches?(/\A\s*(?:\\|%)/)
         next Apex
       end
+
+      disambiguate '*.pp' do
+        next Pascal if matches?(/\b(function|begin|var)\b/)
+        next Pascal if matches?(/\b(end(;|\.))/)
+
+        Puppet
+      end
     end
   end
 end

data/lib/rouge/lexer.rb

@@ -293,8 +293,8 @@ module Rouge
 
       # @private
       def assert_utf8!(str)
-        encoding = str.encoding.name
-        return if encoding == 'US-ASCII' || encoding == 'UTF-8' || encoding == 'ASCII-8BIT'
+        encoding = str.encoding
+        return if encoding == Encoding::US_ASCII || encoding == Encoding::UTF_8 || encoding == Encoding::BINARY
 
         raise EncodingError.new(
           "Bad encoding: #{str.encoding.names.join(',')}. " +

data/lib/rouge/lexers/apache/keywords.rb

@@ -21,4 +21,4 @@ module Rouge
       end
     end
   end
-end
+end

data/lib/rouge/lexers/apple_script.rb

@@ -5,7 +5,7 @@ module Rouge
   module Lexers
     class AppleScript < RegexLexer
       title "AppleScript"
-      desc "The AppleScript scripting language by Apple Inc. (http://developer.apple.com/applescript/)"
+      desc "The AppleScript scripting language by Apple Inc. (https://developer.apple.com/library/archive/documentation/AppleScript/Conceptual/AppleScriptLangGuide/introduction/ASLR_intro.html)"
 
       tag 'applescript'
       aliases 'applescript'

data/lib/rouge/lexers/c.rb

@@ -170,12 +170,22 @@ module Rouge
       end
 
       state :macro do
-        # NB: pop! goes back to :bol
-        rule %r/\n/, Comment::Preproc, :pop!
+        mixin :include
         rule %r([^/\n\\]+), Comment::Preproc
         rule %r/\\./m, Comment::Preproc
         mixin :inline_whitespace
         rule %r(/), Comment::Preproc
+        # NB: pop! goes back to :bol
+        rule %r/\n/, Comment::Preproc, :pop!
+      end
+
+      state :include do
+        rule %r/(include)(\s*)(<[^>]+>)([^\n]*)/ do
+          groups Comment::Preproc, Text, Comment::PreprocFile, Comment::Single
+        end
+        rule %r/(include)(\s*)("[^"]+")([^\n]*)/ do
+          groups Comment::Preproc, Text, Comment::PreprocFile, Comment::Single
+        end
       end
 
       state :if_0 do

data/lib/rouge/lexers/ceylon.rb

@@ -51,8 +51,8 @@ module Rouge
 
         rule %r("(\\\\|\\"|[^"])*"), Literal::String
         rule %r('\\.'|'[^\\]'|'\\\{#[0-9a-fA-F]{4}\}'), Literal::String::Char
-        rule %r(".*``.*``.*"', String::Interpol
-        rule %r(\.)([a-z_]\w*)) do
+        rule %r("[^`]*``[^`]*``[^`]*"), Literal::String::Interpol
+        rule %r((\.)([a-z_]\w*)) do
           groups Operator, Name::Attribute
         end
         rule %r([a-zA-Z_]\w*:), Name::Label

data/lib/rouge/lexers/console.rb

@@ -103,7 +103,7 @@ module Rouge
       end
 
       def line_regex
-        /(\\.|[^\\])*?(\n|$)/m
+        /(.*?)(\n|$)/
       end
 
       def output_lexer

data/lib/rouge/lexers/cpp.rb

@@ -22,12 +22,14 @@ module Rouge
 
       def self.keywords
         @keywords ||= super + Set.new(%w(
-          asm auto catch const_cast delete dynamic_cast explicit export friend
+          asm auto catch char8_t concept
+          consteval constexpr constinit const_cast co_await co_return co_yield
+          delete dynamic_cast explicit export friend
           mutable namespace new operator private protected public
-          reinterpret_cast restrict size_of static_cast this throw throws
+          reinterpret_cast requires restrict size_of static_cast this throw throws
           typeid typename using virtual final override
 
-          alignas alignof constexpr decltype noexcept static_assert
+          alignas alignof decltype noexcept static_assert
           thread_local try
         ))
       end
@@ -59,7 +61,7 @@ module Rouge
       prepend :statements do
         rule %r/(class|struct)\b/, Keyword, :classname
         rule %r/template\b/, Keyword, :template
-        rule %r/\d+(\.\d+)?(?:h|(?:min)|s|(?:ms)|(?:us)|(?:ns))/, Num::Other
+        rule %r/#{dq}(\.#{dq})?(?:y|d|h|(?:min)|s|(?:ms)|(?:us)|(?:ns)|i|(?:if)|(?:il))\b/, Num::Other
         rule %r((#{dq}[.]#{dq}?|[.]#{dq})(e[+-]?#{dq}[lu]*)?)i, Num::Float
         rule %r(#{dq}e[+-]?#{dq}[lu]*)i, Num::Float
         rule %r/0x\h('?\h)*[lu]*/i, Num::Hex
@@ -68,7 +70,8 @@ module Rouge
         rule %r/#{dq}[lu]*/i, Num::Integer
         rule %r/\bnullptr\b/, Name::Builtin
         rule %r/(?:u8|u|U|L)?R"([a-zA-Z0-9_{}\[\]#<>%:;.?*\+\-\/\^&|~!=,"']{,16})\(.*?\)\1"/m, Str
-        rule %r/::/, Operator
+        rule %r/(::|<=>)/, Operator
+        rule %r/[{}]/, Punctuation
       end
 
       state :classname do

data/lib/rouge/lexers/cypher.rb

@@ -45,6 +45,7 @@ module Rouge
       state :root do
         rule %r/[\s]+/, Text
         rule %r(//.*?$), Comment::Single
+        rule %r(/\*), Comment::Multiline, :multiline_comments
 
         rule %r([*+\-<>=&|~%^]), Operator
         rule %r/[{}),;\[\]]/, Str::Symbol
@@ -103,6 +104,13 @@ module Rouge
         rule %r/'(\\\\|\\'|[^'])*'/, Str::Single
         rule %r/`(\\\\|\\`|[^`])*`/, Str::Backtick
       end
+
+      state :multiline_comments do
+        rule %r(/[*]), Comment::Multiline, :multiline_comments
+        rule %r([*]/), Comment::Multiline, :pop!
+        rule %r([^/*]+), Comment::Multiline
+        rule %r([/*]), Comment::Multiline
+      end
     end
   end
 end