rouge 4.0.1 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fd615b640597f10ec86cd80dd21e8c9d52690a16cf176eba508e9f1e9793722
-  data.tar.gz: e52e22c42130a1173fd9996886ea012a6196b40a2277e1be3815464712724226
+  metadata.gz: 239a3d42bfd3954d0e6f97efe4265a99cfa719bc2d0815a3fbfa1d47cb58fa66
+  data.tar.gz: 54cccb6161415559baa8a6d8003f9bf9c9c3eb8f241b4c21234c96f1b3d9a148
 SHA512:
-  metadata.gz: 680d70dd8cf5d576a02de5d692fd381531431fb547943d251941795180315959b7a8efae23413916cca9e4cf937ff4b13cf42934201ec8b9e0b43f2e01f1ef93
-  data.tar.gz: cca0ecbdb95aa8f6001df798a2d0c99b32afa8bedd9887a3f4292d29f38a3132d092b8a7a57da60d246142adafe29e0a6650f3cbeacc3a1d0c1ae93bc07c30c3
+  metadata.gz: 1463511e91aee04d120e090808e232ac5d07435971b3072716046bcc6d43bf5f86c3ef9c1f11b2cfdefded88259951d299f6b476437744ac0861e3dc0516b55f
+  data.tar.gz: a4aba9526815bf9d28a6ae7e0d02e3df29b250fa76b53d1c7bca0500cdcc8bd641198db02448e495bea510ac9b3bc1b42fb09ddc3e76dc1d501594074e7602fd

data/Gemfile

@@ -8,7 +8,7 @@ gem 'rake'
 
 gem 'minitest', '>= 5.0'
 gem 'minitest-power_assert'
-gem 'power_assert', '~> 1.2'
+gem 'power_assert', '~> 2.0'
 
 gem 'rubocop', '~> 1.0', '<= 1.11'
 gem 'rubocop-performance'

data/lib/rouge/demos/cisco_ios

@@ -0,0 +1,19 @@
+interface FastEthernet0.20
+    encapsulation dot1Q 20
+    no ip route-cache
+    bridge-group 1
+    no bridge-group 1 source-learning
+    bridge-group 1 spanning-disabled
+
+! Supports shortened versions of config words, too
+inter gi0.10
+encap dot1q 10 native
+inter gi0
+
+banner login # Authenticate yourself! #
+
+! Supports #, $ and % to delimit banners, and multiline
+banner motd $
+Attention!
+We will be having scheduled system maintenance on this device.
+$

data/lib/rouge/guessers/disambiguation.rb

@@ -129,6 +129,7 @@ module Rouge
 
       disambiguate '*.cls' do
         next TeX if matches?(/\A\s*(?:\\|%)/)
+        next OpenEdge if matches?(/(no\-undo|BLOCK\-LEVEL|ROUTINE\-LEVEL|&ANALYZE\-SUSPEND)/i)
         next Apex
       end
 
@@ -139,6 +140,12 @@ module Rouge
 
         Puppet
       end
+      
+      disambiguate '*.p' do
+        next Prolog if contains?(':-')
+        next Prolog if matches?(/\A\w+(\(\w+\,\s*\w+\))*\./)
+        next OpenEdge
+      end
     end
   end
 end

data/lib/rouge/lexers/cisco_ios.rb

@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+# Based on/regexes mostly from Brandon Bennett's pygments-routerlexers:
+# https://github.com/nemith/pygments-routerlexers
+
+module Rouge
+  module Lexers
+    class CiscoIos < RegexLexer
+      title 'Cisco IOS'
+      desc 'Cisco IOS configuration lexer'
+      tag 'cisco_ios'
+      filenames '*.cfg'
+      mimetypes 'text/x-cisco-conf'
+
+      state :root do
+        rule %r/^!.*/, Comment::Single
+
+        rule %r/^(version\s+)(.*)$/ do
+          groups Keyword, Num::Float
+        end
+
+        rule %r/(desc*r*i*p*t*i*o*n*)(.*?)$/ do
+          groups Keyword, Comment::Single
+        end
+
+        rule %r/^(inte*r*f*a*c*e*|controller|router \S+|voice translation-\S+|voice-port|line)(.*)$/ do
+          groups Keyword::Type, Name::Function
+        end
+
+        rule %r/(password|secret)(\s+[57]\s+)(\S+)/ do
+          groups Keyword, Num, String::Double
+        end
+
+        rule %r/(permit|deny)/, Operator::Word
+
+        rule %r/^(banner\s+)(motd\s+|login\s+)([#$%])/ do
+          groups Keyword, Name::Function, Str::Delimiter
+          push :cisco_ios_text
+        end
+
+        rule %r/^(dial-peer\s+\S+\s+)(\S+)(.*?)$/ do
+          groups Keyword, Name::Attribute, Keyword
+        end
+
+        rule %r/^(vlan\s+)(\d+)$/ do
+          groups Keyword, Name::Attribute
+        end
+
+        # IPv4 Address/Prefix
+        rule %r/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(\/\d{1,2})?/, Num
+
+        # NSAP
+        rule %r/49\.\d{4}\.\d{4}\.\d{4}\.\d{4}\.\d{2}/, Num
+
+        # MAC Address
+        rule %r/[a-f0-9]{4}\.[a-f0-9]{4}\.[a-f0-9]{4}/, Num::Hex
+
+        rule %r/^(\s*no\s+)(\S+)/ do
+          groups Keyword::Constant, Keyword
+        end
+
+        rule %r/^[^\n\r]\s*\S+/, Keyword
+
+        # Obfuscated Passwords
+        rule  %r/\*+/, Name::Entity
+
+        rule %r/(?<= )\d+(?= )/, Num
+
+        # Newline catcher, avoid errors on empty lines
+        rule %r/\n+/m, Text
+
+        # This one goes last, a text catch-all
+        rule %r/./, Text
+      end
+
+      state :cisco_ios_text do
+        rule %r/[^#$%]/, Text
+        rule %r/[#$%]/, Str::Delimiter, :pop!
+      end
+    end
+  end
+end

data/lib/rouge/lexers/cpp.rb

@@ -71,7 +71,11 @@ 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
+        rule %r/[{]/, Punctuation
+        rule %r/}/ do
+          token Punctuation
+          pop! if in_state?(:function) # pop :function
+        end
       end
 
       state :classname do

data/lib/rouge/lexers/csharp.rb

@@ -27,19 +27,19 @@ module Rouge
         static switch this throw true try typeof unchecked unsafe
         virtual void volatile while
         add alias async await get global partial remove set value where
-        yield nameof
-        ascending by descending equals from group in into join let on
-        orderby select
+        yield nameof notnull
+        ascending by descending equals from group in init into join let
+        on orderby select unmanaged when and not or with
       )
 
       keywords_type = %w(
-        bool byte char decimal double dynamic float int long object
-        sbyte short string uint ulong ushort var
+        bool byte char decimal double dynamic float int long nint nuint
+        object sbyte short string uint ulong ushort var
       )
 
       cpp_keywords = %w(
         if endif else elif define undef line error warning region
-        endregion pragma
+        endregion pragma nullable
       )
 
       state :whitespace do
@@ -81,14 +81,15 @@ module Rouge
         rule %r/@"(""|[^"])*"/m, Str
         rule %r/"(\\.|.)*?["\n]/, Str
         rule %r/'(\\.|.)'/, Str::Char
-        rule %r/0x[0-9a-f]+[lu]?/i, Num
+        rule %r/0b[_01]+[lu]?/i, Num
+        rule %r/0x[_0-9a-f]+[lu]?/i, Num
         rule %r(
-          [0-9]
-          ([.][0-9]*)? # decimal
-          (e[+-][0-9]+)? # exponent
-          [fldu]? # type
+          [0-9](?:[_0-9]*[0-9])?
+          ([.][0-9](?:[_0-9]*[0-9])?)? # decimal
+          (e[+-]?[0-9](?:[_0-9]*[0-9])?)? # exponent
+          [fldum]? # type
         )ix, Num
-        rule %r/\b(?:class|struct|interface)\b/, Keyword, :class
+        rule %r/\b(?:class|record|struct|interface)\b/, Keyword, :class
         rule %r/\b(?:namespace|using)\b/, Keyword, :namespace
         rule %r/^#[ \t]*(#{cpp_keywords.join('|')})\b.*?\n/,
           Comment::Preproc

data/lib/rouge/lexers/dart.rb

@@ -12,16 +12,16 @@ module Rouge
       mimetypes 'text/x-dart'
 
       keywords = %w(
-        as assert await break case catch continue default do else finally for
-        if in is new rethrow return super switch this throw try while with yield
+        as assert await break case catch continue default do else finally for if
+        in is new rethrow return super switch this throw try while when with yield
       )
 
       declarations = %w(
-        abstract async dynamic const covariant external extends factory final get
-        implements late native on operator required set static sync typedef var
+        abstract base async dynamic const covariant external extends factory final get implements
+        inline interface late native on operator required sealed set static sync typedef var
       )
 
-      types = %w(bool Comparable double Dynamic enum Function int List Map Never Null num Object Pattern Set String Symbol Type Uri void)
+      types = %w(bool Comparable double Dynamic enum Function int List Map Never Null num Object Pattern Record Set String Symbol Type Uri void)
 
       imports = %w(import deferred export library part\s*of part source)
 
@@ -53,7 +53,7 @@ module Rouge
         rule %r/(?:#{declarations.join('|')})\b/, Keyword::Declaration
         rule %r/(?:#{types.join('|')})\b/, Keyword::Type
         rule %r/(?:true|false|null)\b/, Keyword::Constant
-        rule %r/(?:class|interface|mixin)\b/, Keyword::Declaration, :class
+        rule %r/(?:class|mixin)\b/, Keyword::Declaration, :class
         rule %r/(?:#{imports.join('|')})\b/, Keyword::Namespace, :import
         rule %r/(\.)(#{id})/ do
           groups Operator, Name::Attribute

data/lib/rouge/lexers/dot.rb

@@ -8,6 +8,7 @@ module Rouge
       desc "graph description language"
 
       tag 'dot'
+      aliases 'graphviz'
       filenames '*.dot'
       mimetypes 'text/vnd.graphviz'
 

data/lib/rouge/lexers/ghc_cmm.rb

@@ -22,7 +22,7 @@ module Rouge
       ws = %r(\s|//.*?\n|/[*](?:[^*]|(?:[*][^/]))*[*]+/)mx
 
       # Make sure that this is not a preprocessor macro, e.g. `#if` or `#define`.
-      id = %r((?!#[a-zA-Z])[\w#\$%_']+)
+      id = %r((?!\#[a-zA-Z])[\w#\$%_']+)
 
       complex_id = %r(
         (?:[\w#$%_']|\(\)|\(,\)|\[\]|[0-9])*

data/lib/rouge/lexers/javascript.rb

@@ -177,6 +177,28 @@ module Rouge
           push :expr_start
         end
 
+        rule %r/(class)((?:\s|\\\s)+)/ do
+          groups Keyword::Declaration, Text
+          push :classname
+        end
+
+        rule %r/([\p{Nl}$_]*\p{Lu}[\p{Word}]*)[ \t]*(?=(\(.*\)))/m, Name::Class
+
+        rule %r/(function)((?:\s|\\\s)+)(#{id})/ do
+          groups Keyword::Declaration, Text, Name::Function
+        end
+
+        rule %r/function(?=(\(.*\)))/, Keyword::Declaration # For anonymous functions
+
+        rule %r/(#{id})[ \t]*(?=(\(.*\)))/m do |m|
+          if self.class.keywords.include? m[1]
+            # "if" in "if (...)" or "switch" in "switch (...)" are recognized as keywords.
+            token Keyword
+          else
+            token Name::Function
+          end
+        end
+
         rule %r/[{}]/, Punctuation, :statement
 
         rule id do |m|
@@ -220,6 +242,14 @@ module Rouge
         rule %r/'/, Str::Delimiter, :pop!
       end
 
+      state :classname do
+        rule %r/(#{id})((?:\s|\\\s)+)(extends)((?:\s|\\\s)+)/ do
+          groups Name::Class, Text, Keyword::Declaration, Text
+        end
+
+        rule id, Name::Class, :pop!
+      end
+
       # braced parts that aren't object literals
       state :statement do
         rule %r/case\b/ do

data/lib/rouge/lexers/jinja.rb

@@ -14,25 +14,25 @@ module Rouge
                 'text/html+django', 'text/html+jinja'
 
       def self.keywords
-        @@keywords ||= %w(as context do else extends from ignore missing
-                          import include reversed recursive scoped
-                          autoescape endautoescape block endblock call endcall
-                          filter endfilter for endfor if endif macro endmacro
-                          set endset trans endtrans with endwith without)
+        @keywords ||= %w(as context do else extends from ignore missing
+                         import include reversed recursive scoped
+                         autoescape endautoescape block endblock call endcall
+                         filter endfilter for endfor if endif macro endmacro
+                         set endset trans endtrans with endwith without)
       end
 
       def self.tests
-        @@tests ||= %w(callable defined divisibleby equalto escaped even iterable
-                       lower mapping none number odd sameas sequence string
-                       undefined upper)
+        @tests ||= %w(callable defined divisibleby equalto escaped even iterable
+                      lower mapping none number odd sameas sequence string
+                      undefined upper)
       end
 
       def self.pseudo_keywords
-        @@pseudo_keywords ||= %w(true false none True False None)
+        @pseudo_keywords ||= %w(true false none True False None)
       end
 
       def self.word_operators
-        @@word_operators ||= %w(is in and or not)
+        @word_operators ||= %w(is in and or not)
       end
 
       state :root do