rouge 3.19.0 → 3.21.0

data/lib/rouge/lexers/opentype_feature_file.rb

@@ -12,24 +12,30 @@ module Rouge
 
       def self.keywords
         @keywords ||= %w(
-          Ascender Attach CapHeight CaretOffset CodePageRange Descender FontRevision FSType
-          GlyphClassDef HorizAxis.BaseScriptList HorizAxis.BaseTagList HorizAxis.MinMax
-          IgnoreBaseGlyphs IgnoreLigatures IgnoreMarks LigatureCaretByDev LigatureCaretByIndex
-          LigatureCaretByPos LineGap MarkAttachClass MarkAttachmentType NULL Panose RightToLeft
-          TypoAscender TypoDescender TypoLineGap UnicodeRange UseMarkFilteringSet Vendor
-          VertAdvanceY VertAxis.BaseScriptList VertAxis.BaseTagList VertAxis.MinMax VertOriginY
-          VertTypoAscender VertTypoDescender VertTypoLineGap WeightClass WidthClass XHeight
-
-          anchorDef anchor anonymous anon by contour cursive device enumerate enum
-          exclude_dflt featureNames feature from ignore include_dflt include languagesystem
-          language lookupflag lookup markClass mark nameid name parameters position pos required
-          reversesub rsub script sizemenuname substitute subtable sub table useExtension
+          Ascender Attach AxisValue CapHeight CaretOffset CodePageRange
+          DesignAxis Descender ElidedFallbackName ElidedFallbackNameID
+          ElidableAxisValueName FeatUILabelNameID FeatUITooltipTextNameID
+          FontRevision FSType GlyphClassDef HorizAxis.BaseScriptList
+          HorizAxis.BaseTagList HorizAxis.MinMax IgnoreBaseGlyphs
+          IgnoreLigatures IgnoreMarks LigatureCaretByDev LigatureCaretByIndex
+          LigatureCaretByPos LineGap MarkAttachClass MarkAttachmentType NULL
+          OlderSiblingFontAttribute Panose ParamUILabelNameID RightToLeft
+          SampleTextNameID TypoAscender TypoDescender TypoLineGap UnicodeRange
+          UseMarkFilteringSet Vendor VertAdvanceY VertAxis.BaseScriptList
+          VertAxis.BaseTagList VertAxis.MinMax VertOriginY VertTypoAscender
+          VertTypoDescender VertTypoLineGap WeightClass WidthClass XHeight
+
+          anchorDef anchor anonymous anon by contour cursive device enumerate
+          enum exclude_dflt featureNames feature flag from ignore include_dflt
+          include languagesystem language location lookupflag lookup markClass
+          mark nameid name parameters position pos required reversesub rsub
+          script sizemenuname substitute subtable sub table useExtension
           valueRecordDef winAscent winDescent
         )
       end
 
 
-      identifier = %r/[a-z_][a-z0-9\/_]*/i
+      identifier = %r/[a-z_][a-z0-9\/_.-]*/i
 
       state :root do
         rule %r/\s+/m, Text::Whitespace
@@ -41,17 +47,18 @@ module Rouge
           push :featurename
         end
         # } <tag> ;
-        rule %r/(\})((?:\s)*)/ do
+        rule %r/(\})((?:\s))/ do
           groups Punctuation, Text
           push :featurename
         end
         # solve include( ../path)
-        rule %r/(include)/i, Keyword, :includepath
+        rule %r/include\b/i, Keyword, :includepath
 
         rule %r/[\-\[\]\/(){},.:;=%*<>']/, Punctuation
 
         rule %r/`.*?/, Str::Backtick
-        rule %r/\"/, Str, :dqs
+        rule %r/\"/, Str, :strings
+        rule %r/\\[^.*\s]+/i, Str::Escape
 
         # classes, start with @<nameOfClass>
         rule %r/@#{identifier}/, Name::Class
@@ -66,6 +73,7 @@ module Rouge
         end
 
         rule identifier, Name
+        rule %r/(?:0x|\\)[0-9A-Fa-f]+/, Num::Hex
         rule %r/-?\d+/, Num::Integer
       end
 
@@ -77,37 +85,14 @@ module Rouge
         rule %r/\s+/, Text::Whitespace
         rule %r/\)/, Punctuation, :pop!
         rule %r/\(/, Punctuation
-        rule %r/[a-z0-9\/_.]*/i, Str
+        rule %r/[^\s()]+/, Str
       end
 
       state :strings do
-        rule %r/(\([a-z0-9_]+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?/i, Str
-      end
-
-      state :strings_double do
-        rule %r/[^\\"%\n]+/, Str
-        mixin :strings
-      end
-
-      state :escape do
-        rule %r(\\
-          ( [\\abfnrtv"']
-          | \n
-          | N{[a-zA-z][a-zA-Z ]+[a-zA-Z]}
-          | u[a-fA-F0-9]{4}
-          | U[a-fA-F0-9]{8}
-          | x[a-fA-F0-9]{2}
-          | [0-7]{1,3}
-          )
-        )x, Str::Escape
-      end
-
-      state :dqs do
         rule %r/"/, Str, :pop!
-        mixin :escape
-        mixin :strings_double
+        rule %r/[^"%\n]+/, Str
+        rule %r/(\([a-z0-9_]+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?/i, Str
       end
-
     end
   end
 end

data/lib/rouge/lexers/perl.rb

@@ -65,7 +65,7 @@ module Rouge
       end
 
       state :root do
-        rule %r/#.*?$/, Comment::Single
+        rule %r/#.*/, Comment::Single
         rule %r/^=[a-zA-Z0-9]+\s+.*?\n=cut/m, Comment::Multiline
         rule %r/(?:#{keywords.join('|')})\b/, Keyword
 
@@ -99,6 +99,9 @@ module Rouge
           re_tok, :balanced_regex
 
         rule %r/\s+/, Text
+
+        rule(/(?=[a-z_]\w*(\s*#.*\n)*\s*=>)/i) { push :fat_comma }
+
         rule %r/(?:#{builtins.join('|')})\b/, Name::Builtin
         rule %r/((__(DIE|WARN)__)|(DATA|STD(IN|OUT|ERR)))\b/,
           Name::Builtin::Pseudo
@@ -142,6 +145,13 @@ module Rouge
         rule %r/.*?\n/, Str::Interpol
       end
 
+      state :fat_comma do
+        rule %r/#.*/, Comment::Single
+        rule %r/\w+/, Str
+        rule %r/\s+/, Text
+        rule %r/=>/, Operator, :pop!
+      end
+
       state :name_common do
         rule %r/\w+::/, Name::Namespace
         rule %r/[\w:]+/, Name::Variable, :pop!
@@ -178,16 +188,24 @@ module Rouge
       end
 
       state :sq do
-        rule %r/\\[']/, Str::Escape
+        rule %r/\\[\\']/, Str::Escape
         rule %r/[^\\']+/, Str::Single
         rule %r/'/, Punctuation, :pop!
+        rule %r/\\/, Str::Single
       end
 
       state :dq do
         mixin :string_intp
-        rule %r/\\[\\tnr"]/, Str::Escape
+        rule %r/\\[\\tnrabefluLUE"$@]/, Str::Escape
+        rule %r/\\0\d{2}/, Str::Escape
+        rule %r/\\o\{\d+\}/, Str::Escape
+        rule %r/\\x\h{2}/, Str::Escape
+        rule %r/\\x\{\h+\}/, Str::Escape
+        rule %r/\\c./, Str::Escape
+        rule %r/\\N\{[^\}]+\}/, Str::Escape
         rule %r/[^\\"]+?/, Str::Double
         rule %r/"/, Punctuation, :pop!
+        rule %r/\\/, Str::Escape
       end
 
       state :bq do

data/lib/rouge/lexers/powershell.rb

@@ -165,6 +165,7 @@ module Rouge
       end
 
       state :parameters do
+        rule %r/`./m, Str::Escape
         rule %r/\s*?\n/, Text::Whitespace, :pop!
         rule %r/[;(){}\]]/, Punctuation, :pop!
         rule %r/[|=]/, Operator, :pop!
@@ -201,7 +202,7 @@ module Rouge
         rule %r/(?:#{KEYWORDS})\b(?![-.])/i, Keyword::Reserved
 
         rule %r/-{1,2}\w+/, Name::Tag
-        
+
         rule %r/(\.)?([-\w]+)(\[)/ do |m|
           groups Operator, Name::Function, Punctuation
           push :bracket
@@ -209,14 +210,15 @@ module Rouge
 
         rule %r/([\/\\~\w][-.:\/\\~\w]*)(\n)?/ do |m|
           groups Name::Function, Text::Whitespace
-          push :parameters unless m[2]
+          push :parameters
         end
 
         rule %r/(\.)?([-\w]+)(?:(\()|(\n))?/ do |m|
           groups Operator, Name::Function, Punctuation, Text::Whitespace
-          push :parameters unless m[3]
+          push :parameters unless m[3].nil?
         end
 
+        rule %r/\?/, Name::Function, :parameters
         rule %r/[-+*\/%=!.&|]/, Operator
         rule %r/@\{/, Punctuation, :hasht
         rule %r/@\(/, Punctuation, :array

data/lib/rouge/lexers/rego.rb

@@ -9,36 +9,51 @@ module Rouge
             tag 'rego'
             filenames '*.rego'
 
+            def self.constants
+              @constants ||= Set.new %w(
+                true false null
+              )
+            end
+
+            def self.operators
+              @operators ||= Set.new %w(
+                as default else import not package some with
+              )
+            end
+
             state :basic do
               rule %r/\s+/, Text
               rule %r/#.*/, Comment::Single
-      
+
               rule %r/[\[\](){}|.,;!]/, Punctuation
-      
+
               rule %r/"[^"]*"/, Str::Double
-      
+
               rule %r/-?\d+\.\d+([eE][+-]?\d+)?/, Num::Float
               rule %r/-?\d+([eE][+-]?\d+)?/, Num
 
               rule %r/\\u[0-9a-fA-F]{4}/, Num::Hex
               rule %r/\\["\/bfnrt]/, Str::Escape
             end
-      
-            state :atoms do
-              rule %r/(true|false|null)/, Keyword::Constant
-              rule %r/[[:word:]]*/, Str::Symbol
-            end
-      
+
             state :operators do
               rule %r/(=|!=|>=|<=|>|<|\+|-|\*|%|\/|\||&|:=)/, Operator
-              rule %r/(default|not|package|import|as|with|else|some)/, Operator
               rule %r/[\/:?@^~]+/, Operator
             end
-      
+
             state :root do
               mixin :basic
               mixin :operators
-              mixin :atoms
+
+              rule %r/[[:word:]]+/ do |m|
+                if self.class.constants.include? m[0]
+                  token Keyword::Constant
+                elsif self.class.operators.include? m[0]
+                  token Operator::Word
+                else
+                  token Name
+                end
+              end
             end
         end
     end

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