rouge 3.1.1 → 3.2.0

data/lib/rouge/lexers/java.rb

@@ -20,7 +20,7 @@ module Rouge
         public static strictfp super synchronized throws transient volatile
       )
 
-      types = %w(boolean byte char double float int long short void)
+      types = %w(boolean byte char double float int long short var void)
 
       id = /[a-zA-Z_][a-zA-Z0-9_]*/
 

data/lib/rouge/lexers/javascript.rb

@@ -206,6 +206,7 @@ module Rouge
 
       state :dq do
         rule /[^\\"]+/, Str::Double
+        rule /\\n/, Str::Escape
         rule /\\"/, Str::Escape
         rule /"/, Str::Double, :pop!
       end

data/lib/rouge/lexers/julia.rb

@@ -15,26 +15,20 @@ module Rouge
       end
 
       BUILTINS            = /\b(?:
-                              applicable      | assert    | convert
-                            | dlopen          | dlsym     | edit
-                            | eps             | error     | exit
-                            | finalizer       | hash      | im
-                            | Inf             | invoke    | is
-                            | isa             | isequal   | load
-                            | method_exists   | Nan       | new
-                            | ntuple          | pi        | promote
-                            | promote_type    | realmax   | realmin
-                            | sizeof          | subtype   | system
-                            | throw           | tuple     | typemax
-                            | typemin         | typeof    | uid
-                            | whos
+                              true      | false    | missing | nothing
+                            | Inf       | Inf16    | Inf32   | Inf64
+                            | NaN       | NaN16    | NaN32   | NaN64
+                            | stdout    | stderr   | stdin   | devnull
+                            | pi        | π        | ℯ       | im
                             )\b/x
 
       KEYWORDS            = /\b(?:
                               function | return | module | import | export
                             | if       | else   | elseif | end    | for
-                            | in       | while  | try    | catch  | super
-                            | const
+                            | in       | isa    | while  | try    | catch
+                            | const    | local  | global | using  | struct
+                            | mutable struct    | abstract type   | finally
+                            | begin    | do     | quote  | macro  | for outer
                             )\b/x
 
       TYPES               = /\b(?:
@@ -43,14 +37,13 @@ module Rouge
                             | Int32       | UInt32         | Int64
                             | UInt64      | Int128         | UInt128
                             | Float16     | Float32        | Float64
-                            | Bool        | Inf            | Inf16
-                            | Inf32       | NaN            | NaN16
-                            | NaN32       | BigInt         | BigFloat
-                            | Char        | ASCIIString    | UTF8String
-                            | UTF16String | UTF32String    | AbstractString
-                            | WString     | String         | Regex
-                            | RegexMatch  | Complex64      | Complex128
-                            | Any         | Nothing        | None
+                            | Bool        | BigInt         | BigFloat
+                            | Complex     | ComplexF16     | ComplexF32
+                            | ComplexF64  | Missing        | Nothing
+                            | Char        | String         | SubString
+                            | Regex       | RegexMatch     | Any
+                            | Type        | DataType       | UnionAll
+                            | (Abstract)?(Array|Vector|Matrix|VecOrMat)
                             )\b/x
 
       OPERATORS           = / \+      | =        | -     | \*   | \/
@@ -63,10 +56,11 @@ module Rouge
                               | <=    | ≤        | >=    | ≥    | \.
                               | ::    | <:       | ->    | \?   | \.\*
                               | \.\^  | \.\\     | \.\/  | \\   | <
-                              | >
+                              | >     | ÷        | >:    | :    | ===
+                              | !==
                             /x
 
-      PUNCTUATION         = / [ \[ \] { } : \( \) , ; @ ] /x
+      PUNCTUATION         = / [ \[ \] { } \( \) , ; @ ] /x
 
 
       state :root do

data/lib/rouge/lexers/kotlin.rb

@@ -9,7 +9,7 @@ module Rouge
       desc "Kotlin Programming Language (http://kotlinlang.org)"
 
       tag 'kotlin'
-      filenames '*.kt'
+      filenames '*.kt', '*.kts'
       mimetypes 'text/x-kotlin'
 
       keywords = %w(

data/lib/rouge/lexers/markdown.rb

@@ -76,7 +76,7 @@ module Rouge
         end
 
         # links and images
-        rule /(!?\[)(#{edot}+?)(\])/ do
+        rule /(!?\[)(#{edot}*?)(\])/ do
           groups Punctuation, Name::Variable, Punctuation
           push :link
         end

data/lib/rouge/lexers/nix.rb

@@ -52,17 +52,22 @@ module Rouge
       end
 
       state :string do
-        rule /"/, Str::Double, :string_double_quoted
-        rule /''/, Str::Double, :string_indented
+        rule /"/, Str::Double, :double_quoted_string
+        rule /''/, Str::Double, :indented_string
       end
 
       state :string_content do
+        rule /\\./, Str::Escape
+        rule /\$\$/, Str::Escape
         rule /\${/, Str::Interpol, :string_interpolated_arg
-        mixin :escaped_sequence
       end
 
-      state :escaped_sequence do
-        rule /\\./, Str::Escape
+      state :indented_string_content do
+        rule /'''/, Str::Escape
+        rule /''\$/, Str::Escape
+        rule /\$\$/, Str::Escape
+        rule /''\\./, Str::Escape
+        rule /\${/, Str::Interpol, :string_interpolated_arg
       end
 
       state :string_interpolated_arg do
@@ -70,13 +75,13 @@ module Rouge
         rule /}/, Str::Interpol, :pop!
       end
 
-      state :string_indented do
-        mixin :string_content
+      state :indented_string do
+        mixin :indented_string_content
         rule /''/, Str::Double, :pop!
         rule /./, Str::Double
       end
 
-      state :string_double_quoted do
+      state :double_quoted_string do
         mixin :string_content
         rule /"/, Str::Double, :pop!
         rule /./, Str::Double

data/lib/rouge/lexers/objective_c.rb

@@ -8,7 +8,7 @@ module Rouge
       tag 'objective_c'
       title "Objective-C"
       desc 'an extension of C commonly used to write Apple software'
-      aliases 'objc'
+      aliases 'objc', 'obj-c', 'obj_c'
       filenames '*.m', '*.h'
 
       mimetypes 'text/x-objective_c', 'application/x-objective_c'

data/lib/rouge/lexers/perl.rb

@@ -9,7 +9,7 @@ module Rouge
       tag 'perl'
       aliases 'pl'
 
-      filenames '*.pl', '*.pm'
+      filenames '*.pl', '*.pm', '*.t'
       mimetypes 'text/x-perl', 'application/x-perl'
 
       def self.detect?(text)

data/lib/rouge/lexers/scheme.rb

@@ -85,8 +85,8 @@ module Rouge
           groups Str::Symbol, Text, Punctuation
         end
 
-        rule /\(/, Punctuation, :command
-        rule /\)/, Punctuation
+        rule /\(|\[/, Punctuation, :command
+        rule /\)|\]/, Punctuation
 
         rule id, Name::Variable
       end

data/lib/rouge/lexers/terraform.rb

@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    load_lexer 'hcl.rb'
+
+    class Terraform < Hcl
+      title "Terraform"
+      desc "Terraform HCL Interpolations"
+
+      tag 'terraform'
+      aliases 'tf'
+      filenames '*.tf'
+
+      def self.keywords
+        @keywords ||= Set.new %w(
+          terraform module provider variable resource data provisioner output
+        )
+      end
+
+      def self.declarations
+        @declarations ||= Set.new %w(
+          var local
+        )
+      end
+
+      def self.reserved
+        @reserved ||= Set.new %w()
+      end
+
+      def self.constants
+        @constants ||= Set.new %w(true false null)
+      end
+
+      def self.builtins
+        @builtins ||= %w()
+      end
+
+      state :strings do
+        rule /\\./, Str::Escape
+        rule /\$\{/ do
+          token Keyword
+          push :interpolation
+        end
+      end
+
+      state :dq do
+        rule /[^\\"\$]+/, Str::Double
+        mixin :strings
+        rule /"/, Str::Double, :pop!
+      end
+
+      state :sq do
+        rule /[^\\'\$]+/, Str::Single
+        mixin :strings
+        rule /'/, Str::Single, :pop!
+      end
+
+      state :heredoc do
+        rule /\n/, Str::Heredoc, :heredoc_nl
+        rule /[^$\n\$]+/, Str::Heredoc
+        rule /[$]/, Str::Heredoc
+        mixin :strings
+      end
+
+      state :interpolation do
+        rule /\}/ do
+          token Keyword
+          pop!
+        end
+
+        mixin :expression
+      end
+
+      id = /[$a-z_\-][a-z0-9_\-]*/io
+
+      state :expression do
+        mixin :primitives
+        rule /\s+/, Text
+
+        rule %r(\+\+ | -- | ~ | && | \|\| | \\(?=\n) | << | >>>? | == | != )x, Operator
+        rule %r([-<>+*%&|\^/!=?:]=?), Operator
+        rule /[(\[,]/, Punctuation
+        rule /[)\].]/, Punctuation
+
+        rule id do |m|
+          if self.class.keywords.include? m[0]
+            token Keyword
+          elsif self.class.declarations.include? m[0]
+            token Keyword::Declaration
+          elsif self.class.reserved.include? m[0]
+            token Keyword::Reserved
+          elsif self.class.constants.include? m[0]
+            token Keyword::Constant
+          elsif self.class.builtins.include? m[0]
+            token Name::Builtin
+          else
+            token Name::Other
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rouge/lexers/vhdl.rb

@@ -27,7 +27,7 @@ module Rouge
         @keywords_type ||= Set.new %w(
         bit bit_vector boolean boolean_vector character integer integer_vector natural positive
         real real_vector severity_level signed std_logic std_logic_vector std_ulogic
-        std_ulogic_vector string unsigned time time__vector
+        std_ulogic_vector string unsigned time time_vector
         )
       end
 

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "3.1.1"
+    "3.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -42,6 +42,7 @@ files:
 - lib/rouge/demos/console
 - lib/rouge/demos/coq
 - lib/rouge/demos/cpp
+- lib/rouge/demos/crystal
 - lib/rouge/demos/csharp
 - lib/rouge/demos/css
 - lib/rouge/demos/d
@@ -68,6 +69,7 @@ files:
 - lib/rouge/demos/haml
 - lib/rouge/demos/handlebars
 - lib/rouge/demos/haskell
+- lib/rouge/demos/hcl
 - lib/rouge/demos/html
 - lib/rouge/demos/http
 - lib/rouge/demos/hylang
@@ -139,6 +141,7 @@ files:
 - lib/rouge/demos/swift
 - lib/rouge/demos/tap
 - lib/rouge/demos/tcl
+- lib/rouge/demos/terraform
 - lib/rouge/demos/tex
 - lib/rouge/demos/toml
 - lib/rouge/demos/tsx
@@ -193,6 +196,7 @@ files:
 - lib/rouge/lexers/console.rb
 - lib/rouge/lexers/coq.rb
 - lib/rouge/lexers/cpp.rb
+- lib/rouge/lexers/crystal.rb
 - lib/rouge/lexers/csharp.rb
 - lib/rouge/lexers/css.rb
 - lib/rouge/lexers/d.rb
@@ -220,6 +224,7 @@ files:
 - lib/rouge/lexers/haml.rb
 - lib/rouge/lexers/handlebars.rb
 - lib/rouge/lexers/haskell.rb
+- lib/rouge/lexers/hcl.rb
 - lib/rouge/lexers/html.rb
 - lib/rouge/lexers/http.rb
 - lib/rouge/lexers/hylang.rb
@@ -295,6 +300,7 @@ files:
 - lib/rouge/lexers/swift.rb
 - lib/rouge/lexers/tap.rb
 - lib/rouge/lexers/tcl.rb
+- lib/rouge/lexers/terraform.rb
 - lib/rouge/lexers/tex.rb
 - lib/rouge/lexers/toml.rb
 - lib/rouge/lexers/tsx.rb
@@ -356,7 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rouge
-rubygems_version: 2.6.13
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A pure-ruby colorizer based on pygments