rouge 3.2.1 → 3.3.0

data/lib/rouge/lexers/digdag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 module Rouge
   module Lexers

data/lib/rouge/lexers/docker.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/dot.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/eiffel.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/elixir.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers
@@ -20,7 +21,7 @@ module Rouge
         rule /#.*$/, Comment::Single
         rule %r{\b(case|cond|end|bc|lc|if|unless|try|loop|receive|fn|defmodule|
              defp?|defprotocol|defimpl|defrecord|defmacrop?|defdelegate|
-             defexception|exit|raise|throw|after|rescue|catch|else)\b(?![?!])|
+             defexception|defguardp?|defstruct|exit|raise|throw|after|rescue|catch|else)\b(?![?!])|
              (?<!\.)\b(do|\-\>)\b}x, Keyword
         rule /\b(import|require|use|recur|quote|unquote|super|refer)\b(?![?!])/, Keyword::Namespace
         rule /(?<!\.)\b(and|not|or|when|xor|in)\b/, Operator::Word

data/lib/rouge/lexers/elm.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/erb.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/erlang.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/factor.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/fortran.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
 # vim: set ts=2 sw=2 et:
 
 # TODO: Implement format list support.

data/lib/rouge/lexers/fsharp.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers
@@ -6,7 +7,7 @@ module Rouge
       title "FSharp"
       desc 'F# (fsharp.net)'
       tag 'fsharp'
-      filenames '*.fs', '*.fsx'
+      filenames '*.fs', '*.fsi', '*.fsx'
       mimetypes 'application/fsharp-script', 'text/x-fsharp', 'text/x-fsi'
 
       def self.keywords

data/lib/rouge/lexers/gherkin.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/gherkin/keywords.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
 # automatically generated by `rake builtins:gherkin`
 module Rouge
   module Lexers

data/lib/rouge/lexers/glsl.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/go.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/gradle.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/graphql.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/groovy.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/hack.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/haml.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/handlebars.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/haskell.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/hcl.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/html.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/http.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/hylang.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/idlang.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
 # vim: set ts=2 sw=2 et:
 
 module Rouge

data/lib/rouge/lexers/igorpro.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/ini.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/io.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/irb.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/java.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/javascript.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/jinja.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/json.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/json_doc.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/jsonnet.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/jsp.rb

@@ -0,0 +1,120 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class JSP < TemplateLexer
+      desc 'JSP'
+      tag 'jsp'
+      filenames '*.jsp'
+      mimetypes 'text/x-jsp', 'application/x-jsp'   
+
+      def initialize(*)
+        super
+        @java = Java.new
+      end
+
+      directives = %w(page include taglib)
+      actions = %w(scriptlet declaration expression)
+     
+      state :root do
+
+        rule /<%--/, Comment, :jsp_comment
+
+        rule /<%@\s*(#{directives.join('|')})\s*/, Name::Tag, :jsp_directive
+
+        rule /<jsp:directive\.(#{directives.join('|')})/, Name::Tag, :jsp_directive2
+
+        rule /<jsp:(#{actions.join('|')})>/, Name::Tag, :jsp_expression
+
+        # start of tag, e.g. <c:if>
+        rule /<[a-zA-Z]*:[a-zA-Z]*\s*/, Name::Tag, :jsp_tag
+
+        # end of tag, e.g. </c:if>
+        rule /<\/[a-zA-Z]*:[a-zA-Z]*>/, Name::Tag
+
+        rule /<%[!=]?/, Name::Tag, :jsp_expression2
+
+        # fallback to HTML
+        rule(/(.+?)(?=(<%|<\/?[a-zA-Z]*:))/m) { delegate parent }
+        rule(/.+/m) { delegate parent }
+      end
+
+      state :jsp_comment do
+        rule /(--%>)/, Comment, :pop!
+        rule /./m, Comment
+      end
+
+      state :jsp_directive do
+        rule /(%>)/, Name::Tag, :pop!
+        mixin :attributes
+        rule(/(.+?)(?=%>)/m) { delegate parent }
+      end
+
+      state :jsp_directive2 do
+        rule /(\/>)/, Name::Tag, :pop!
+        mixin :attributes
+        rule(/(.+?)(?=\/>)/m) { delegate parent }
+      end
+
+      state :jsp_expression do
+        rule /<\/jsp:(#{actions.join('|')})>/, Name::Tag, :pop!
+        mixin :attributes
+        rule(/[^<\/]+/) { delegate @java }
+      end
+
+      state :jsp_expression2 do
+        rule /%>/, Name::Tag, :pop!
+        rule(/[^%>]+/) { delegate @java }
+      end
+
+      state :jsp_tag do
+        rule /\/?>/, Name::Tag, :pop!
+        mixin :attributes
+        rule(/(.+?)(?=\/?>)/m) { delegate parent }
+      end
+
+      state :attributes do
+        rule /\s*[a-zA-Z0-9_:-]+\s*=\s*/m, Name::Attribute, :attr
+      end
+
+      state :attr do
+        rule /"/ do
+          token Str
+          goto :double_quotes
+        end
+
+        rule /'/ do
+          token Str
+          goto :single_quotes
+        end
+
+        rule /[^\s>]+/, Str, :pop!
+      end
+
+      state :double_quotes do
+        rule /"/, Str, :pop!
+        rule /\$\{/, Str::Interpol, :jsp_interp
+        rule /[^"]+/, Str
+      end
+
+      state :single_quotes do
+        rule /'/, Str, :pop!
+        rule /\$\{/, Str::Interpol, :jsp_interp
+        rule /[^']+/, Str
+      end
+
+      state :jsp_interp do
+        rule /\}/, Str::Interpol, :pop!
+        rule /'/, Literal, :jsp_interp_literal_start 
+        rule(/[^'\}]+/) { delegate @java }
+      end
+
+      state :jsp_interp_literal_start do
+        rule /'/, Literal, :pop!
+        rule /[^']*/, Literal
+      end
+
+    end
+  end
+end

data/lib/rouge/lexers/jsx.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rouge
   module Lexers
     load_lexer 'javascript.rb'

data/lib/rouge/lexers/julia.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers

data/lib/rouge/lexers/kotlin.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*- #
+# frozen_string_literal: true
 
 module Rouge
   module Lexers
@@ -24,25 +25,18 @@ module Rouge
       )
 
       name = %r'@?[_\p{Lu}\p{Ll}\p{Lt}\p{Lm}\p{Nl}][\p{Lu}\p{Ll}\p{Lt}\p{Lm}\p{Nl}\p{Nd}\p{Pc}\p{Cf}\p{Mn}\p{Mc}]*'
+      name_backtick = %r'#{name}|`#{name}`'
 
-      id = %r'(#{name}|`#{name}`)'
+      id = %r'(#{name_backtick})'
 
       state :root do
-        rule %r'^\s*\[.*?\]', Name::Attribute
-        rule %r'[^\S\n]+', Text
-        rule %r'\\\n', Text # line continuation
-        rule %r'//.*?$', Comment::Single
-        rule %r'/[*].*?[*]/'m, Comment::Multiline
-        rule %r'\n', Text
-        rule %r'::|!!|\?[:.]', Operator
-        rule %r"(\.\.)", Operator
-        rule %r'[~!%^&*()+=|\[\]:;,.<>/?-]', Punctuation
-        rule %r'[{}]', Punctuation
-        rule %r'@"(""|[^"])*"'m, Str
-        rule %r'""".*?"""'m, Str
-        rule %r'"(\\\\|\\"|[^"\n])*["\n]'m, Str
-        rule %r"'\\.'|'[^\\]'", Str::Char
-        rule %r"[0-9](\.[0-9]+)?([eE][+-][0-9]+)?[flFL]?|0[xX][0-9a-fA-F]+[Ll]?", Num
+        rule %r'(\))(\s*)(:)(\s+)(#{name_backtick})(<)' do
+          groups Punctuation, Text, Punctuation, Text, Name::Class, Punctuation
+          push :generic_parameters
+        end
+        rule %r'(\))(\s*)(:)(\s+)(#{name_backtick})' do
+          groups Punctuation, Text, Punctuation, Text, Name::Class
+        end
         rule %r'\b(companion)(\s+)(object)\b' do
           groups Keyword, Text, Keyword
         end
@@ -50,16 +44,47 @@ module Rouge
           groups Keyword::Declaration, Text
           push :class
         end
+        rule %r'\b(fun)(\s+)' do
+          groups Keyword, Text
+          push :function
+        end
+        rule %r'(#{name_backtick})(:)(\s+)(#{name_backtick})(<)' do
+          groups Name::Variable, Punctuation, Text, Name::Class, Punctuation
+          push :generic_parameters
+        end
+        rule %r'(#{name_backtick})(:)(\s+)(#{name_backtick})' do
+          groups Name::Variable, Punctuation, Text, Name::Class
+        end
         rule %r'\b(package|import)(\s+)' do
           groups Keyword, Text
           push :package
         end
+        rule %r'\b(val|var)(\s+)(\()' do
+          groups Keyword::Declaration, Text, Punctuation
+          push :destructure
+        end
         rule %r'\b(val|var)(\s+)' do
           groups Keyword::Declaration, Text
           push :property
         end
         rule %r/\bfun\b/, Keyword
         rule /\b(?:#{keywords.join('|')})\b/, Keyword
+        rule %r'^\s*\[.*?\]', Name::Attribute
+        rule %r'[^\S\n]+', Text
+        rule %r'\\\n', Text # line continuation
+        rule %r'//.*?$', Comment::Single
+        rule %r'/[*].*?[*]/'m, Comment::Multiline
+        rule %r'\n', Text
+        rule %r'::|!!|\?[:.]', Operator
+        rule %r"(\.\.)", Operator
+        rule %r'[~!%^&*()+=|\[\]:;,.<>/?-]', Punctuation
+        rule %r'[{}]', Punctuation
+        rule %r'@"(""|[^"])*"'m, Str
+        rule %r'""".*?"""'m, Str
+        rule %r'"(\\\\|\\"|[^"\n])*["\n]'m, Str
+        rule %r"'\\.'|'[^\\]'", Str::Char
+        rule %r"[0-9](\.[0-9]+)?([eE][+-][0-9]+)?[flFL]?|0[xX][0-9a-fA-F]+[Ll]?", Num
+        rule /@#{id}/, Name::Decorator
         rule id, Name
       end
 
@@ -71,9 +96,32 @@ module Rouge
         rule id, Name::Class, :pop!
       end
 
+      state :function do
+        rule %r'(<)', Punctuation, :generic_parameters
+        rule %r'(\s+)', Text
+        rule %r'(#{name_backtick})(\.)' do
+          groups Name::Class, Punctuation
+        end
+        rule id, Name::Function, :pop!
+      end
+
+      state :generic_parameters do
+        rule id, Name::Class
+        rule %r'(,)', Punctuation
+        rule %r'(\s+)', Text
+        rule %r'(>)', Punctuation, :pop!
+      end
+
       state :property do
         rule id, Name::Property, :pop!
       end
+
+      state :destructure do
+        rule %r'(,)', Punctuation
+        rule %r'(\))', Punctuation, :pop!
+        rule %r'(\s+)', Text
+        rule id, Name::Property
+      end
     end
   end
 end