rouge 4.0.1 → 4.1.1

data/lib/rouge/lexers/php.rb

@@ -66,7 +66,7 @@ module Rouge
 
       id = /[\p{L}_][\p{L}\p{N}_]*/
       ns = /(?:#{id}\\)+/
-      id_with_ns = /(?:#{ns})?#{id}/
+      id_with_ns = /\\?(?:#{ns})?#{id}/
 
       start do
         case @start_inline
@@ -211,7 +211,7 @@ module Rouge
 
       state :whitespace do
         rule %r/\s+/, Text
-        rule %r/#.*?$/, Comment::Single
+        rule %r/#[^\[].*?$/, Comment::Single
         rule %r(//.*?$), Comment::Single
         rule %r(/\*\*(?!/).*?\*/)m, Comment::Doc
         rule %r(/\*.*?\*/)m, Comment::Multiline
@@ -235,6 +235,8 @@ module Rouge
           groups Keyword::Namespace, Text, Name::Namespace
         end
 
+        rule %r/#\[.*\]$/, Name::Attribute
+
         rule %r/(class|interface|trait|extends|implements)
                 (\s+)
                 (#{id_with_ns})/ix do |m|
@@ -271,7 +273,7 @@ module Rouge
       state :in_catch do
         rule %r/\(/, Punctuation
         rule %r/\|/, Operator
-        rule id, Name::Class
+        rule id_with_ns, Name::Class
         mixin :escape
         mixin :whitespace
         mixin :return

data/lib/rouge/lexers/python.rb

@@ -40,7 +40,7 @@ module Rouge
       end
 
       def self.builtins_pseudo
-        @builtins_pseudo ||= %w(self None Ellipsis NotImplemented False True)
+        @builtins_pseudo ||= %w(None Ellipsis NotImplemented False True)
       end
 
       def self.exceptions
@@ -80,12 +80,18 @@ module Rouge
           groups Punctuation, Text, Str::Doc
         end
 
+        rule %r/\.\.\.\B$/, Name::Builtin::Pseudo
+
         rule %r/[^\S\n]+/, Text
         rule %r(#(.*)?\n?), Comment::Single
         rule %r/[\[\]{}:(),;.]/, Punctuation
         rule %r/\\\n/, Text
         rule %r/\\/, Text
 
+        rule %r/@#{dotted_identifier}/i, Name::Decorator
+
+        rule %r/(>>>|\.\.\.)\B/, Generic::Prompt
+
         rule %r/(in|is|and|or|not)\b/, Operator::Word
         rule %r/(<<|>>|\/\/|\*\*)=?/, Operator
         rule %r/[-~+\/*%=<>&^|@]=?|!=/, Operator
@@ -93,13 +99,13 @@ module Rouge
         rule %r/(from)((?:\\\s|\s)+)(#{dotted_identifier})((?:\\\s|\s)+)(import)/ do
           groups Keyword::Namespace,
                  Text,
-                 Name::Namespace,
+                 Name,
                  Text,
                  Keyword::Namespace
         end
 
         rule %r/(import)(\s+)(#{dotted_identifier})/ do
-          groups Keyword::Namespace, Text, Name::Namespace
+          groups Keyword::Namespace, Text, Name
         end
 
         rule %r/(def)((?:\s|\\\s)+)/ do
@@ -112,16 +118,17 @@ module Rouge
           push :classname
         end
 
+        rule %r/([a-z_]\w*)[ \t]*(?=(\(.*\)))/m, Name::Function
+        rule %r/([A-Z_]\w*)[ \t]*(?=(\(.*\)))/m, Name::Class
+
         # TODO: not in python 3
         rule %r/`.*?`/, Str::Backtick
         rule %r/([rfbu]{0,2})('''|"""|['"])/i do |m|
-          groups Str::Affix, Str
+          groups Str::Affix, Str::Heredoc
           current_string.register type: m[1].downcase, delim: m[2]
           push :generic_string
         end
 
-        rule %r/@#{dotted_identifier}/i, Name::Decorator
-
         # using negative lookbehind so we don't match property names
         rule %r/(?<!\.)#{identifier}/ do |m|
           if self.class.keywords.include? m[0]
@@ -175,11 +182,12 @@ module Rouge
       end
 
       state :generic_string do
-        rule %r/[^'"\\{]+/, Str
+        rule %r/>>>|\.\.\./, Generic::Prompt, :doctest
+        rule %r/[^'"\\{]+?/, Str
         rule %r/{{/, Str
 
         rule %r/'''|"""|['"]/ do |m|
-          token Str
+          token Str::Heredoc
           if current_string.delim? m[0]
             current_string.remove
             pop!
@@ -217,6 +225,17 @@ module Rouge
         rule %r/\\./, Str, :pop!
       end
 
+      state :doctest do
+        rule %r/\n\n/, Text, :pop!
+
+        rule %r/'''|"""/ do
+          token Str::Heredoc
+          pop!(2) if in_state?(:generic_string) # pop :doctest and :generic_string
+        end
+
+        mixin :root
+      end
+
       state :generic_interpol do
         rule %r/[^{}!:]+/ do |m|
           recurse m[0]

data/lib/rouge/lexers/ruby.rb

@@ -42,7 +42,7 @@ module Rouge
         rule %r/%([rqswQWxiI])?([^\w\s])/ do |m|
           open = Regexp.escape(m[2])
           close = Regexp.escape(delimiter_map[m[2]] || m[2])
-          interp = /[rQWxI]/ === m[1]
+          interp = /[rQWxI]/ === m[1] || !m[1]
           toktype = Str::Other
 
           puts "    open: #{open.inspect}" if @debug
@@ -188,6 +188,7 @@ module Rouge
 
         rule %r/(?:#{keywords.join('|')})(?=\W|$)/, Keyword, :expr_start
         rule %r/(?:#{keywords_pseudo.join('|')})\b/, Keyword::Pseudo, :expr_start
+        rule %r/(not|and|or)\b/, Operator::Word, :expr_start
 
         rule %r(
           (module)

data/lib/rouge/lexers/rust.rb

@@ -35,17 +35,18 @@ module Rouge
       def self.builtins
         @builtins ||= Set.new %w(
           Add BitAnd BitOr BitXor bool c_char c_double c_float char
-          c_int clock_t c_long c_longlong Cons Const Copy c_schar c_short
+          c_int clock_t c_long c_longlong Copy c_schar c_short
           c_uchar c_uint c_ulong c_ulonglong c_ushort c_void dev_t DIR
-          dirent Div Either Eq Err f32 f64 Failure FILE float fpos_t
-          i16 i32 i64 i8 isize Index ino_t int intptr_t Left mode_t Modulo Mul
-          Neg Nil None Num off_t Ok Option Ord Owned pid_t Ptr ptrdiff_t
-          Right Send Shl Shr size_t Some ssize_t str Sub Success time_t
+          dirent Div Eq Err f32 f64 FILE float fpos_t
+          i16 i32 i64 i8 isize Index ino_t int intptr_t mode_t Mul
+          Neg None off_t Ok Option Ord Owned pid_t ptrdiff_t
+          Send Shl Shr size_t Some ssize_t str Sub time_t
           u16 u32 u64 u8 usize uint uintptr_t
-          Box Vec String Gc Rc Arc
+          Box Vec String Rc Arc
           u128 i128 Result Sync Pin Unpin Sized Drop drop Fn FnMut FnOnce
           Clone PartialEq PartialOrd AsMut AsRef From Into Default
           DoubleEndedIterator ExactSizeIterator Extend IntoIterator Iterator
+          FromIterator ToOwned ToString TryFrom TryInto
         )
       end
 

data/lib/rouge/lexers/shell.rb

@@ -9,8 +9,11 @@ module Rouge
 
       tag 'shell'
       aliases 'bash', 'zsh', 'ksh', 'sh'
-      filenames '*.sh', '*.bash', '*.zsh', '*.ksh', '.bashrc', '.zshrc',
-                '.kshrc', '.profile', 'APKBUILD', 'PKGBUILD', '*.ebuild',
+      filenames '*.sh', '*.bash', '*.zsh', '*.ksh', '.bashrc',
+                '.kshrc', '.profile',
+                '.zshenv', '.zprofile', '.zshrc', '.zlogin', '.zlogout',
+                'zshenv',  'zprofile',  'zshrc',  'zlogin',  'zlogout',
+                'APKBUILD', 'PKGBUILD', '*.ebuild',
                 '*.eclass', '*.exheres-0', '*.exlib'
 
       mimetypes 'application/x-sh', 'application/x-shellscript', 'text/x-sh',
@@ -18,6 +21,7 @@ module Rouge
 
       def self.detect?(text)
         return true if text.shebang?(/(ba|z|k)?sh/)
+        return true if text.start_with?('#compdef', '#autoload')
       end
 
       KEYWORDS = %w(

data/lib/rouge/lexers/twig.rb

@@ -16,24 +16,24 @@ module Rouge
       mimetypes 'application/x-twig', 'text/html+twig'
 
       def self.keywords
-        @@keywords ||= %w(as do extends flush from import include use else starts
-                          ends with without autoescape endautoescape block
-                          endblock embed endembed filter endfilter for endfor
-                          if endif macro endmacro sandbox endsandbox set endset
-                          spaceless endspaceless)
+        @keywords ||= %w(as do extends flush from import include use else starts
+                         ends with without autoescape endautoescape block
+                         endblock embed endembed filter endfilter for endfor
+                         if endif macro endmacro sandbox endsandbox set endset
+                         spaceless endspaceless)
       end
 
       def self.tests
-        @@tests ||= %w(constant defined divisibleby empty even iterable null odd
-                       sameas)
+        @tests ||= %w(constant defined divisibleby empty even iterable null odd
+                      sameas)
       end
 
       def self.pseudo_keywords
-        @@pseudo_keywords ||= %w(true false none)
+        @pseudo_keywords ||= %w(true false none)
       end
 
       def self.word_operators
-        @@word_operators ||= %w(b-and b-or b-xor is in and or not)
+        @word_operators ||= %w(b-and b-or b-xor is in and or not)
       end
     end
   end

data/lib/rouge/lexers/yaml.rb

@@ -18,8 +18,6 @@ module Rouge
         return true if text =~ /\A\s*%YAML/m
       end
 
-      SPECIAL_VALUES = Regexp.union(%w(true false null))
-
       # NB: Tabs are forbidden in YAML, which is why you see things
       # like /[ ]+/.
 
@@ -340,7 +338,7 @@ module Rouge
         end
 
         rule %r/[ ]+/, Str
-        rule SPECIAL_VALUES, Name::Constant
+        rule %r((true|false|null)\b), Keyword::Constant
         rule %r/\d+(?:\.\d+)?(?=(\r?\n)| +#)/, Literal::Number, :pop!
 
         # regular non-whitespace characters

data/lib/rouge/themes/github.rb

@@ -6,68 +6,143 @@ module Rouge
     class Github < CSSTheme
       name 'github'
 
-      style Comment::Multiline,               :fg => '#999988', :italic => true
-      style Comment::Preproc,                 :fg => '#999999', :bold => true
-      style Comment::Single,                  :fg => '#999988', :italic => true
-      style Comment::Special,                 :fg => '#999999', :italic => true, :bold => true
-      style Comment,                          :fg => '#999988', :italic => true
-      style Error,                            :fg => '#a61717', :bg => '#e3d2d2'
-      style Generic::Deleted,                 :fg => '#000000', :bg => '#ffdddd'
-      style Generic::Emph,                    :fg => '#000000', :italic => true
-      style Generic::Error,                   :fg => '#aa0000'
-      style Generic::Heading,                 :fg => '#999999'
-      style Generic::Inserted,                :fg => '#000000', :bg => '#ddffdd'
-      style Generic::Output,                  :fg => '#888888'
-      style Generic::Prompt,                  :fg => '#555555'
-      style Generic::Strong,                  :bold => true
-      style Generic::Subheading,              :fg => '#aaaaaa'
-      style Generic::Traceback,               :fg => '#aa0000'
-      style Keyword::Constant,                :fg => '#000000', :bold => true
-      style Keyword::Declaration,             :fg => '#000000', :bold => true
-      style Keyword::Namespace,               :fg => '#000000', :bold => true
-      style Keyword::Pseudo,                  :fg => '#000000', :bold => true
-      style Keyword::Reserved,                :fg => '#000000', :bold => true
-      style Keyword::Type,                    :fg => '#445588', :bold => true
-      style Keyword,                          :fg => '#000000', :bold => true
-      style Literal::Number::Float,           :fg => '#009999'
-      style Literal::Number::Hex,             :fg => '#009999'
-      style Literal::Number::Integer::Long,   :fg => '#009999'
-      style Literal::Number::Integer,         :fg => '#009999'
-      style Literal::Number::Oct,             :fg => '#009999'
-      style Literal::Number,                  :fg => '#009999'
-      style Literal::String::Affix,           :fg => '#000000', :bold => true
-      style Literal::String::Backtick,        :fg => '#d14'
-      style Literal::String::Char,            :fg => '#d14'
-      style Literal::String::Doc,             :fg => '#d14'
-      style Literal::String::Double,          :fg => '#d14'
-      style Literal::String::Escape,          :fg => '#d14'
-      style Literal::String::Heredoc,         :fg => '#d14'
-      style Literal::String::Interpol,        :fg => '#d14'
-      style Literal::String::Other,           :fg => '#d14'
-      style Literal::String::Regex,           :fg => '#009926'
-      style Literal::String::Single,          :fg => '#d14'
-      style Literal::String::Symbol,          :fg => '#990073'
-      style Literal::String,                  :fg => '#d14'
-      style Name::Attribute,                  :fg => '#008080'
-      style Name::Builtin::Pseudo,            :fg => '#999999'
-      style Name::Builtin,                    :fg => '#0086B3'
-      style Name::Class,                      :fg => '#445588', :bold => true
-      style Name::Constant,                   :fg => '#008080'
-      style Name::Decorator,                  :fg => '#3c5d5d', :bold => true
-      style Name::Entity,                     :fg => '#800080'
-      style Name::Exception,                  :fg => '#990000', :bold => true
-      style Name::Function,                   :fg => '#990000', :bold => true
-      style Name::Label,                      :fg => '#990000', :bold => true
-      style Name::Namespace,                  :fg => '#555555'
-      style Name::Tag,                        :fg => '#000080'
-      style Name::Variable::Class,            :fg => '#008080'
-      style Name::Variable::Global,           :fg => '#008080'
-      style Name::Variable::Instance,         :fg => '#008080'
-      style Name::Variable,                   :fg => '#008080'
-      style Operator::Word,                   :fg => '#000000', :bold => true
-      style Operator,                         :fg => '#000000', :bold => true
-      style Text::Whitespace,                 :fg => '#bbbbbb'
-      style Text,                             :bg => '#f8f8f8'
+      # Primer primitives
+      # https://github.com/primer/primitives/tree/main/src/tokens
+      P_RED_0        = {:light => '#ffebe9', :dark => '#ffdcd7'}
+      P_RED_3        = {:dark => '#ff7b72'}
+      P_RED_5        = {:light => '#cf222e'}
+      P_RED_7        = {:light => '#82071e', :dark => '#8e1519'}
+      P_RED_8        = {:dark => '#67060c'}
+      P_ORANGE_2     = {:dark => '#ffa657'}
+      P_ORANGE_6     = {:light => '#953800'}
+      P_GREEN_0      = {:light => '#dafbe1', :dark => '#aff5b4'}
+      P_GREEN_1      = {:dark => '#7ee787'}
+      P_GREEN_6      = {:light => '#116329'}
+      P_GREEN_8      = {:dark => '#033a16'}
+      P_BLUE_1       = {:dark => '#a5d6ff'}
+      P_BLUE_2       = {:dark => '#79c0ff'}
+      P_BLUE_5       = {:dark => '#1f6feb'}
+      P_BLUE_6       = {:light => '#0550ae'}
+      P_BLUE_8       = {:light => '#0a3069'}
+      P_PURPLE_2     = {:dark => '#d2a8ff'}
+      P_PURPLE_5     = {:light => '#8250df'}
+      P_GRAY_0       = {:light => '#f6f8fa', :dark => '#f0f6fc'}
+      P_GRAY_1       = {:dark => '#c9d1d9'}
+      P_GRAY_3       = {:dark => '#8b949e'}
+      P_GRAY_5       = {:light => '#6e7781'}
+      P_GRAY_8       = {:dark => '#161b22'}
+      P_GRAY_9       = {:light => '#24292f'}
+
+      extend HasModes
+
+      def self.light!
+        mode :dark # indicate that there is a dark variant
+        mode! :light
+      end
+
+      def self.dark!
+        mode :light # indicate that there is a light variant
+        mode! :dark
+      end
+
+      def self.make_dark!
+        palette :comment     => P_GRAY_3[@mode]
+        palette :constant    => P_BLUE_2[@mode]
+        palette :entity      => P_PURPLE_2[@mode]
+        palette :heading     => P_BLUE_5[@mode]
+        palette :keyword     => P_RED_3[@mode]
+        palette :string      => P_BLUE_1[@mode]
+        palette :tag         => P_GREEN_1[@mode]
+        palette :variable    => P_ORANGE_2[@mode]
+
+        palette :fgDefault   => P_GRAY_1[@mode]
+        palette :bgDefault   => P_GRAY_8[@mode]
+
+        palette :fgInserted  => P_GREEN_0[@mode]
+        palette :bgInserted  => P_GREEN_8[@mode]
+
+        palette :fgDeleted   => P_RED_0[@mode]
+        palette :bgDeleted   => P_RED_8[@mode]
+
+        palette :fgError     => P_GRAY_0[@mode]
+        palette :bgError     => P_RED_7[@mode]
+      end
+
+      def self.make_light!
+        palette :comment     => P_GRAY_5[@mode]
+        palette :constant    => P_BLUE_6[@mode]
+        palette :entity      => P_PURPLE_5[@mode]
+        palette :heading     => P_BLUE_6[@mode]
+        palette :keyword     => P_RED_5[@mode]
+        palette :string      => P_BLUE_8[@mode]
+        palette :tag         => P_GREEN_6[@mode]
+        palette :variable    => P_ORANGE_6[@mode]
+
+        palette :fgDefault   => P_GRAY_9[@mode]
+        palette :bgDefault   => P_GRAY_0[@mode]
+
+        palette :fgInserted  => P_GREEN_6[@mode]
+        palette :bgInserted  => P_GREEN_0[@mode]
+
+        palette :fgDeleted   => P_RED_7[@mode]
+        palette :bgDeleted   => P_RED_0[@mode]
+
+        palette :fgError     => P_GRAY_0[@mode]
+        palette :bgError     => P_RED_7[@mode]
+      end
+
+      light!
+
+      style Text,                       :fg => :fgDefault, :bg => :bgDefault
+
+      style Keyword,                    :fg => :keyword
+
+      style Generic::Error,             :fg => :fgError
+
+      style Generic::Deleted,           :fg => :fgDeleted, :bg => :bgDeleted
+
+      style Name::Builtin,
+            Name::Class,
+            Name::Constant,
+            Name::Namespace,            :fg => :variable
+
+      style Literal::String::Regex,
+            Name::Attribute,
+            Name::Tag,                  :fg => :tag
+
+      style Generic::Inserted,          :fg => :fgInserted, :bg => :bgInserted
+
+      style Keyword::Constant,
+            Literal,
+            Literal::String::Backtick,
+            Name::Builtin::Pseudo,
+            Name::Exception,
+            Name::Label,
+            Name::Property,
+            Name::Variable,
+            Operator,                   :fg => :constant
+
+      style Generic::Heading,
+            Generic::Subheading,        :fg => :heading, :bold => true
+
+      style Literal::String,            :fg => :string
+
+      style Name::Decorator,
+            Name::Function,             :fg => :entity
+
+      style Error,                      :fg => :fgError, :bg => :bgError
+
+      style Comment,
+            Generic::Lineno,
+            Generic::Traceback,         :fg => :comment
+
+      style Name::Entity,
+            Literal::String::Interpol,  :fg => :fgDefault
+
+      style Generic::Emph,              :fg => :fgDefault, :italic => true
+
+      style Generic::Strong,            :fg => :fgDefault, :bold => true
+
     end
   end
 end

data/lib/rouge/version.rb

@@ -3,6 +3,6 @@
 
 module Rouge
   def self.version
-    "4.0.1"
+    "4.1.1"
   end
 end

data/lib/rouge.rb

@@ -47,11 +47,9 @@ module Rouge
     #
     # @api private
     def load_lexers
-      # The trailing slash is necessary to avoid lexers being loaded multiple
-      # times by `Lexers.load_lexer`
-      lexer_dir = File.join(LIB_DIR, "rouge/lexers/")
-      Dir.glob(File.join(lexer_dir, '*.rb')).each do |f|
-        Lexers.load_lexer(f.sub(lexer_dir, ''))
+      lexer_dir = Pathname.new(LIB_DIR) / "rouge/lexers"
+      Pathname.glob(lexer_dir / '*.rb').each do |f|
+        Lexers.load_lexer(f.relative_path_from(lexer_dir))
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.1
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-17 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -44,6 +44,7 @@ files:
 - lib/rouge/demos/c
 - lib/rouge/demos/ceylon
 - lib/rouge/demos/cfscript
+- lib/rouge/demos/cisco_ios
 - lib/rouge/demos/clean
 - lib/rouge/demos/clojure
 - lib/rouge/demos/cmake
@@ -284,6 +285,7 @@ files:
 - lib/rouge/lexers/c.rb
 - lib/rouge/lexers/ceylon.rb
 - lib/rouge/lexers/cfscript.rb
+- lib/rouge/lexers/cisco_ios.rb
 - lib/rouge/lexers/clean.rb
 - lib/rouge/lexers/clojure.rb
 - lib/rouge/lexers/cmake.rb
@@ -541,7 +543,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: A pure-ruby colorizer based on pygments