rouge 3.19.0 → 3.20.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/powershell.rb

@@ -201,7 +201,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,12 +209,12 @@ 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/[-+*\/%=!.&|]/, Operator

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