rouge 3.28.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74c520254d1312e4a5343103e3d83b48c967025a77a01701c42820a5eb3c708
-  data.tar.gz: 2fb290b030a0d60910973c53398c0dd4b127d17c1b489c88105f0bddb3689f6e
+  metadata.gz: 9229545bdc0804f0a7f0fea6a4fd1b94dbe8d022d0d29c1ffa254c09f42003d1
+  data.tar.gz: cf12e8de0f2d03d37ed6f1380a5deb04ad385d8628b4f2ed7c1921b16161636f
 SHA512:
-  metadata.gz: f499d28b76cd95fa2182d64809c4b6828c735a95c05c1b9af858ac6c1d0d17755fdafa90ae93f9d7fd27bd826fb4055cb8d3985d94b17172018ef408a397d8cf
-  data.tar.gz: 7fcd54cac21c2fb1b1cdc0825691ce812f42bc5d18cace205b281aaf87e7d8a75ee2dca544e92b9b193084605811f74151b00c51237850952cb22d4e4dde5db9
+  metadata.gz: 31f64a3f386d01829f9a2d2e9711ad40c3c48fbf122dc66b0e9519d4c02676cf530879c388e280efd996d6a57ec3497f5faa54423d081af02450348037c58712
+  data.tar.gz: fad76c2d5d770fb172e09a2614e37ff78d362b81dfb73d50ce5c25de04f07c93aabae357e4a1a5b6b47be3792edf146e1299c1ec78204d55e998dd54c169f307

data/Gemfile

@@ -10,16 +10,14 @@ 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
+gem 'redcarpet', platforms: :ruby
 
 # Profiling
-if RUBY_VERSION >= '2.3.0'
-  gem 'memory_profiler', :require => false
-end
+gem 'memory_profiler', require: false
 
 # Needed for a Rake task
 gem 'git'
@@ -32,11 +30,7 @@ group :development do
   gem 'github-markup'
 
   # for visual tests
-  if RUBY_VERSION < '2.2.0'
-    gem 'sinatra', '~> 1.4.8'
-  else
-    gem 'sinatra'
-  end
+  gem 'sinatra'
 
   # Ruby 3 no longer ships with a web server
   gem 'puma' if RUBY_VERSION >= '3'

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/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/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/rml

@@ -0,0 +1,33 @@
+// A system agnostic domain specific language for runtime monitoring and verification
+// Basic events
+
+insert(index,elem) matches {event:'func_pre',name:'my_insert',args:[index,elem]};
+
+relevant matches insert(_,_)|remove(_,_)|size(_)|get(_,_);
+
+insert_in_bounds(size) matches insert(index,_) with index >= 0 && index <= size;
+
+del_false matches del(_,false);
+not_add_true_del(el) not matches add(el,true) | del(el,_);
+
+Main = relevant >> (CheckIndex<0> /\ add_rm_get >> CheckElem)!;
+CheckIndex<size> =
+    get_size(size)* (insert_in_bounds(size) CheckIndex<size+1> \/ remove_in_bounds(size) CheckIndex<size-1>);
+
+Msg<inf,sup> = if(inf<=sup) msg(inf) Msg<inf+1,sup> else empty;
+Main=relevant>>Msg<1,4>*!;
+
+acquire(id) matches {event:'func_pre',name:'acquire',args:[_,id,...]};
+
+Main = relevant >> Resources;
+Resources =
+    {let id; acquire(id)
+        ((Resources | use(id)* release(id)) /\
+        acqRel(id) >> release(id) all)
+    }?;
+
+msg(ty) matches {event:'func_pre',name:'msg',args:[ty]};
+relevant matches msg(_);
+
+Msg<inf,sup> = if(inf<=sup) msg(inf) Msg<inf+1,sup> else empty;
+Main=relevant>>Msg<1,4>*!;

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/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/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/cpp.rb

@@ -71,6 +71,7 @@ module Rouge
         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/[{}]/, Punctuation
       end
 
       state :classname do

data/lib/rouge/lexers/dart.rb

@@ -61,7 +61,8 @@ module Rouge
 
         rule %r/#{id}:/, Name::Label
         rule %r/\$?#{id}/, Name
-        rule %r/[~^*!%&\[\](){}<>\|+=:;,.\/?-]/, Operator
+        rule %r/[~^*!%&\|+=:\/?-]/, Operator
+        rule %r/[\[\](){}<>\.,;]/, Punctuation
         rule %r/\d*\.\d+([eE]\-?\d+)?/, Num::Float
         rule %r/0x[\da-fA-F]+/, Num::Hex
         rule %r/\d+L?/, Num::Integer

data/lib/rouge/lexers/diff.rb

@@ -20,9 +20,19 @@ module Rouge
       state :root do
         rule(/^ .*$\n?/, Text)
         rule(/^---$\n?/, Punctuation)
-        rule(/^[+>]+.*$\n?/, Generic::Inserted)
-        rule(/^\+.*$\n?/, Generic::Inserted)
-        rule(/^[-<]+.*$\n?/, Generic::Deleted)
+
+        rule %r(
+          (^\++.*$\n?) |
+          (^>+[ \t]+.*$\n?) |
+          (^>+$\n?)
+        )x, Generic::Inserted
+
+        rule %r(
+          (^-+.*$\n?) |
+          (^<+[ \t]+.*$\n?) |
+          (^<+$\n?)
+        )x, Generic::Deleted
+
         rule(/^!.*$\n?/, Generic::Strong)
         rule(/^([Ii]ndex|diff).*$\n?/, Generic::Heading)
         rule(/^(@@[^@]*@@)([^\n]*\n)/) do
@@ -30,7 +40,7 @@ module Rouge
         end
         rule(/^\w.*$\n?/, Punctuation)
         rule(/^=.*$\n?/, Generic::Heading)
-        rule(/\s.*$\n?/, Text)
+        rule(/.+$\n?/, Text)
       end
     end
   end

data/lib/rouge/lexers/docker.rb

@@ -20,6 +20,10 @@ module Rouge
       state :root do
         rule %r/\s+/, Text
 
+        rule %r/^(FROM)(\s+)(.*)(\s+)(AS)(\s+)(.*)/io do
+          groups Keyword, Text::Whitespace, Str, Text::Whitespace, Keyword, Text::Whitespace, Str
+        end
+
         rule %r/^(ONBUILD)(\s+)(#{KEYWORDS})(.*)/io do
           groups Keyword, Text::Whitespace, Keyword, Str
         end

data/lib/rouge/lexers/eiffel.rb

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

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

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

data/lib/rouge/lexers/groovy.rb

@@ -7,7 +7,7 @@ module Rouge
       title "Groovy"
       desc 'The Groovy programming language (http://www.groovy-lang.org/)'
       tag 'groovy'
-      filenames '*.groovy', 'Jenkinsfile'
+      filenames '*.groovy', 'Jenkinsfile', '*.Jenkinsfile'
       mimetypes 'text/x-groovy'
 
       def self.detect?(text)

data/lib/rouge/lexers/handlebars.rb

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

data/lib/rouge/lexers/haxe.rb

@@ -17,15 +17,15 @@ module Rouge
 
       def self.keywords
         @keywords ||= Set.new %w(
-          break case cast catch class continue default do else enum false for
-          function if import interface macro new null override package private
+          as break case cast catch class continue default do else enum false for
+          function if import in interface macro new null override package private
           public return switch this throw true try untyped while
         )
       end
 
       def self.imports
         @imports ||= Set.new %w(
-          import using
+          package import using
         )
       end
 
@@ -55,6 +55,7 @@ module Rouge
       end
 
       id = /[$a-zA-Z_][a-zA-Z0-9_]*/
+      dotted_id = /[$a-zA-Z_][a-zA-Z0-9_.]*/
 
       state :comments_and_whitespace do
         rule %r/\s+/, Text
@@ -77,6 +78,22 @@ module Rouge
         rule %r//, Text, :pop!
       end
 
+      state :namespace do
+        mixin :comments_and_whitespace
+
+        rule %r/
+           (#{dotted_id})
+           (\s+)(in|as)(\s+)
+           (#{id})
+         /x do
+          groups(Name::Namespace, Text::Whitespace, Keyword, Text::Whitespace, Name)
+        end
+
+        rule %r/#{dotted_id}/, Name::Namespace
+
+        rule(//) { pop! }
+      end
+
       state :regex do
         rule %r(/) do
           token Str::Regex
@@ -141,20 +158,22 @@ module Rouge
         end
 
         rule id do |m|
-          if self.class.keywords.include? m[0]
+          match = m[0]
+
+          if self.class.imports.include?(match)
+            token Keyword::Namespace
+            push :namespace
+          elsif self.class.keywords.include?(match)
             token Keyword
             push :expr_start
-          elsif self.class.imports.include? m[0]
-            token Keyword
-            push :namespace
-          elsif self.class.declarations.include? m[0]
+          elsif self.class.declarations.include?(match)
             token Keyword::Declaration
             push :expr_start
-          elsif self.class.reserved.include? m[0]
+          elsif self.class.reserved.include?(match)
             token Keyword::Reserved
-          elsif self.class.constants.include? m[0]
+          elsif self.class.constants.include?(match)
             token Keyword::Constant
-          elsif self.class.builtins.include? m[0]
+          elsif self.class.builtins.include?(match)
             token Name::Builtin
           else
             token Name::Other

data/lib/rouge/lexers/http.rb

@@ -46,7 +46,7 @@ module Rouge
 
         # response
         rule %r(
-          (HTTPS?)(/)(\d(?:\.\d))([ ]+)  # http version
+          (HTTPS?)(/)(\d(?:\.\d)?)([ ]+) # http version
           (\d{3})([ ]+)?                 # status
           ([^\r\n]*)?(\r?\n|$)           # status message
         )x do

data/lib/rouge/lexers/hylang.rb

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