rouge 4.6.0 → 4.7.0

data/lib/rouge/lexers/php.rb

@@ -100,6 +100,11 @@ module Rouge
       end
 
       state :names do
+        rule %r/(?:public|protected|private)\(set\)/i do
+          push :in_visibility
+          token Keyword
+        end
+
         rule %r/#{id_with_ns}(?=\s*\()/ do |m|
           name = m[0].downcase
           if self.class.keywords.include? name
@@ -179,7 +184,7 @@ module Rouge
 
         # numbers
         rule %r/(\d[_\d]*)?\.(\d[_\d]*)?(e[+-]?\d[_\d]*)?/i, Num::Float
-        rule %r/0[0-7][0-7_]*/, Num::Oct
+        rule %r/0o?[0-7][0-7_]*/i, Num::Oct
         rule %r/0b[01][01_]*/i, Num::Bin
         rule %r/0x[a-f0-9][a-f0-9_]*/i, Num::Hex
         rule %r/\d[_\d]*/, Num::Integer
@@ -243,6 +248,13 @@ module Rouge
           groups Keyword::Declaration, Text, Name::Class
         end
 
+        rule %r/(enum)
+                (\s+)
+                (#{id_with_ns})/ix do |m|
+          groups Keyword::Declaration, Text, Name::Class
+          push :in_enum
+        end
+
         mixin :names
 
         rule %r/[;,\(\)\{\}\[\]]/, Punctuation
@@ -280,6 +292,9 @@ module Rouge
       end
 
       state :in_const do
+        rule %r/(\??#{id})(\s+)(#{id})/i do
+          groups Keyword::Type, Text, Name::Constant
+        end
         rule id, Name::Constant
         rule %r/=/, Operator, :in_assign
         mixin :escape
@@ -307,7 +322,8 @@ module Rouge
         rule %r/,/, Punctuation
         rule %r/[.]{3}/, Punctuation
         rule %r/=/, Operator, :in_assign
-        rule %r/\b(?:public|protected|private|readonly)\b/i, Keyword
+        rule %r/\b(?:public|protected|private|readonly)(?:\(set\)|\b)/i, Keyword
+        rule %r/\breadonly\b/i, Keyword
         rule %r/\??#{id}/, Keyword::Type, :in_assign
         mixin :escape
         mixin :whitespace
@@ -369,6 +385,7 @@ module Rouge
       end
 
       state :in_visibility do
+        rule %r/\b(?:public|protected|private)(?:\(set\)|\b)/i, Keyword
         rule %r/\b(?:readonly|static)\b/i, Keyword
         rule %r/(?=(abstract|const|function)\b)/i, Keyword, :pop!
         rule %r/\??#{id}/, Keyword::Type, :pop!
@@ -376,6 +393,29 @@ module Rouge
         mixin :whitespace
         mixin :return
       end
+
+      state :in_enum do
+        rule %r/:/, Punctuation, :in_enum_base_type
+        rule %r/\{/, Punctuation, :in_enum_body
+        mixin :escape
+        mixin :whitespace
+        mixin :return
+      end
+
+      state :in_enum_base_type do
+        rule id, Keyword::Type, :pop!
+        mixin :escape
+        mixin :whitespace
+        mixin :return
+      end
+
+      state :in_enum_body do
+        rule %r/\}/, Punctuation, :pop!
+        rule %r/(case)(\s+)(#{id})/i do
+          groups Keyword, Text, Name::Constant
+        end
+        mixin :php
+      end
     end
   end
 end

data/lib/rouge/lexers/python.rb

@@ -124,7 +124,7 @@ module Rouge
 
         # TODO: not in python 3
         rule %r/`.*?`/, Str::Backtick
-        rule %r/([rfbu]{0,2})('''|"""|['"])/i do |m|
+        rule %r/([rtfbu]{0,2})('''|"""|['"])/i do |m|
           groups Str::Affix, Str::Heredoc
           current_string.register type: m[1].downcase, delim: m[2]
           push :generic_string

data/lib/rouge/lexers/robot_framework.rb

@@ -10,7 +10,7 @@ module Rouge
       title "Robot Framework"
       desc 'Robot Framework is a generic open source automation testing framework (robotframework.org)'
 
-      filenames '*.robot'
+      filenames '*.robot', '*.resource'
       mimetypes 'text/x-robot'
 
       def initialize(opts = {})

data/lib/rouge/lexers/ruby.rb

@@ -297,7 +297,7 @@ module Rouge
           (
             [\p{L}_]\p{Word}*[!?]? |
             \*\*? | [-+]@? | [/%&\|^`~] | \[\]=? |
-            <<? | >>? | <=>? | >= | ===?
+            <=>? | <<? | >>? | >= | ===?
           )
         )x do |m|
           puts "matches: #{[m[0], m[1], m[2], m[3]].inspect}" if @debug

data/lib/rouge/lexers/terraform.rb

@@ -11,7 +11,7 @@ module Rouge
 
       tag 'terraform'
       aliases 'tf'
-      filenames '*.tf', '*.tfvars'
+      filenames '*.tf', '*.tfvars', '*.tofu'
 
       def self.keywords
         @keywords ||= Set.new %w(

data/lib/rouge/lexers/toml.rb

@@ -11,63 +11,56 @@ module Rouge
       filenames '*.toml', 'Pipfile', 'poetry.lock'
       mimetypes 'text/x-toml'
 
-      # bare keys and quoted keys
-      identifier = %r/(?:\S+|"[^"]+"|'[^']+')/
-
-      state :basic do
-        rule %r/\s+/, Text
-        rule %r/#.*?$/, Comment
-        rule %r/(true|false)/, Keyword::Constant
-
-        rule %r/(#{identifier})(\s*)(=)(\s*)(\{)/ do
-          groups Name::Property, Text, Operator, Text, Punctuation
-          push :inline
-        end
-      end
-
       state :root do
-        mixin :basic
+        mixin :whitespace
 
-        rule %r/(?<!=)\s*\[.*?\]+/, Name::Namespace
+        mixin :key
 
-        rule %r/(#{identifier})(\s*)(=)/ do
-          groups Name::Property, Text, Punctuation
+        rule %r/(=)(\s*)/ do
+          groups Operator, Text::Whitespace
           push :value
         end
-      end
 
-      state :value do
-        rule %r/\n/, Text, :pop!
-        mixin :content
+        rule %r/\[\[?/, Keyword, :table_key
       end
 
-      state :content do
-        mixin :basic
-
-        rule %r/(#{identifier})(\s*)(=)/ do
-          groups Name::Property, Text, Punctuation
-        end
+      state :key do
+        rule %r/[A-Za-z0-9_-]+/, Name
 
-        rule %r/\d{4}-\d{2}-\d{2}(?:[Tt ]\d{2}:\d{2}:\d{2}(?:[Zz]|[+-]\d{2}:\d{2})?)?/, Literal::Date
-        rule %r/\d{2}:\d{2}:\d{2}/, Literal::Date
-
-        rule %r/[+-]?\d+(?:_\d+)*\.\d+(?:_\d+)*(?:[eE][+-]?\d+(?:_\d+)*)?/, Num::Float
-        rule %r/[+-]?\d+(?:_\d+)*[eE][+-]?\d+(?:_\d+)*/, Num::Float
-        rule %r/[+-]?(?:nan|inf)/, Num::Float
+        rule %r/"/, Str, :dq
+        rule %r/'/, Str, :sq
+        rule %r/\./, Punctuation
+      end
 
-        rule %r/0x\h+(?:_\h+)*/, Num::Hex
-        rule %r/0o[0-7]+(?:_[0-7]+)*/, Num::Oct
-        rule %r/0b[01]+(?:_[01]+)*/, Num::Bin
-        rule %r/[+-]?\d+(?:_\d+)*/, Num::Integer
+      state :table_key do
+        rule %r/[A-Za-z0-9_-]+/, Name
 
-        rule %r/"""/, Str, :mdq
         rule %r/"/, Str, :dq
-        rule %r/'''/, Str, :msq
         rule %r/'/, Str, :sq
-        mixin :esc_str
-        rule %r/\,/, Punctuation
-        rule %r/\[/, Punctuation, :array
-        rule %r/\{/, Punctuation, :inline
+        rule %r/\./, Keyword
+        rule %r/\]\]?/, Keyword, :pop!
+        rule %r/[ \t]+/, Text::Whitespace
+      end
+
+      state :value do
+        rule %r/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/, Literal::Date, :pop!
+        rule %r/\d\d:\d\d:\d\d(\.\d+)?/, Literal::Date, :pop!
+        rule %r/[+-]?\d+(?:_\d+)*\.\d+(?:_\d+)*(?:[eE][+-]?\d+(?:_\d+)*)?/, Num::Float, :pop!
+        rule %r/[+-]?\d+(?:_\d+)*[eE][+-]?\d+(?:_\d+)*/, Num::Float, :pop!
+        rule %r/[+-]?(?:nan|inf)/, Num::Float, :pop!
+        rule %r/0x\h+(?:_\h+)*/, Num::Hex, :pop!
+        rule %r/0o[0-7]+(?:_[0-7]+)*/, Num::Oct, :pop!
+        rule %r/0b[01]+(?:_[01]+)*/, Num::Bin, :pop!
+        rule %r/[+-]?\d+(?:_\d+)*/, Num::Integer, :pop!
+
+        rule %r/"""/, Str, [:pop!, :mdq]
+        rule %r/"/, Str, [:pop!, :dq]
+        rule %r/'''/, Str, [:pop!, :msq]
+        rule %r/'/, Str, [:pop!, :sq]
+
+        rule %r/(true|false)/, Keyword::Constant, :pop!
+        rule %r/\[/, Punctuation, [:pop!, :array]
+        rule %r/\{/, Punctuation, [:pop!, :inline]
       end
 
       state :dq do
@@ -101,15 +94,31 @@ module Rouge
       end
 
       state :array do
-        mixin :content
+        mixin :whitespace
+        rule %r/,/, Punctuation
+
         rule %r/\]/, Punctuation, :pop!
+
+        rule %r//, Token, :value
       end
 
       state :inline do
-        mixin :content
+        rule %r/[ \t]+/, Text::Whitespace
 
+        mixin :key
+        rule %r/(=)(\s*)/ do
+          groups Punctuation, Text::Whitespace
+          push :value
+        end
+
+        rule %r/,/, Punctuation
         rule %r/\}/, Punctuation, :pop!
       end
+
+      state :whitespace do
+        rule %r/\s+/, Text
+        rule %r/#.*?$/, Comment
+      end
     end
   end
 end

data/lib/rouge/version.rb

@@ -3,6 +3,6 @@
 
 module Rouge
   def self.version
-    "4.6.0"
+    "4.7.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.7.0
 platform: ruby
 authors:
 - Jeanine Adkisson
@@ -91,11 +91,13 @@ files:
 - lib/rouge/demos/ghc-cmm
 - lib/rouge/demos/ghc-core
 - lib/rouge/demos/gherkin
+- lib/rouge/demos/gjs
 - lib/rouge/demos/glsl
 - lib/rouge/demos/go
 - lib/rouge/demos/gradle
 - lib/rouge/demos/graphql
 - lib/rouge/demos/groovy
+- lib/rouge/demos/gts
 - lib/rouge/demos/hack
 - lib/rouge/demos/haml
 - lib/rouge/demos/handlebars
@@ -341,11 +343,13 @@ files:
 - lib/rouge/lexers/ghc_core.rb
 - lib/rouge/lexers/gherkin.rb
 - lib/rouge/lexers/gherkin/keywords.rb
+- lib/rouge/lexers/gjs.rb
 - lib/rouge/lexers/glsl.rb
 - lib/rouge/lexers/go.rb
 - lib/rouge/lexers/gradle.rb
 - lib/rouge/lexers/graphql.rb
 - lib/rouge/lexers/groovy.rb
+- lib/rouge/lexers/gts.rb
 - lib/rouge/lexers/hack.rb
 - lib/rouge/lexers/haml.rb
 - lib/rouge/lexers/handlebars.rb