rouge 4.1.0 → 4.1.3

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
@@ -273,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

@@ -80,6 +80,8 @@ 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
@@ -120,7 +122,7 @@ module Rouge
         # 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
@@ -178,11 +180,12 @@ module Rouge
       end
 
       state :generic_string do
-        rule %r/[^'"\\{]+/, Str
+        rule %r/^\s*(>>>|\.\.\.)\B/, 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!
@@ -220,6 +223,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/swift.rb

@@ -15,28 +15,29 @@ module Rouge
       id = /#{id_head}#{id_rest}*/
 
       keywords = Set.new %w(
-        await break case continue default do else fallthrough if in for return switch where while try catch throw guard defer repeat
+        autoreleasepool await break case catch consume continue default defer discard do each else fallthrough guard if in for repeat return switch throw try where while
 
-        as dynamicType is new super self Self Type __COLUMN__ __FILE__ __FUNCTION__ __LINE__
+        as dynamicType is new super self Self Type
 
-        associativity async didSet get infix inout isolated mutating none nonmutating operator override postfix precedence prefix set unowned weak willSet throws rethrows precedencegroup
-
-        #available #colorLiteral #column #else #elseif #endif #error #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation #warning
+        associativity async didSet get infix inout isolated left mutating none nonmutating operator override postfix precedence precedencegroup prefix rethrows right set throws unowned weak willSet
       )
 
       declarations = Set.new %w(
-        actor class deinit enum convenience extension final func import init internal lazy let nonisolated optional private protocol public required static struct subscript typealias var dynamic indirect associatedtype open fileprivate some
+        actor any associatedtype borrowing class consuming deinit distributed dynamic enum convenience extension fileprivate final func import indirect init internal lazy let macro nonisolated open optional package private protocol public required some static struct subscript typealias var
       )
 
       constants = Set.new %w(
         true false nil
       )
 
-      start { push :bol }
+      start do
+        push :bol
+        @re_delim = "" # multi-line regex delimiter
+      end
 
       # beginning of line
       state :bol do
-        rule %r/#.*/, Comment::Preproc
+        rule %r/#(?![#"\/]).*/, Comment::Preproc
 
         mixin :inline_whitespace
 
@@ -69,8 +70,11 @@ module Rouge
         mixin :whitespace
         
         rule %r/\$(([1-9]\d*)?\d)/, Name::Variable
+        rule %r/\$#{id}/, Name
+        rule %r/~Copyable\b/, Keyword::Type
 
         rule %r{[()\[\]{}:;,?\\]}, Punctuation
+        rule %r{(#*)/(?!\s).*(?<![\s\\])/\1}, Str::Regex
         rule %r([-/=+*%<>!&|^.~]+), Operator
         rule %r/@?"/, Str, :dq
         rule %r/'(\\.|.)'/, Str::Char
@@ -82,6 +86,7 @@ module Rouge
         rule %r{[\d]+(?:_\d+)*}, Num::Integer
 
         rule %r/@#{id}/, Keyword::Declaration
+        rule %r/##{id}/, Keyword
 
         rule %r/(private|internal)(\([ ]*)(\w+)([ ]*\))/ do |m|
           if m[3] == 'set'
@@ -99,14 +104,6 @@ module Rouge
           end
         end
 
-        rule %r/#available\([^)]+\)/, Keyword::Declaration
-
-        rule %r/(#(?:selector|keyPath)\()([^)]+?(?:[(].*?[)])?)(\))/ do
-          groups Keyword::Declaration, Name::Function, Keyword::Declaration
-        end
-
-        rule %r/#(line|file|column|function|dsohandle)/, Keyword::Declaration
-
         rule %r/(let|var)\b(\s*)(#{id})/ do
           groups Keyword, Text, Name::Variable
         end
@@ -148,6 +145,12 @@ module Rouge
         rule %r/(`)(#{id})(`)/ do
           groups Punctuation, Name::Variable, Punctuation
         end
+
+        rule %r{(#+)/\n} do |m|
+          @re_delim = m[1]
+          token Str::Regex
+          push :re_multi
+        end
       end
 
       state :tuple do
@@ -181,6 +184,19 @@ module Rouge
         rule %r/[)]/, Punctuation, :pop!
         mixin :root
       end
+
+      state :re_multi do
+        rule %r{^\s*/#+} do |m|
+          token Str::Regex
+          if m[0].end_with?("/#{@re_delim}")
+            @re_delim = ""
+            pop!
+          end
+        end
+
+        rule %r/#.*/, Comment::Single
+        rule %r/./m, Str::Regex
+      end
     end
   end
 end

data/lib/rouge/lexers/terraform.rb

@@ -37,14 +37,6 @@ module Rouge
         @builtins ||= %w()
       end
 
-      prepend :hash do
-        rule %r/[.,()*]/, Punctuation
-      end
-
-      prepend :array do
-        rule %r/[.,()*]/, Punctuation
-      end
-
       state :strings do
         rule %r/\\./, Str::Escape
         rule %r/\$\{/ do

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

@@ -10,12 +10,12 @@ module Rouge
       extend TypescriptCommon
 
       title "TypeScript"
-      desc "TypeScript, a superset of JavaScript"
+      desc "TypeScript, a superset of JavaScript (https://www.typescriptlang.org/)"
 
       tag 'typescript'
       aliases 'ts'
 
-      filenames '*.ts', '*.d.ts'
+      filenames '*.ts', '*.d.ts', '*.cts', '*.mts'
 
       mimetypes 'text/typescript'
     end

data/lib/rouge/lexers/wollok.rb

@@ -14,8 +14,6 @@ module Rouge
       entity_name = /[a-zA-Z][a-zA-Z0-9]*/
       variable_naming = /_?#{entity_name}/
 
-      entities = []
-
       state :whitespaces_and_comments do
         rule %r/\s+/m, Text::Whitespace
         rule %r(//.*$), Comment::Single
@@ -98,6 +96,12 @@ module Rouge
         rule %r/\(|\)|=/, Text
         rule %r/,/, Punctuation
       end
+
+      private
+
+      def entities
+        @entities ||= []
+      end
     end
   end
 end

data/lib/rouge/lexers/xquery.rb

@@ -8,7 +8,7 @@ module Rouge
       title 'XQuery'
       desc 'XQuery 3.1: An XML Query Language'
       tag 'xquery'
-      filenames '*.xquery', '*.xq'
+      filenames '*.xquery', '*.xq', '*.xqm'
       mimetypes 'application/xquery'
 
       def self.keywords

data/lib/rouge/version.rb

@@ -3,6 +3,6 @@
 
 module Rouge
   def self.version
-    "4.1.0"
+    "4.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.3
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-12 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -543,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.13
 signing_key:
 specification_version: 4
 summary: A pure-ruby colorizer based on pygments