rouge 3.19.0 → 3.26.0

data/lib/rouge/lexers/ruby.rb

@@ -374,7 +374,7 @@ module Rouge
       end
 
       state :method_call do
-        rule %r(/) do
+        rule %r(/|%) do
           token Operator
           goto :expr_start
         end

data/lib/rouge/lexers/rust.rb

@@ -22,8 +22,8 @@ module Rouge
 
       def self.keywords
         @keywords ||= %w(
-          as assert async await break const copy do drop else enum extern fail false
-          fn for if impl let log loop match mod move mut priv pub pure
+          as assert async await break const continue copy do drop else enum extern
+          fail false fn for if impl let log loop match mod move mut priv pub pure
           ref return self static struct true trait type unsafe use where
           while box
         )
@@ -99,7 +99,9 @@ module Rouge
         rule %r/[*\/!@~&+%^<>=\?-]|\.{2,3}/, Operator
 
         rule %r/([.]\s*)?#{id}(?=\s*[(])/m, Name::Function
+        rule %r/[.]\s*await\b/, Keyword
         rule %r/[.]\s*#{id}/, Name::Property
+        rule %r/[.]\s*\d+/, Name::Attribute
         rule %r/(#{id})(::)/m do
           groups Name::Namespace, Punctuation
         end
@@ -167,7 +169,7 @@ module Rouge
         flt = /f32|f64/
 
         rule %r(
-          [0-9]+
+          [0-9_]+
           (#{dot}  #{exp}? #{flt}?
           |#{dot}? #{exp}  #{flt}?
           |#{dot}? #{exp}? #{flt}
@@ -177,6 +179,7 @@ module Rouge
         rule %r(
           ( 0b[10_]+
           | 0x[0-9a-fA-F_]+
+          | 0o[0-7]+
           | [0-9_]+
           ) (u#{size}?|i#{size})?
         )x, Num::Integer

data/lib/rouge/lexers/sass/common.rb

@@ -29,6 +29,7 @@ module Rouge
         end
 
         rule %r/@#{id}/, Keyword, :selector
+        rule %r/&/, Keyword, :selector
 
         # $variable: assignment
         rule %r/([$]#{id})([ \t]*)(:)/ do

data/lib/rouge/lexers/smarty.rb

@@ -41,7 +41,7 @@ module Rouge
         end
 
 
-        rule(/.*?(?={[\/a-zA-Z0-9$#*"'])|.*/m) { delegate parent }
+        rule(/.+?(?={[\/a-zA-Z0-9$#*"'])/m) { delegate parent }
         rule(/.+/m) { delegate parent }
       end
 

data/lib/rouge/lexers/ssh.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class SSH < RegexLexer
+      tag 'ssh'
+
+      title "SSH Config File"
+      desc 'A lexer for SSH configuration files'
+      filenames 'ssh_config'
+
+      state :root do
+        rule %r/[a-z0-9]+/i, Keyword, :statement
+        mixin :base
+      end
+
+      state :statement do
+        rule %r/\n/, Text, :pop!
+        rule %r/(?:yes|no|confirm|ask|always|auto|none|force)\b/, Name::Constant
+
+        rule %r/\d+/, Num
+        rule %r/[^#\s;{}$\\]+/, Text
+        mixin :base
+      end
+
+      state :base do
+        rule %r/\s+/, Text
+        rule %r/#.*/, Comment::Single
+      end
+    end
+  end
+end

data/lib/rouge/lexers/systemd.rb

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class SystemD < RegexLexer
+      tag 'systemd'
+      aliases 'unit-file'
+      filenames '*.service'
+      mimetypes 'text/x-systemd-unit'
+      desc 'A lexer for systemd unit files'
+
+      state :root do
+        rule %r/\s+/, Text
+        rule %r/[;#].*/, Comment
+        rule %r/\[.*?\]$/, Keyword
+        rule %r/(.*?)(=)(.*)(\\\n)/ do
+          groups Name::Tag, Punctuation, Text, Str::Escape
+          push :continuation
+        end
+        rule %r/(.*?)(=)(.*)/ do
+          groups Name::Tag, Punctuation, Text
+        end
+      end
+
+      state :continuation do
+        rule %r/(.*?)(\\\n)/ do
+          groups Text, Str::Escape
+        end
+        rule %r/(.*)'/, Text, :pop!
+      end
+    end
+  end
+end

data/lib/rouge/lexers/tsx.rb

@@ -7,13 +7,20 @@ module Rouge
     load_lexer 'typescript/common.rb'
 
     class TSX < JSX
-      include TypescriptCommon
+      extend TypescriptCommon
 
-      title 'TypeScript'
-      desc 'tsx'
+      title 'TSX'
+      desc 'TypeScript-compatible JSX (www.typescriptlang.org/docs/handbook/jsx.html)'
 
       tag 'tsx'
       filenames '*.tsx'
+
+      prepend :element_name do
+        rule %r/(\w+)(,)/ do
+          groups Name::Other, Punctuation
+          pop! 3
+        end
+      end
     end
   end
 end

data/lib/rouge/lexers/twig.rb

@@ -17,10 +17,10 @@ module Rouge
 
       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 verbatim endverbatim)
+                          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

data/lib/rouge/lexers/typescript.rb

@@ -7,7 +7,7 @@ module Rouge
     load_lexer 'typescript/common.rb'
 
     class Typescript < Javascript
-      include TypescriptCommon
+      extend TypescriptCommon
 
       title "TypeScript"
       desc "TypeScript, a superset of JavaScript"
@@ -18,17 +18,6 @@ module Rouge
       filenames '*.ts', '*.d.ts'
 
       mimetypes 'text/typescript'
-
-      prepend :root do
-        rule %r/[?][.]/, Punctuation
-      end
-
-      prepend :statement do
-        rule %r/(#{Javascript.id_regex})(\??)(\s*)(:)/ do
-          groups Name::Label, Punctuation, Text, Punctuation
-          push :expr_start
-        end
-      end
     end
   end
 end

data/lib/rouge/lexers/typescript/common.rb

@@ -4,31 +4,45 @@
 module Rouge
   module Lexers
     module TypescriptCommon
-      def self.keywords
+      def keywords
         @keywords ||= super + Set.new(%w(
           is namespace static private protected public
           implements readonly
         ))
       end
 
-      def self.declarations
+      def declarations
         @declarations ||= super + Set.new(%w(
           type abstract
         ))
       end
 
-      def self.reserved
+      def reserved
         @reserved ||= super + Set.new(%w(
           string any void number namespace module
           declare default interface keyof
         ))
       end
 
-      def self.builtins
+      def builtins
         @builtins ||= super + %w(
           Pick Partial Readonly Record
         )
       end
+
+      def self.extended(base)
+        base.prepend :root do
+          rule %r/[?][.]/, base::Punctuation
+          rule %r/[?]{2}/, base::Operator
+        end
+
+        base.prepend :statement do
+          rule %r/(#{Javascript.id_regex})(\??)(\s*)(:)/ do
+            groups base::Name::Label, base::Punctuation, base::Text, base::Punctuation
+            push :expr_start
+          end
+        end
+      end
     end
   end
 end

data/lib/rouge/lexers/velocity.rb

@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    class Velocity < TemplateLexer
+      title 'Velocity'
+      desc 'Velocity is a Java-based template engine (velocity.apache.org)'
+      tag 'velocity'
+      filenames '*.vm', '*.velocity', '*.fhtml'
+      mimetypes 'text/html+velocity'
+
+      id = /[a-z_]\w*/i
+
+      state :root do
+        rule %r/[^{#$]+/ do
+          delegate parent
+        end
+
+        rule %r/(#)(\*.*?\*)(#)/m, Comment::Multiline
+        rule %r/(##)(.*?$)/, Comment::Single
+
+        rule %r/(#\{?)(#{id})(\}?)(\s?\()/m do
+          groups Punctuation, Name::Function, Punctuation, Punctuation
+          push :directive_params
+        end
+
+        rule %r/(#\{?)(#{id})(\}|\b)/m do
+          groups Punctuation, Name::Function, Punctuation
+        end
+
+        rule %r/\$\{?/, Punctuation, :variable
+      end
+
+      state :variable do
+        rule %r/#{id}/, Name::Variable
+        rule %r/\(/, Punctuation, :func_params
+        rule %r/(\.)(#{id})/ do
+          groups Punctuation, Name::Variable
+        end
+        rule %r/\}/, Punctuation, :pop!
+        rule(//) { pop! }
+      end
+
+      state :directive_params do
+        rule %r/(&&|\|\||==?|!=?|[-<>+*%&|^\/])|\b(eq|ne|gt|lt|ge|le|not|in)\b/, Operator
+        rule %r/\[/, Operator, :range_operator
+        rule %r/\b#{id}\b/, Name::Function
+        mixin :func_params
+      end
+
+      state :range_operator do
+        rule %r/[.]{2}/, Operator
+        mixin :func_params
+        rule %r/\]/, Operator, :pop!
+      end
+
+      state :func_params do
+        rule %r/\$\{?/, Punctuation, :variable
+        rule %r/\s+/, Text
+        rule %r/,/, Punctuation
+        rule %r/"(\\\\|\\"|[^"])*"/, Str::Double
+        rule %r/'(\\\\|\\'|[^'])*'/, Str::Single
+        rule %r/0[xX][0-9a-fA-F]+[Ll]?/, Num::Hex
+        rule %r/\b[0-9]+\b/, Num::Integer
+        rule %r/(true|false|null)\b/, Keyword::Constant
+        rule %r/[(\[]/, Punctuation, :push
+        rule %r/[)\]}]/, Punctuation, :pop!
+      end
+    end
+  end
+end

data/lib/rouge/lexers/wollok.rb

@@ -18,7 +18,6 @@ module Rouge
 
       state :whitespaces_and_comments do
         rule %r/\s+/m, Text::Whitespace
-        rule %r/$+/m, Text::Whitespace
         rule %r(//.*$), Comment::Single
         rule %r(/\*(.|\s)*?\*/)m, Comment::Multiline
       end

data/lib/rouge/lexers/xml.rb

@@ -12,6 +12,8 @@ module Rouge
       mimetypes 'text/xml', 'application/xml', 'image/svg+xml',
                 'application/rss+xml', 'application/atom+xml'
 
+      # Documentation: https://www.w3.org/TR/xml11/#charsets and https://www.w3.org/TR/xml11/#sec-suggested-names
+
       def self.detect?(text)
         return false if text.doctype?(/html/)
         return true if text =~ /\A<\?xml\b/
@@ -27,10 +29,10 @@ module Rouge
         rule %r/<![^>]*>/, Comment::Preproc
 
         # open tags
-        rule %r(<\s*[\w:.-]+)m, Name::Tag, :tag
+        rule %r(<\s*[\p{L}:_][\p{Word}\p{Cf}:.·-]*)m, Name::Tag, :tag
 
         # self-closing tags
-        rule %r(<\s*/\s*[\w:.-]+\s*>)m, Name::Tag
+        rule %r(<\s*/\s*[\p{L}:_][\p{Word}\p{Cf}:.·-]*\s*>)m, Name::Tag
       end
 
       state :comment do
@@ -41,7 +43,7 @@ module Rouge
 
       state :tag do
         rule %r/\s+/m, Text
-        rule %r/[\w.:-]+\s*=/m, Name::Attribute, :attr
+        rule %r/[\p{L}:_][\p{Word}\p{Cf}:.·-]*\s*=/m, Name::Attribute, :attr
         rule %r(/?\s*>), Name::Tag, :pop!
       end
 

data/lib/rouge/lexers/yaml.rb

@@ -11,6 +11,8 @@ module Rouge
       aliases 'yml'
       filenames '*.yaml', '*.yml'
 
+      # Documentation: https://yaml.org/spec/1.2/spec.html
+
       def self.detect?(text)
         # look for the %YAML directive
         return true if text =~ /\A\s*%YAML/m
@@ -165,15 +167,15 @@ module Rouge
         )x, Keyword::Type
 
         # an anchor
-        rule %r/&[\w-]+/, Name::Label
+        rule %r/&[\p{L}\p{Nl}\p{Nd}_-]+/, Name::Label
 
         # an alias
-        rule %r/\*[\w-]+/, Name::Variable
+        rule %r/\*[\p{L}\p{Nl}\p{Nd}_-]+/, Name::Variable
       end
 
       state :block_nodes do
         # implicit key
-        rule %r/((?:\w[\w -]*)?)(:)(?=\s|$)/ do |m|
+        rule %r/((?:[\p{L}\p{Nl}\p{Nd}_][\p{L}\p{Nl}\p{Nd}\p{Blank}_-]*)?)(:)(?=\s|$)/ do |m|
           groups Name::Attribute, Punctuation::Indicator
           set_indent m[0], :implicit => true
         end

data/lib/rouge/lexers/zig.rb

@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class Zig < RegexLexer
+      tag 'zig'
+      aliases 'zir'
+      filenames '*.zig'
+      mimetypes 'text/x-zig'
+
+      title 'Zig'
+      desc 'The Zig programming language (ziglang.org)'
+
+      def self.keywords
+        @keywords ||= %w(
+          align linksection threadlocal struct enum union error break return
+          anyframe fn c_longlong c_ulonglong c_longdouble c_void comptime_float
+          c_short c_ushort c_int c_uint c_long c_ulong continue asm defer
+          errdefer const var extern packed export pub if else switch and or
+          orelse while for bool unreachable try catch async suspend nosuspend
+          await resume undefined usingnamespace test void noreturn type
+          anyerror usize noalias inline noinline comptime callconv volatile
+          allowzero
+        )
+      end
+
+      def self.builtins
+        @builtins ||= %w(
+          @addWithOverflow @as @atomicLoad @atomicStore @bitCast @breakpoint
+          @alignCast @alignOf @cDefine @cImport @cInclude @bitOffsetOf
+          @atomicRmw @bytesToSlice @byteOffsetOf @OpaqueType @panic @ptrCast
+          @bitReverse @Vector @sin @cUndef @canImplicitCast @clz @cmpxchgWeak
+          @cmpxchgStrong @compileError @compileLog @ctz @popCount @divExact
+          @divFloor @cos @divTrunc @embedFile @export @tagName @TagType
+          @errorName @call @errorReturnTrace @fence @fieldParentPtr @field
+          @unionInit @errorToInt @intToEnum @enumToInt @setAlignStack @frame
+          @Frame @exp @exp2 @log @log2 @log10 @fabs @floor @ceil @trunc @round
+          @floatCast @intToFloat @floatToInt @boolToInt @errSetCast @intToError
+          @frameAddress @import @newStackCall @asyncCall @intToPtr @intCast
+          @frameSize @memcpy @memset @mod @mulWithOverflow @splat @ptrToInt
+          @rem @returnAddress @setCold @Type @shuffle @setGlobalLinkage
+          @setGlobalSection @shlExact @This @hasDecl @hasField
+          @setRuntimeSafety @setEvalBranchQuota @setFloatMode @shlWithOverflow
+          @shrExact @sizeOf @bitSizeOf @sqrt @byteSwap @subWithOverflow
+          @sliceToBytes comptime_int @truncate @typeInfo @typeName @TypeOf
+        )
+      end
+
+      id = /[a-z_]\w*/i
+      escapes = /\\ ([nrt'"\\0] | x\h{2} | u\h{4} | U\h{8})/x
+
+      state :bol do
+        mixin :whitespace
+        rule %r/#\s[^\n]*/, Comment::Special
+        rule(//) { pop! }
+      end
+
+      state :attribute do
+        mixin :whitespace
+        mixin :literals
+        rule %r/[(,)=:]/, Name::Decorator
+        rule %r/\]/, Name::Decorator, :pop!
+        rule id, Name::Decorator
+      end
+
+      state :whitespace do
+        rule %r/\s+/, Text
+        rule %r(//[^\n]*), Comment
+      end
+
+      state :root do
+        rule %r/\n/, Text, :bol
+
+        mixin :whitespace
+
+        rule %r/\b(?:(i|u)[0-9]+)\b/, Keyword::Type
+        rule %r/\b(?:f(16|32|64|128))\b/, Keyword::Type
+        rule %r/\b(?:(isize|usize))\b/, Keyword::Type
+
+        mixin :literals
+
+        rule %r/'#{id}/, Name::Variable
+        rule %r/([.]?)(\s*)(@?#{id})(\s*)([(]?)/ do |m|
+          name = m[3]
+          t = if self.class.keywords.include? name
+                Keyword
+              elsif self.class.builtins.include? name
+                Name::Builtin
+              elsif !m[1].empty? && !m[5].empty?
+                Name::Function
+              elsif !m[1].empty?
+                Name::Property
+              else
+                Name
+              end
+
+          groups Punctuation, Text, t, Text, Punctuation
+        end
+
+        rule %r/[()\[\]{}|,:;]/, Punctuation
+        rule %r/[*\/!@~&+%^<>=\?-]|\.{1,3}/, Operator
+      end
+
+      state :literals do
+        rule %r/\b(?:true|false|null)\b/, Keyword::Constant
+        rule %r(
+        ' (?: #{escapes} | [^\\] ) '
+        )x, Str::Char
+
+        rule %r/"/, Str, :string
+        rule %r/r(#*)".*?"\1/m, Str
+
+        dot = /[.][0-9_]+/
+        exp = /e[-+]?[0-9_]+/
+
+        rule %r(
+          [0-9]+
+          (#{dot}  #{exp}?
+          |#{dot}? #{exp}
+          )
+        )x, Num::Float
+
+        rule %r(
+        ( 0b[10_]+
+         | 0x[0-9a-fA-F_]+
+         | [0-9_]+
+        )
+        )x, Num::Integer
+      end
+
+      state :string do
+        rule %r/"/, Str, :pop!
+        rule escapes, Str::Escape
+        rule %r/[^"\\]+/m, Str
+      end
+    end
+  end
+end