rouge 4.6.0 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a7fb3b7ebd844675016c5515295713f72c36ded464d0a9bdb64e5929ab40f18
-  data.tar.gz: 19d434e8b8fa8ad3c12483ad03fe74b09ca46b76f7d2ba0b8867d7e0303bfc85
+  metadata.gz: e05371bcf7512316daaccf75a2f7c24da653b802892662c9956cbf7bcfe42f51
+  data.tar.gz: 6280b9bb9841c1bab6d563649a981c71ac996e248fe3d895bf0e38dbb4562ea0
 SHA512:
-  metadata.gz: fc2d202d4258acaffdaf0bee314049bf55876ee89384ef5e8d5625df1994f4789c893b2119721c1e3f71afed4040e3988774fa9e71ae8f7996fd90cff158ae22
-  data.tar.gz: f93bbd478d426253369e29b3b2a7b806bc68a6397e78dcf73061ca0c5295ee800691aee291cef9ff7caeca610b98292c1b18bc67f54b214660b36edbb187b565
+  metadata.gz: df0cb13e8befea6fa4d387753e245cc3ed9ace57471979cbf6869ddde69d6e2703ddc9dbfdff09da1b0e6c1b871abd9ec47325f2a5c034df5ad8cd0820dec39e
+  data.tar.gz: 32224ae94596fd50173264ab44a97d9928cc3b3f1fc2e3bb4fb1f40004e18637d8afd44cf3e482f028ac95157598f9b932238c3f593d4d3ac65ec4d4df486da7

data/lib/rouge/cli.rb

@@ -5,6 +5,7 @@
 # to use this module, require 'rouge/cli'.
 
 require 'rbconfig'
+require 'uri'
 
 module Rouge
   class FileReader
@@ -348,7 +349,7 @@ module Rouge
       end
 
     private_class_method def self.parse_cgi(str)
-        pairs = CGI.parse(str).map { |k, v| [k.to_sym, v.first] }
+        pairs = URI.decode_www_form(str).map { |k, v| [k.to_sym, v] }
         Hash[pairs]
       end
     end

data/lib/rouge/demos/gjs

@@ -0,0 +1,23 @@
+import { LinkTo } from '@ember/routing';
+import { local } from 'embroider-css-modules';
+
+import styles from './navigation-menu.css';
+
+const NavigationMenu = <template>
+  <nav aria-label={{@name}} data-test-nav={{@name}}>
+    <ul class={{styles.list}}>
+      {{#each @menuItems as |menuItem|}}
+        <li>
+          <LinkTo
+            class={{local styles "link"}}
+            data-test-link={{menuItem.label}}
+          >
+            {{menuItem.label}}
+          </LinkTo>
+        </li>
+      {{/each}}
+    </ul>
+  </nav>
+</template>;
+
+export default NavigationMenu;

data/lib/rouge/demos/gts

@@ -0,0 +1,36 @@
+import type { TOC } from '@ember/component/template-only';
+import { LinkTo } from '@ember/routing';
+import { local } from 'embroider-css-modules';
+
+import styles from './navigation-menu.css';
+
+type MenuItem = {
+  label: string;
+  route: string;
+};
+
+interface NavigationMenuSignature {
+  Args: {
+    menuItems: MenuItem[];
+    name?: string;
+  };
+}
+
+const NavigationMenu = <template>
+  <nav aria-label={{@name}} data-test-nav={{@name}}>
+    <ul class={{styles.list}}>
+      {{#each @menuItems as |menuItem|}}
+        <li>
+          <LinkTo
+            class={{local styles "link"}}
+            data-test-link={{menuItem.label}}
+          >
+            {{menuItem.label}}
+          </LinkTo>
+        </li>
+      {{/each}}
+    </ul>
+  </nav>
+</template> satisfies TOC<NavigationMenuSignature>;
+
+export default NavigationMenu;

data/lib/rouge/formatters/html_legacy.rb

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*- #
 # frozen_string_literal: true
 
-# stdlib
-require 'cgi'
-
 module Rouge
   module Formatters
     # Transforms a token stream into HTML output.

data/lib/rouge/lexer.rb

@@ -3,8 +3,8 @@
 
 # stdlib
 require 'strscan'
-require 'cgi'
 require 'set'
+require 'uri'
 
 module Rouge
   # @abstract
@@ -52,17 +52,19 @@ module Rouge
         name, opts = str ? str.split('?', 2) : [nil, '']
 
         # parse the options hash from a cgi-style string
-        opts = CGI.parse(opts || '').map do |k, vals|
-          val = case vals.size
+        cgi_opts = Hash.new { |hash, key| hash[key] = [] }
+        URI.decode_www_form(opts || '').each do |k, val|
+          cgi_opts[k] << val
+        end
+        cgi_opts.transform_values! do |vals|
+          case vals.size
           when 0 then true
           when 1 then vals[0]
           else vals
           end
-
-          [ k.to_s, val ]
         end
 
-        opts = default_options.merge(Hash[opts])
+        opts = default_options.merge(cgi_opts)
 
         lexer_class = case name
         when 'guess', nil

data/lib/rouge/lexers/cobol.rb

@@ -7,7 +7,7 @@ module Rouge
       title 'COBOL'
       desc 'COBOL (Common Business-Oriented Language) programming language'
       tag 'cobol'
-      filenames '*.cob', '*.cbl'
+      filenames '*.cob', '*.cbl', '*.cpy', '*.cpb'
       mimetypes 'text/x-cobol'
 
       identifier = /\p{Alpha}[\p{Alnum}-]*/

data/lib/rouge/lexers/css.rb

@@ -154,7 +154,7 @@ module Rouge
           s-resize sans-serif saturation scale-down screen scroll
           se-resize semi-condensed semi-expanded separate serif show
           sides silent size slow slower small-caps small-caption smaller
-          smooth soft soft-light solid space-aroun space-between
+          smooth soft soft-light solid space-around space-between
           space-evenly span spell-out square start static status-bar sticky
           stretch sub subtract super sw-resize swap symbolic table
           table-caption table-cell table-column table-column-group
@@ -259,6 +259,7 @@ module Rouge
       end
 
       state :at_rule do
+        rule %r/(?:<=|>=|~=|\|=|\^=|\$=|\*=|<|>|=)/, Operator
         rule %r/{(?=\s*#{identifier}\s*:)/m, Punctuation, :at_stanza
         rule %r/{/, Punctuation, :at_body
         rule %r/;/, Punctuation, :pop!

data/lib/rouge/lexers/gjs.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    load_lexer 'javascript.rb'
+
+    class Gjs < Javascript
+      title "Template Tag (gjs)"
+      desc "Ember.js, JavaScript with <template> tags"
+      tag "gjs"
+      filenames "*.gjs"
+      mimetypes "text/x-gjs", "application/x-gjs"
+
+      def initialize(*)
+        super
+        @handlebars = Handlebars.new(options)
+      end
+
+      prepend :root do
+        rule %r/(<)(template)(>)/ do
+          groups Name::Tag, Keyword, Name::Tag
+          push :template
+        end
+      end
+
+      state :template do
+        rule %r((</)(template)(>)) do
+          groups Name::Tag, Keyword, Name::Tag
+          pop!
+        end
+
+        rule %r/.+?(?=<\/template>)/m do
+          delegate @handlebars
+        end
+      end
+    end
+  end
+end

data/lib/rouge/lexers/go.rb

@@ -25,6 +25,7 @@ module Rouge
 
       LETTER                 = /#{UNICODE_LETTER}|_/
       DECIMAL_DIGIT          = /[0-9]/
+      BINARY_DIGIT           = /[01]/
       OCTAL_DIGIT            = /[0-7]/
       HEX_DIGIT              = /[0-9A-Fa-f]/
 
@@ -71,14 +72,15 @@ module Rouge
 
       # Integer literals
 
-      DECIMAL_LIT            = /[0-9]#{DECIMAL_DIGIT}*/
-      OCTAL_LIT              = /0#{OCTAL_DIGIT}*/
-      HEX_LIT                = /0[xX]#{HEX_DIGIT}+/
-      INT_LIT                = /#{HEX_LIT}|#{DECIMAL_LIT}|#{OCTAL_LIT}/
+      DECIMAL_LIT            = /#{DECIMAL_DIGIT}(?:_?#{DECIMAL_DIGIT})*/
+      BINARY_LIT             = /0[bB]_*#{BINARY_DIGIT}(?:_?#{BINARY_DIGIT})*/
+      OCTAL_LIT              = /0[oO]?_*#{OCTAL_DIGIT}(?:_?#{OCTAL_DIGIT})*/
+      HEX_LIT                = /0[xX]_*#{HEX_DIGIT}(?:_?#{HEX_DIGIT})*/
+      INT_LIT                = /#{BINARY_LIT}|#{HEX_LIT}|#{OCTAL_LIT}|#{DECIMAL_LIT}/
 
       # Floating-point literals
 
-      DECIMALS               = /#{DECIMAL_DIGIT}+/
+      DECIMALS               = /#{DECIMAL_DIGIT}(?:_?#{DECIMAL_DIGIT})*/
       EXPONENT               = /[eE][+\-]?#{DECIMALS}/
       FLOAT_LIT              = / #{DECIMALS} \. #{DECIMALS}? #{EXPONENT}?
                                | #{DECIMALS} #{EXPONENT}

data/lib/rouge/lexers/gts.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    load_lexer 'typescript.rb'
+
+    class Gts < Typescript
+      title "Template Tag (gts)"
+      desc "Ember.js, TypeScript with <template> tags"
+      tag "gts"
+      filenames "*.gts"
+      mimetypes "text/x-gts", "application/x-gts"
+
+      def initialize(*)
+        super
+        @handlebars = Handlebars.new(options)
+      end
+
+      prepend :root do
+        rule %r/(<)(template)(>)/ do
+          groups Name::Tag, Keyword, Name::Tag
+          push :template
+        end
+      end
+
+      state :template do
+        rule %r((</)(template)(>)) do
+          groups Name::Tag, Keyword, Name::Tag
+          pop!
+        end
+
+        rule %r/.+?(?=<\/template>)/m do
+          delegate @handlebars
+        end
+      end
+    end
+  end
+end

data/lib/rouge/lexers/ini.rb

@@ -14,8 +14,8 @@ module Rouge
       identifier = /[\w\-.]+/
 
       state :basic do
+        rule %r/\s+/, Text::Whitespace
         rule %r/[;#].*?\n/, Comment
-        rule %r/\s+/, Text
         rule %r/\\\n/, Str::Escape
       end
 
@@ -23,11 +23,14 @@ module Rouge
         mixin :basic
 
         rule %r/(#{identifier})(\s*)(=)/ do
-          groups Name::Property, Text, Punctuation
+          groups Name::Property, Text::Whitespace, Punctuation
           push :value
         end
 
         rule %r/\[.*?\]/, Name::Namespace
+
+        # standalone option, supported by some INI parsers
+        rule %r/(.+?)/, Name::Attribute
       end
 
       state :value do

data/lib/rouge/lexers/lua.rb

@@ -105,7 +105,26 @@ module Rouge
         rule %r/\)/, Punctuation, :pop!
         rule %r/[(,]/, Punctuation
         rule %r/\s+/, Text
-        rule %r/"/, Str::Regex, :regex
+        rule %r/'/, Str::Regex, :regex_sq
+        rule %r/"/, Str::Regex, :regex_dq
+      end
+
+      state :regex_sq do
+        rule %r(') do
+          token Str::Regex
+          goto :regex_end
+        end
+
+        mixin :regex
+      end
+
+      state :regex_dq do
+        rule %r(") do
+          token Str::Regex
+          goto :regex_end
+        end
+
+        mixin :regex
       end
 
       state :regex do
@@ -151,13 +170,15 @@ module Rouge
       end
 
       state :sqs do
+        rule %r(\\'), Str::Escape
         rule %r('), Str::Single, :pop!
-        rule %r([^']+), Str::Single
+        rule %r([^'\\]+), Str::Single
       end
 
       state :dqs do
+        rule %r(\\"), Str::Escape
         rule %r("), Str::Double, :pop!
-        rule %r([^"]+), Str::Double
+        rule %r([^"\\]+), Str::Double
       end
     end
   end