rouge 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 105d563933ea57ff19cca03ab1fd98fc3b01ea3a
-  data.tar.gz: 72e6098b1419ff753ddb8bf748d6822d5fc5c1a5
+  metadata.gz: ddf4afdd370e299029a9ec6d47a7742cb94208a1
+  data.tar.gz: a5cb0844af8b6be69ec296679c9ae5d28ed59034
 SHA512:
-  metadata.gz: 6346ab18ab19b7758e3f37eec75ddeac72a11edacd4416783dbfaccb33e3aadda9841373db11436a9fe4fbdd457a8bb2f4575f79b2c546e596b9d9cc829612e3
-  data.tar.gz: 9df1ed34e20dfbb2733ebef31d80792547913afdff931c556e73ff731875968233f12e1c62e91cfbaa84d4653b684aeec5e9a4778ff16fb3c5279585b974a846
+  metadata.gz: 7fa77ad742055077ee715ec202ad8fd4d8929dbd8397d1c9d16b0ea0e8a84d6b118b13dbb255dfb643ab89c88d348f22d80d157b836d350555b2f4afe1989ba6
+  data.tar.gz: a5c77e2ab64220fcf42c8afc71185f5f03c8dee74dd6dc27fb54e5a88002806d3b63aeadb9db121507e0a8b539c1e36d4235ee4c82d9f4c0f4ae8262bc92233c

data/lib/rouge/demos/elm

@@ -0,0 +1,4 @@
+import Html exposing (text)
+
+main =
+  text "Hello, World!"

data/lib/rouge/demos/hack

@@ -0,0 +1,5 @@
+<?hh // strict
+
+async function foo(): Awaitable<string> {
+  return await (() ==> 'Hello, world')();
+}

data/lib/rouge/guessers/disambiguation.rb

@@ -83,6 +83,19 @@ module Rouge
 
         next Matlab if matches?(/^\s*?%/)
       end
+
+      disambiguate '*.php' do
+        # PHP always takes precedence over Hack
+        PHP
+      end
+
+      disambiguate '*.hh' do
+        next Cpp if matches?(/^\s*#include/)
+        next Hack if matches?(/^<\?hh/)
+        next Hack if matches?(/(\(|, ?)\$\$/)
+
+        Cpp
+      end
     end
   end
 end

data/lib/rouge/lexers/c.rb

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

data/lib/rouge/lexers/elm.rb

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    class Elm < RegexLexer
+      title "Elm"
+      desc "The Elm programming language (http://elm-lang.org/)"
+
+      tag 'elm'
+      filenames '*.elm'
+      mimetypes 'text/x-elm'
+
+      # Keywords are logically grouped by lines
+      keywords = %w(
+        module exposing port
+        import as
+        type alias
+        if then else
+        case of
+        let in
+      )
+
+      state :root do
+        # Whitespaces
+        rule /\s+/m, Text
+        # Single line comments
+        rule /--.*/, Comment::Single
+        # Multiline comments
+        rule /{-/, Comment::Multiline, :multiline_comment
+
+        # Keywords
+        rule /\b(#{keywords.join('|')})\b/, Keyword
+
+        # Variable or a function
+        rule /[a-z][\w]*/, Name
+        # Underscore is a name for a variable, when it won't be used later
+        rule /_/, Name
+        # Type
+        rule /[A-Z][\w]*/, Keyword::Type        
+
+        # Two symbol operators: -> :: // .. && || ++ |> <| << >> == /= <= >=
+        rule /(->|::|\/\/|\.\.|&&|\|\||\+\+|\|>|<\||>>|<<|==|\/=|<=|>=)/, Operator
+        # One symbol operators: + - / * % = < > ^ | !
+        rule /[+-\/*%=<>^\|!]/, Operator
+        # Lambda operator
+        rule /\\/, Operator
+        # Not standard Elm operators, but these symbols can be used for custom inflix operators. We need to highlight them as operators as well.
+        rule /[@\#$&~?]/, Operator
+
+        # Single, double quotes, and triple double quotes
+        rule /"""/, Str, :multiline_string
+        rule /'(\\.|.)'/, Str::Char        
+        rule /"/, Str, :double_quote
+
+        # Numbers
+        rule /0x[\da-f]+/i, Num::Hex
+        rule /\d+e[+-]?\d+/i, Num::Float
+        rule /\d+\.\d+(e[+-]?\d+)?/i, Num::Float
+        rule /\d+/, Num::Integer
+
+        # Punctuation: [ ] ( ) , ; ` { } :
+        rule /[\[\](),;`{}:]/, Punctuation
+      end
+
+      # Multiline and nested commenting
+      state :multiline_comment do
+        rule /-}/, Comment::Multiline, :pop!
+        rule /{-/, Comment::Multiline, :multiline_comment
+        rule /[^-{}]+/, Comment::Multiline
+        rule /[-{}]/, Comment::Multiline
+      end
+
+      # Double quotes
+      state :double_quote do
+        rule /[^\\"]+/, Str::Double
+        rule /\\"/, Str::Escape
+        rule /"/, Str::Double, :pop!
+      end
+
+      # Multiple line string with tripple double quotes, e.g. """ multi """
+      state :multiline_string do
+        rule /\s*"""/, Str, :pop!
+        rule /.*/, Str
+        rule /\s*/, Str
+      end
+
+    end
+  end
+end

data/lib/rouge/lexers/fsharp.rb

@@ -41,7 +41,7 @@ module Rouge
       end
 
       operator = %r([\[\];,{}_()!$%&*+./:<=>?@^|~#-]+)
-      id = /[a-z][\w']*/i
+      id = /([a-z][\w']*)|(``[^`\n\r\t]+``)/i
       upper_id = /[A-Z][\w']*/
 
       state :root do

data/lib/rouge/lexers/hack.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    load_lexer 'php.rb'
+
+    class Hack < PHP
+      title 'Hack'
+      desc 'The Hack programming language (hacklang.org)'
+      tag 'hack'
+      aliases 'hack', 'hh'
+      filenames '*.php', '*.hh'
+
+      def self.detect?(text)
+        return true if /<\?hh/ =~ text
+        return true if text.shebang?('hhvm')
+        return true if /async function [a-zA-Z]/ =~ text
+        return true if /\): Awaitable</ =~ text
+
+        return false
+      end
+
+      def self.keywords
+        @hh_keywords ||= super.merge Set.new %w(
+          type newtype enum
+          as super
+          async await Awaitable
+          vec dict keyset
+          void int string bool float double
+          arraykey num Stringish
+        )
+      end
+
+      prepend :template do
+        rule /<\?hh(\s*\/\/\s*(strict|decl|partial))?$/, Comment::Preproc, :php
+      end
+
+      prepend :php do
+        rule %r((/\*\s*)(HH_(?:IGNORE_ERROR|FIXME)\[\d+\])([^*]*)(\*/)) do
+          groups Comment::Preproc, Comment::Preproc, Comment::Multiline, Comment::Preproc
+        end
+
+        rule %r(// UNSAFE(?:_EXPR|_BLOCK)?), Comment::Preproc
+        rule %r(/\*\s*UNSAFE_EXPR\s*\*/), Comment::Preproc
+      end
+    end
+  end
+end

data/lib/rouge/lexers/haskell.rb

@@ -55,7 +55,6 @@ module Rouge
 
         rule /\bimport\b/, Keyword::Reserved, :import
         rule /\bmodule\b/, Keyword::Reserved, :module
-        rule /\berror\b/, Name::Exception
         rule /\b(?:#{reserved.join('|')})\b/, Keyword::Reserved
         # not sure why, but ^ doesn't work here
         # rule /^[_a-z][\w']*/, Name::Function

data/lib/rouge/lexers/kotlin.rb

@@ -31,7 +31,7 @@ module Rouge
         rule %r'^\s*\[.*?\]', Name::Attribute
         rule %r'[^\S\n]+', Text
         rule %r'\\\n', Text # line continuation
-        rule %r'//.*?\n', Comment::Single
+        rule %r'//.*?$', Comment::Single
         rule %r'/[*].*?[*]/'m, Comment::Multiline
         rule %r'\n', Text
         rule %r'::|!!|\?[:.]', Operator

data/lib/rouge/lexers/php.rb

@@ -77,6 +77,8 @@ module Rouge
 
       def self.detect?(text)
         return true if text.shebang?('php')
+        return false if /^<\?hh/ =~ text
+        return true if /^<\?php/ =~ text
       end
 
       state :root do
@@ -97,8 +99,8 @@ module Rouge
         # heredocs
         rule /<<<('?)(#{id})\1\n.*?\n\2;?\n/im, Str::Heredoc
         rule /\s+/, Text
-        rule /#.*?\n/, Comment::Single
-        rule %r(//.*?\n), Comment::Single
+        rule /#.*?$/, Comment::Single
+        rule %r(//.*?$), Comment::Single
         # empty comment, otherwise seen as the start of a docstring
         rule %r(/\*\*/), Comment::Multiline
         rule %r(/\*\*.*?\*/)m, Str::Doc

data/lib/rouge/lexers/powershell.rb

@@ -9,7 +9,7 @@ module Rouge
       desc 'powershell'
       tag 'powershell'
       aliases 'posh'
-      filenames '*.ps1', '*.psm1', '*.psd1'
+      filenames '*.ps1', '*.psm1', '*.psd1', '*.psrc', '*.pssc'
       mimetypes 'text/x-powershell'
 
       ATTRIBUTES = %w(

data/lib/rouge/lexers/python.rb

@@ -19,6 +19,7 @@ module Rouge
           assert break continue del elif else except exec
           finally for global if lambda pass print raise
           return try while yield as with from import yield
+          async await
         )
       end
 

data/lib/rouge/lexers/ruby.rb

@@ -9,7 +9,7 @@ module Rouge
       aliases 'rb'
       filenames '*.rb', '*.ruby', '*.rbw', '*.rake', '*.gemspec', '*.podspec',
                 'Rakefile', 'Guardfile', 'Gemfile', 'Capfile', 'Podfile',
-                'Vagrantfile', '*.ru', '*.prawn', 'Berksfile'
+                'Vagrantfile', '*.ru', '*.prawn', 'Berksfile', '*.arb'
 
       mimetypes 'text/x-ruby', 'application/x-ruby'
 

data/lib/rouge/lexers/rust.rb

@@ -18,8 +18,8 @@ module Rouge
         @keywords ||= %w(
           as assert break const 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 while
-          box
+          ref return self static struct true trait type unsafe use where
+          while box
         )
       end
 

data/lib/rouge/lexers/sass.rb

@@ -23,7 +23,7 @@ module Rouge
 
       state :content do
         # block comments
-        rule %r(//.*?\n) do
+        rule %r(//.*?$) do
           token Comment::Single
           pop!; starts_block :single_comment
         end
@@ -42,13 +42,13 @@ module Rouge
 
         rule /:/, Name::Attribute, :old_style_attr
 
-        rule(/(?=.+?:([^a-z]|$))/) { push :attribute }
+        rule(/(?=[^\[\n]+?:([^a-z]|$))/) { push :attribute }
 
         rule(//) { push :selector }
       end
 
       state :single_comment do
-        rule /.*?\n/, Comment::Single, :pop!
+        rule /.*?$/, Comment::Single, :pop!
       end
 
       state :multi_comment do

data/lib/rouge/lexers/scss.rb

@@ -13,14 +13,14 @@ module Rouge
 
       state :root do
         rule /\s+/, Text
-        rule %r(//.*?\n), Comment::Single
+        rule %r(//.*?$), Comment::Single
         rule %r(/[*].*?[*]/)m, Comment::Multiline
         rule /@import\b/, Keyword, :value
 
         mixin :content_common
 
         rule(/(?=[^;{}][;}])/) { push :attribute }
-        rule(/(?=[^;{}:]+:[^a-z])/) { push :attribute }
+        rule(/(?=[^;{}:\[]+:[^a-z])/) { push :attribute }
 
         rule(//) { push :selector }
       end

data/lib/rouge/lexers/shell.rb

@@ -24,13 +24,22 @@ module Rouge
 
       BUILTINS = %w(
         alias bg bind break builtin caller cd command compgen
-        complete declare dirs disown echo enable eval exec exit
-        export false fc fg getopts hash help history jobs kill let
-        local logout popd printf pushd pwd read readonly set shift
-        shopt source suspend test time times trap true type typeset
-        ulimit umask unalias unset wait
-
-        ls tar cat grep sudo
+        complete declare dirs disown enable eval exec exit
+        export false fc fg getopts hash help history jobs let
+        local logout mapfile popd pushd pwd read readonly set
+        shift shopt source suspend test time times trap true type
+        typeset ulimit umask unalias unset wait
+
+        cat tac nl od base32 base64 fmt pr fold head tail split csplit
+        wc sum cksum b2sum md5sum sha1sum sha224sum sha256sum sha384sum
+        sha512sum sort shuf uniq comm ptx tsort cut paste join tr expand
+        unexpand ls dir vdir dircolors cp dd install mv rm shred link ln
+        mkdir mkfifo mknod readlink rmdir unlink chown chgrp chmod touch
+        df du stat sync truncate echo printf yes expr tee basename dirname
+        pathchk mktemp realpath pwd stty printenv tty id logname whoami
+        groups users who date arch nproc uname hostname hostid uptime chcon
+        runcon chroot env nice nohup stdbuf timeout kill sleep factor numfmt
+        seq tar grep sudo awk sed gzip gunzip
       ).join('|')
 
       state :basic do

data/lib/rouge/lexers/swift.rb

@@ -66,7 +66,7 @@ module Rouge
         mixin :whitespace
         rule /\$(([1-9]\d*)?\d)/, Name::Variable
 
-        rule %r{[()\[\]{}:;,?]}, Punctuation
+        rule %r{[()\[\]{}:;,?\\]}, Punctuation
         rule %r([-/=+*%<>!&|^.~]+), Operator
         rule /@?"/, Str, :dq
         rule /'(\\.|.)'/, Str::Char
@@ -107,8 +107,13 @@ module Rouge
           groups Keyword, Text, Name::Variable
         end
 
-        rule /(?!\b(if|while|for|private|internal|unowned|switch|case)\b)\b#{id}(?=(\?|!)?\s*[(])/ do |m|
-          if m[0] =~ /^[[:upper:]]/
+        rule /(let|var)\b(\s*)([(])/ do
+          groups Keyword, Text, Punctuation
+          push :tuple
+        end
+
+        rule /(?!\b(if|while|for|private|internal|unowned|switch|case)\b)\b#{id}(?=(\?|!)?\s*[({])/ do |m|
+          if m[1] == '(' && m[0] =~ /^[[:upper:]]/
             token Keyword::Type
           else
             token Name::Function
@@ -135,6 +140,21 @@ module Rouge
             token Name
           end
         end
+
+        rule /(`)(#{id})(`)/ do
+          groups Punctuation, Name::Variable, Punctuation
+        end
+      end
+
+      state :tuple do
+        rule /(#{id})/, Name::Variable
+        rule /(`)(#{id})(`)/ do
+            groups Punctuation, Name::Variable, Punctuation
+        end
+        rule /,/, Punctuation
+        rule /[(]/, Punctuation, :push
+        rule /[)]/, Punctuation, :pop!
+        mixin :inline_whitespace
       end
 
       state :dq do

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "3.0.0"
+    "3.1.0"
   end
 end

data/rouge.gemspec

@@ -16,4 +16,8 @@ Gem::Specification.new do |s|
   s.executables = %w(rougify)
   s.licenses = ['MIT', 'BSD-2-Clause']
   s.required_ruby_version = '>= 2.0'
+  s.metadata = {
+    'source_code_uri' => 'https://github.com/jneen/rouge',
+    'changelog_uri' => 'https://github.com/jneen/rouge/blob/master/CHANGELOG.md'
+  }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -52,6 +52,7 @@ files:
 - lib/rouge/demos/dot
 - lib/rouge/demos/eiffel
 - lib/rouge/demos/elixir
+- lib/rouge/demos/elm
 - lib/rouge/demos/erb
 - lib/rouge/demos/erlang
 - lib/rouge/demos/factor
@@ -63,6 +64,7 @@ files:
 - lib/rouge/demos/gradle
 - lib/rouge/demos/graphql
 - lib/rouge/demos/groovy
+- lib/rouge/demos/hack
 - lib/rouge/demos/haml
 - lib/rouge/demos/handlebars
 - lib/rouge/demos/haskell
@@ -201,6 +203,7 @@ files:
 - lib/rouge/lexers/dot.rb
 - lib/rouge/lexers/eiffel.rb
 - lib/rouge/lexers/elixir.rb
+- lib/rouge/lexers/elm.rb
 - lib/rouge/lexers/erb.rb
 - lib/rouge/lexers/erlang.rb
 - lib/rouge/lexers/factor.rb
@@ -213,6 +216,7 @@ files:
 - lib/rouge/lexers/gradle.rb
 - lib/rouge/lexers/graphql.rb
 - lib/rouge/lexers/groovy.rb
+- lib/rouge/lexers/hack.rb
 - lib/rouge/lexers/haml.rb
 - lib/rouge/lexers/handlebars.rb
 - lib/rouge/lexers/haskell.rb
@@ -333,7 +337,9 @@ homepage: http://rouge.jneen.net/
 licenses:
 - MIT
 - BSD-2-Clause
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/jneen/rouge
+  changelog_uri: https://github.com/jneen/rouge/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: