rouge 3.10.0 → 3.14.0

data/lib/rouge/lexers/scala.rb

@@ -43,7 +43,7 @@ module Rouge
         rule %r/'#{idrest}[^']/, Str::Symbol
         rule %r/[^\S\n]+/, Text
 
-        rule %r(//.*?\n), Comment::Single
+        rule %r(//.*), Comment::Single
         rule %r(/\*), Comment::Multiline, :comment
 
         rule %r/@#{idrest}/, Name::Decorator
@@ -117,7 +117,7 @@ module Rouge
         rule %r/\s+/, Text
         rule %r/{/, Operator, :pop!
         rule %r/\(/, Operator, :pop!
-        rule %r(//.*?\n), Comment::Single, :pop!
+        rule %r(//.*), Comment::Single, :pop!
         rule %r(#{idrest}|#{op}+|`[^`]+`), Name::Class, :pop!
       end
 
@@ -142,7 +142,7 @@ module Rouge
           pop!
         end
 
-        rule %r(//.*?\n), Comment::Single, :pop!
+        rule %r(//.*), Comment::Single, :pop!
         rule %r/\.|#{idrest}|#{op}+|`[^`]+`/, Keyword::Type
       end
 

data/lib/rouge/lexers/shell.rb

@@ -9,10 +9,12 @@ module Rouge
 
       tag 'shell'
       aliases 'bash', 'zsh', 'ksh', 'sh'
-      filenames '*.sh', '*.bash', '*.zsh', '*.ksh',
-                '.bashrc', '.zshrc', '.kshrc', '.profile', 'APKBUILD', 'PKGBUILD'
+      filenames '*.sh', '*.bash', '*.zsh', '*.ksh', '.bashrc', '.zshrc',
+                '.kshrc', '.profile', 'APKBUILD', 'PKGBUILD', '*.ebuild',
+                '*.eclass', '*.exheres-0', '*.exlib'
 
-      mimetypes 'application/x-sh', 'application/x-shellscript'
+      mimetypes 'application/x-sh', 'application/x-shellscript', 'text/x-sh',
+                'text/x-shellscript'
 
       def self.detect?(text)
         return true if text.shebang?(/(ba|z|k)?sh/)

data/lib/rouge/lexers/sieve.rb

@@ -58,7 +58,7 @@ module Rouge
 
       state :comments_and_whitespace do
         rule %r/\s+/, Text
-        rule %r(#.*?\n), Comment::Single
+        rule %r(#.*), Comment::Single
         rule %r(/(\\\n)?[*].*?[*](\\\n)?/)m, Comment::Multiline
       end
 

data/lib/rouge/lexers/slice.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    load_lexer 'c.rb'
+
+    class Slice < C
+      tag 'slice'
+      filenames '*.ice'
+      mimetypes 'text/slice'
+
+      title "Slice"
+      desc "Specification Language for Ice (doc.zeroc.com)"
+
+      def self.keywords
+        @keywords ||= Set.new %w(
+          extends implements enum interface struct class module dictionary
+          const optional out throws exception local idempotent sequence
+
+          Object LocalObject Value
+        )
+      end
+
+      def self.keywords_type
+        @keywords_type ||= Set.new %w(
+          bool string byte long float double int void short
+        )
+      end
+    end
+  end
+end

data/lib/rouge/lexers/sqf.rb

@@ -65,7 +65,7 @@ module Rouge
 
         # Preprocessor instructions
         rule %r"/\*.*?\*/"m, Comment::Multiline
-        rule %r"//.*\n", Comment::Single
+        rule %r"//.*", Comment::Single
         rule %r"#(define|undef|if(n)?def|else|endif|include)", Comment::Preproc
         rule %r"\\\r?\n", Comment::Preproc
         rule %r"__(EVAL|EXEC|LINE__|FILE__)", Name::Builtin

data/lib/rouge/lexers/swift.rb

@@ -80,7 +80,7 @@ module Rouge
         rule %r/0b[01]+(?:_[01]+)*/, Num::Bin
         rule %r{[\d]+(?:_\d+)*}, Num::Integer
 
-        rule %r/@#{id}(\([^)]+\))?/, Keyword::Declaration
+        rule %r/@#{id}/, Keyword::Declaration
 
         rule %r/(private|internal)(\([ ]*)(\w+)([ ]*\))/ do |m|
           if m[3] == 'set'

data/lib/rouge/lexers/toml.rb

@@ -17,6 +17,12 @@ module Rouge
         rule %r/\s+/, Text
         rule %r/#.*?$/, Comment
         rule %r/(true|false)/, Keyword::Constant
+
+        rule %r/(\S+)(\s*)(=)(\s*)(\{)/ do |m|
+          groups Name::Namespace, Text, Operator, Text, Punctuation
+          push :inline
+        end
+
         rule %r/(?<!=)\s*\[[\S]+\]/, Name::Namespace
 
         rule %r/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/, Literal::Date
@@ -33,7 +39,6 @@ module Rouge
           groups Name::Property, Text, Punctuation
           push :value
         end
-
       end
 
       state :value do
@@ -63,6 +68,16 @@ module Rouge
         mixin :content
         rule %r/\]/, Punctuation, :pop!
       end
+
+      state :inline do
+        mixin :content
+
+        rule %r/(#{identifier})(\s*)(=)/ do
+          groups Name::Property, Text, Punctuation
+        end
+
+        rule %r/\}/, Punctuation, :pop!
+      end
     end
   end
 end

data/lib/rouge/lexers/ttcn3.rb

@@ -0,0 +1,119 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class TTCN3 < RegexLexer
+      title "TTCN3"
+      desc "The TTCN3 programming language (ttcn-3.org)"
+
+      tag 'ttcn3'
+      filenames '*.ttcn', '*.ttcn3'
+      mimetypes 'text/x-ttcn3', 'text/x-ttcn'
+
+      def self.keywords
+        @keywords ||= %w(
+          module import group type port component signature external
+          execute const template function altstep testcase var timer if
+          else select case for while do label goto start stop return
+          break int2char int2unichar int2bit int2enum int2hex int2oct
+          int2str int2float float2int char2int char2oct unichar2int
+          unichar2oct bit2int bit2hex bit2oct bit2str hex2int hex2bit
+          hex2oct hex2str oct2int oct2bit oct2hex oct2str oct2char
+          oct2unichar str2int str2hex str2oct str2float enum2int
+          any2unistr lengthof sizeof ispresent ischosen isvalue isbound
+          istemplatekind regexp substr replace encvalue decvalue
+          encvalue_unichar decvalue_unichar encvalue_o decvalue_o
+          get_stringencoding remove_bom rnd hostid send receive
+          setverdict
+        )
+      end
+
+      def self.reserved
+        @reserved ||= %w(
+          all alt apply assert at configuration conjunct const control
+          delta deterministic disjunct duration fail finished fuzzy from
+          history implies inconc inv lazy mod mode notinv now omit
+          onentry onexit par pass prev realtime seq setstate static
+          stepsize stream timestamp until values wait
+        )
+      end
+
+      def self.types
+        @types ||= %w(
+          anytype address boolean bitstring charstring hexstring octetstring
+          component enumerated float integer port record set of union universal
+        )
+      end
+
+      # optional comment or whitespace
+      ws = %r((?:\s|//.*?\n|/[*].*?[*]/)+)
+      id = /[a-zA-Z_]\w*/
+      digit = /\d_+\d|\d/
+      bin_digit = /[01]_+[01]|[01]/
+      oct_digit = /[0-7]_+[0-7]|[0-7]/
+      hex_digit = /\h_+\h|\h/
+
+      state :statements do
+        rule %r/\n+/m, Text
+        rule %r/[ \t\r]+/, Text
+        rule %r/\\\n/, Text # line continuation
+
+        rule %r(//(\\.|.)*?$), Comment::Single
+        rule %r(/(\\\n)?[*].*?[*](\\\n)?/)m, Comment::Multiline
+
+        rule %r/"/, Str, :string
+        rule %r/'(?:\\.|[^\\]|\\u[0-9a-f]{4})'/, Str::Char
+        
+        rule %r/#{digit}+\.#{digit}+([eE]#{digit}+)?[fd]?/i, Num::Float
+        rule %r/'#{bin_digit}+'B/i, Num::Bin
+        rule %r/'#{hex_digit}+'H/i, Num::Hex
+        rule %r/'#{oct_digit}+'O/i, Num::Oct
+        rule %r/#{digit}+/i, Num::Integer
+
+        rule %r([~!%^&*+:=\|?<>/-]), Operator
+        rule %r/[()\[\]{},.;:]/, Punctuation
+
+        rule %r/(?:true|false|null)\b/, Name::Builtin
+
+        rule id do |m|
+          name = m[0]
+          if self.class.keywords.include? name
+            token Keyword
+          elsif self.class.types.include? name
+            token Keyword::Type
+          elsif self.class.reserved.include? name
+            token Keyword::Reserved
+          else
+            token Name
+          end
+        end
+      end
+
+      state :root do
+        rule %r/module\b/, Keyword::Declaration, :module
+        rule %r/import\b/, Keyword::Namespace, :import
+
+        mixin :statements
+      end
+
+      state :string do
+        rule %r/"/, Str, :pop!
+        rule %r/\\([\\abfnrtv"']|x[a-fA-F0-9]{2,4}|[0-7]{1,3})/, Str::Escape
+        rule %r/[^\\"\n]+/, Str
+        rule %r/\\\n/, Str
+        rule %r/\\/, Str # stray backslash
+      end
+
+      state :module do
+        rule %r/\s+/m, Text
+        rule id, Name::Class, :pop!
+      end
+
+      state :import do
+        rule %r/\s+/m, Text
+        rule %r/[\w.]+\*?/, Name::Namespace, :pop!
+      end
+    end
+  end
+end

data/lib/rouge/lexers/verilog.rb

@@ -100,7 +100,7 @@ module Rouge
 
       state :whitespace do
         rule %r/\n+/m, Text, :bol
-        rule %r(//(\\.|.)*?\n), Comment::Single, :bol
+        rule %r(//(\\.|.)*?$), Comment::Single, :bol
         mixin :inline_whitespace
       end
 

data/lib/rouge/plugins/redcarpet.rb

@@ -9,7 +9,13 @@ module Rouge
   module Plugins
     module Redcarpet
       def block_code(code, language)
-        lexer = Lexer.find_fancy(language, code) || Lexers::PlainText
+        lexer =
+          begin
+            Lexer.find_fancy(language, code)
+          rescue Guesser::Ambiguous => e
+            e.alternatives.first
+          end
+        lexer ||= Lexers::PlainText
 
         # XXX HACK: Redcarpet strips hard tabs out of code blocks,
         # so we assume you're not using leading spaces that aren't tabs,

data/lib/rouge/version.rb

@@ -3,6 +3,6 @@
 
 module Rouge
   def self.version
-    "3.10.0"
+    "3.14.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.14.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -27,6 +27,7 @@ files:
 - lib/rouge/demos/actionscript
 - lib/rouge/demos/ada
 - lib/rouge/demos/apache
+- lib/rouge/demos/apex
 - lib/rouge/demos/apiblueprint
 - lib/rouge/demos/applescript
 - lib/rouge/demos/armasm
@@ -53,6 +54,7 @@ files:
 - lib/rouge/demos/crystal
 - lib/rouge/demos/csharp
 - lib/rouge/demos/css
+- lib/rouge/demos/csvs
 - lib/rouge/demos/cuda
 - lib/rouge/demos/cython
 - lib/rouge/demos/d
@@ -122,11 +124,13 @@ files:
 - lib/rouge/demos/mason
 - lib/rouge/demos/mathematica
 - lib/rouge/demos/matlab
+- lib/rouge/demos/minizinc
 - lib/rouge/demos/moonscript
 - lib/rouge/demos/mosel
 - lib/rouge/demos/msgtrans
 - lib/rouge/demos/mxml
 - lib/rouge/demos/nasm
+- lib/rouge/demos/nesasm
 - lib/rouge/demos/nginx
 - lib/rouge/demos/nim
 - lib/rouge/demos/nix
@@ -153,6 +157,7 @@ files:
 - lib/rouge/demos/r
 - lib/rouge/demos/racket
 - lib/rouge/demos/reasonml
+- lib/rouge/demos/robot_framework
 - lib/rouge/demos/ruby
 - lib/rouge/demos/rust
 - lib/rouge/demos/sas
@@ -163,6 +168,7 @@ files:
 - lib/rouge/demos/sed
 - lib/rouge/demos/shell
 - lib/rouge/demos/sieve
+- lib/rouge/demos/slice
 - lib/rouge/demos/slim
 - lib/rouge/demos/smalltalk
 - lib/rouge/demos/smarty
@@ -178,6 +184,7 @@ files:
 - lib/rouge/demos/tex
 - lib/rouge/demos/toml
 - lib/rouge/demos/tsx
+- lib/rouge/demos/ttcn3
 - lib/rouge/demos/tulip
 - lib/rouge/demos/turtle
 - lib/rouge/demos/twig
@@ -219,6 +226,7 @@ files:
 - lib/rouge/lexers/ada.rb
 - lib/rouge/lexers/apache.rb
 - lib/rouge/lexers/apache/keywords.yml
+- lib/rouge/lexers/apex.rb
 - lib/rouge/lexers/apiblueprint.rb
 - lib/rouge/lexers/apple_script.rb
 - lib/rouge/lexers/armasm.rb
@@ -245,6 +253,7 @@ files:
 - lib/rouge/lexers/crystal.rb
 - lib/rouge/lexers/csharp.rb
 - lib/rouge/lexers/css.rb
+- lib/rouge/lexers/csvs.rb
 - lib/rouge/lexers/cuda.rb
 - lib/rouge/lexers/cython.rb
 - lib/rouge/lexers/d.rb
@@ -318,11 +327,13 @@ files:
 - lib/rouge/lexers/mathematica/builtins.rb
 - lib/rouge/lexers/matlab.rb
 - lib/rouge/lexers/matlab/builtins.yml
+- lib/rouge/lexers/minizinc.rb
 - lib/rouge/lexers/moonscript.rb
 - lib/rouge/lexers/mosel.rb
 - lib/rouge/lexers/msgtrans.rb
 - lib/rouge/lexers/mxml.rb
 - lib/rouge/lexers/nasm.rb
+- lib/rouge/lexers/nesasm.rb
 - lib/rouge/lexers/nginx.rb
 - lib/rouge/lexers/nim.rb
 - lib/rouge/lexers/nix.rb
@@ -351,6 +362,7 @@ files:
 - lib/rouge/lexers/r.rb
 - lib/rouge/lexers/racket.rb
 - lib/rouge/lexers/reasonml.rb
+- lib/rouge/lexers/robot_framework.rb
 - lib/rouge/lexers/ruby.rb
 - lib/rouge/lexers/rust.rb
 - lib/rouge/lexers/sas.rb
@@ -362,6 +374,7 @@ files:
 - lib/rouge/lexers/sed.rb
 - lib/rouge/lexers/shell.rb
 - lib/rouge/lexers/sieve.rb
+- lib/rouge/lexers/slice.rb
 - lib/rouge/lexers/slim.rb
 - lib/rouge/lexers/smalltalk.rb
 - lib/rouge/lexers/smarty.rb
@@ -378,6 +391,7 @@ files:
 - lib/rouge/lexers/tex.rb
 - lib/rouge/lexers/toml.rb
 - lib/rouge/lexers/tsx.rb
+- lib/rouge/lexers/ttcn3.rb
 - lib/rouge/lexers/tulip.rb
 - lib/rouge/lexers/turtle.rb
 - lib/rouge/lexers/twig.rb