rouge 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 239a3d42bfd3954d0e6f97efe4265a99cfa719bc2d0815a3fbfa1d47cb58fa66
-  data.tar.gz: 54cccb6161415559baa8a6d8003f9bf9c9c3eb8f241b4c21234c96f1b3d9a148
+  metadata.gz: a3281f8cbea5fa288016ada176d8fd748d2426af2f6a02a49c4f519ae4a385c9
+  data.tar.gz: a0e5aae51677fa27c6c448d3d617b0f4748934ad267dc0be49b705e2fc89f93b
 SHA512:
-  metadata.gz: 1463511e91aee04d120e090808e232ac5d07435971b3072716046bcc6d43bf5f86c3ef9c1f11b2cfdefded88259951d299f6b476437744ac0861e3dc0516b55f
-  data.tar.gz: a4aba9526815bf9d28a6ae7e0d02e3df29b250fa76b53d1c7bca0500cdcc8bd641198db02448e495bea510ac9b3bc1b42fb09ddc3e76dc1d501594074e7602fd
+  metadata.gz: 3fe33d5d2a60be45a82839227de784d92440a99c77e700d55cba412f1d8a2cb5b516013bd92f7db62f88a25fa6aee8bdd65415cd9c2203c1e4a1538549d7a1a7
+  data.tar.gz: 1b4598ed31db53da50a79e5aeaff8eca539c91dd7102b07a7e1106c4bd050071e689fb21a4d435b2e8d465cb91ae8a9275a91d777509961a6c95739e1ecc8d76

data/lib/rouge/demos/codeowners

@@ -0,0 +1,6 @@
+# Specify a default Code Owner by using a wildcard:
+* @default-codeowner
+
+/docs/ @all-docs
+
+[Development] @dev-team

data/lib/rouge/demos/svelte

@@ -0,0 +1,29 @@
+<!-- This file is made up from several examples on https://svelte.dev/examples and is not expected to function. -->
+<script lang="ts">
+    import Image from './Image.svelte';
+
+    let src: string = '/tutorial/image.gif';
+    let count: number = 1;
+    $: doubled = count * 2;  // the `$:` is special in svelte
+</script>
+
+<Image {src} bind:alt="{name.capitalize()} dancing" user={name.toUpperCase(false, 42, {key: 'value'})}
+       tooltip="I'm helping" false text=asdf on:message={handleMessage} />
+
+{#await loadSrc(src)}
+    loading...
+{:then data}
+    {#each cats as { name }, i}
+        <li>{name}</li>
+    {/each}
+
+    <!-- Keyed Each Block -->
+    {#each cats as cat (cat.id)}
+        <li>{cat.name}</li>
+    {/each}
+{:catch err}
+    {@debug err}
+    {#await solveErr(err, {x: 'asdf'}) then reason}{@html reason}{/await}
+{/await}
+
+<style>p {font-family: 'Comic Sans MS', cursive;}</style>

data/lib/rouge/lexers/bpf.rb

@@ -9,11 +9,11 @@ module Rouge
       tag 'bpf'
 
       TYPE_KEYWORDS = %w(
-        u8 u16 u32 u64 ll
+        u8 u16 u32 u64 s8 s16 s32 s64 ll
       ).join('|')
 
       MISC_KEYWORDS = %w(
-        be16 be32 be64 exit lock map
+        be16 be32 be64 le16 le32 le64 bswap16 bswap32 bswap64 exit lock map
       ).join('|')
 
       state :root do
@@ -32,21 +32,21 @@ module Rouge
         rule %r/(call)(\s+)(\d+)/i do
           groups Keyword, Text::Whitespace, Literal::Number::Integer
         end
-        rule %r/(call)(\s+)(\w+)(#)(\d+)/i do
+        rule %r/(call)(\s+)(\w+)(?:(#)(\d+))?/i do
           groups Keyword, Text::Whitespace, Name::Builtin, Punctuation, Literal::Number::Integer
         end
 
         # Unconditional jumps
-        rule %r/(goto)(\s*)(\+\d+)?(\s*)(<?\w+>?)/i do
-          groups Keyword, Text::Whitespace, Literal::Number::Integer, Text::Whitespace, Name::Label
+        rule %r/(gotol?)(\s*)([-+]0x\w+)?([-+]\d+)?(\s*)(<?\w+>?)/i do
+          groups Keyword, Text::Whitespace, Literal::Number::Hex, Literal::Number::Integer, Text::Whitespace, Name::Label
         end
 
         # Conditional jumps
-        rule %r/(if)(\s+)([rw]\d+)(\s*)([s!=<>]+)(\s*)(0x\h+|[-]?\d+)(\s*)(goto)(\s*)(\+\d+)?(\s*)(<?\w+>?)/i do
-          groups Keyword, Text::Whitespace, Name, Text::Whitespace, Operator, Text::Whitespace, Literal::Number, Text::Whitespace, Keyword, Text::Whitespace, Literal::Number::Integer, Text::Whitespace, Name::Label
+        rule %r/(if)(\s+)([rw]\d+)(\s*)([s!=<>]+)(\s*)(0x\h+|[-]?\d+)(\s*)(gotol?)(\s*)([-+]0x\w+)?([-+]\d+)?(\s*)(<?\w+>?)/i do
+          groups Keyword, Text::Whitespace, Name, Text::Whitespace, Operator, Text::Whitespace, Literal::Number, Text::Whitespace, Keyword, Text::Whitespace, Literal::Number::Hex, Literal::Number::Integer, Text::Whitespace, Name::Label
         end
-        rule %r/(if)(\s+)([rw]\d+)(\s*)([s!=<>]+)(\s*)([rw]\d+)(\s*)(goto)(\s*)(\+\d+)?(\s*)(<?\w+>?)/i do
-          groups Keyword, Text::Whitespace, Name, Text::Whitespace, Operator, Text::Whitespace, Name, Text::Whitespace, Keyword, Text::Whitespace, Literal::Number::Integer, Text::Whitespace, Name::Label
+        rule %r/(if)(\s+)([rw]\d+)(\s*)([s!=<>]+)(\s*)([rw]\d+)(\s*)(gotol?)(\s*)([-+]0x\w+)?([-+]\d+)?(\s*)(<?\w+>?)/i do
+          groups Keyword, Text::Whitespace, Name, Text::Whitespace, Operator, Text::Whitespace, Name, Text::Whitespace, Keyword, Text::Whitespace, Literal::Number::Hex, Literal::Number::Integer, Text::Whitespace, Name::Label
         end
 
         # Dereferences
@@ -70,7 +70,7 @@ module Rouge
         rule %r/#{MISC_KEYWORDS}/i, Keyword
 
         # Literals and global objects (maps) refered by name
-        rule %r/(0x\h+|[-]?\d+)(\s*)(ll)?/i do
+        rule %r/([-]?0x\h+|[-]?\d+)(\s*)(ll)?/i do
           groups Literal::Number, Text::Whitespace, Keyword::Type
         end
         rule %r/(\w+)(\s*)(ll)/i do

data/lib/rouge/lexers/codeowners.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class Codeowners < RegexLexer
+      title 'CODEOWNERS'
+      desc 'Code Owners syntax (https://docs.gitlab.com/ee/user/project/codeowners/reference.html)'
+      tag 'codeowners'
+      filenames 'CODEOWNERS'
+
+      state :root do
+        rule %r/[ \t\r\n]+/, Text::Whitespace
+        rule %r/^\s*#.*$/, Comment::Single
+
+        rule %r(
+          (\^?\[(?!\d+\])[^\]]+\])
+          (\[\d+\])?
+        )x do
+          groups Name::Namespace, Literal::Number
+        end
+
+        rule %r/\S*@\S+/, Name::Function
+
+        rule %r/[\p{Word}\.\/\-\*]+/, Name
+        rule %r/.*\\[\#\s]/, Name
+      end
+    end
+  end
+end

data/lib/rouge/lexers/dart.rb

@@ -18,7 +18,7 @@ module Rouge
 
       declarations = %w(
         abstract base async dynamic const covariant external extends factory final get implements
-        inline interface late native on operator required sealed set static sync typedef var
+        interface late native on operator required sealed set static sync typedef var
       )
 
       types = %w(bool Comparable double Dynamic enum Function int List Map Never Null num Object Pattern Record Set String Symbol Type Uri void)

data/lib/rouge/lexers/elixir.rb

@@ -14,6 +14,10 @@ module Rouge
 
       filenames '*.ex', '*.exs'
 
+      def self.detect?(text)
+        return true if text.shebang?('elixir')
+      end
+
       mimetypes 'text/x-elixir', 'application/x-elixir'
 
       state :root do

data/lib/rouge/lexers/groovy.rb

@@ -23,7 +23,7 @@ module Rouge
 
       def self.declarations
         @declarations ||= Set.new %w(
-          abstract const enum extends final implements native private
+          abstract const extends final implements native private
           protected public static strictfp super synchronized throws
           transient volatile
         )
@@ -31,7 +31,7 @@ module Rouge
 
       def self.types
         @types ||= Set.new %w(
-          def boolean byte char double float int long short void
+          def var boolean byte char double float int long short void
         )
       end
 
@@ -56,7 +56,7 @@ module Rouge
         rule %r(//.*?$), Comment::Single
         rule %r(/[*].*?[*]/)m, Comment::Multiline
         rule %r/@\w[\w.]*/, Name::Decorator
-        rule %r/(class|interface|trait)\b/,  Keyword::Declaration, :class
+        rule %r/(class|interface|trait|enum|record)\b/,  Keyword::Declaration, :class
         rule %r/package\b/, Keyword::Namespace, :import
         rule %r/import\b/, Keyword::Namespace, :import
 

data/lib/rouge/lexers/hcl.rb

@@ -56,7 +56,7 @@ module Rouge
         @builtins ||= %w()
       end
 
-      id = /[$a-z_][a-z0-9_]*/io
+      id = /[$a-z_\-][a-z0-9_\-]*/io
 
       state :root do
         mixin :comments_and_whitespace
@@ -114,6 +114,7 @@ module Rouge
       state :hash do
         mixin :comments_and_whitespace
 
+        rule %r/[.,()\\\/*]/, Punctuation
         rule %r/\=/, Punctuation
         rule %r/\}/, Punctuation, :pop!
 
@@ -123,7 +124,7 @@ module Rouge
       state :array do
         mixin :comments_and_whitespace
 
-        rule %r/,/, Punctuation
+        rule %r/[.,()\\\/*]/, Punctuation
         rule %r/\]/, Punctuation, :pop!
 
         mixin :root

data/lib/rouge/lexers/irb.rb

@@ -23,7 +23,13 @@ module Rouge
       end
 
       def prompt_regex
-        /^.*?(irb|pry).*?[>"*]/
+        %r(
+          ^.*?
+          (
+            (irb|pry).*?[>"*] |
+            [>"*]>
+          )
+        )x
       end
 
       def allow_comments?

data/lib/rouge/lexers/python.rb

@@ -8,8 +8,8 @@ module Rouge
       desc "The Python programming language (python.org)"
       tag 'python'
       aliases 'py'
-      filenames '*.py', '*.pyw', '*.sc', 'SConstruct', 'SConscript', '*.tac',
-                '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE'
+      filenames '*.py', '*.pyi', '*.pyw', '*.sc', 'SConstruct', 'SConscript',
+                '*.tac', '*.bzl', 'BUCK', 'BUILD', 'BUILD.bazel', 'WORKSPACE'
       mimetypes 'text/x-python', 'application/x-python'
 
       def self.detect?(text)
@@ -90,8 +90,6 @@ module Rouge
 
         rule %r/@#{dotted_identifier}/i, Name::Decorator
 
-        rule %r/(>>>|\.\.\.)\B/, Generic::Prompt
-
         rule %r/(in|is|and|or|not)\b/, Operator::Word
         rule %r/(<<|>>|\/\/|\*\*)=?/, Operator
         rule %r/[-~+\/*%=<>&^|@]=?|!=/, Operator
@@ -182,7 +180,7 @@ module Rouge
       end
 
       state :generic_string do
-        rule %r/>>>|\.\.\./, Generic::Prompt, :doctest
+        rule %r/^\s*(>>>|\.\.\.)\B/, Generic::Prompt, :doctest
         rule %r/[^'"\\{]+?/, Str
         rule %r/{{/, Str
 

data/lib/rouge/lexers/svelte.rb

@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    load_lexer 'html.rb'
+
+    class Svelte < HTML
+      desc 'Svelte single-file components (https://svelte.dev/)'
+      tag 'svelte'
+      filenames '*.svelte'
+      mimetypes 'text/x-svelte', 'application/x-svelte'
+
+      def initialize(*)
+        super
+        # todo add support for typescript script blocks
+        @js = Javascript.new(options)
+      end
+
+      # Shorthand syntax for passing attributes - ex, `{src}` instead of `src={src}`
+      prepend :tag do
+        rule %r/(\{)\s*([a-zA-Z0-9_]+)\s*(})/m do
+          groups Str::Interpol, Name::Variable, Str::Interpol
+          pop!
+        end
+      end
+
+      prepend :attr do
+        # Duplicate template_start mixin here with a pop!
+        # Because otherwise we'll never exit the attr state
+        rule %r/\{/ do
+          token Str::Interpol
+          pop!
+          push :template
+        end
+      end
+
+      # handle templates within attribute single/double quotes
+      prepend :dq do
+        mixin :template_start
+      end
+
+      prepend :sq do
+        mixin :template_start
+      end
+
+      prepend :root do
+        # detect curly braces within HTML text (outside of tags/attributes)
+        rule %r/([^<&{]*)(\{)(\s*)/ do
+          groups Text, Str::Interpol, Text
+          push :template
+        end
+      end
+
+      state :template_start do
+        # open template
+        rule %r/\s*\{\s*/, Str::Interpol, :template
+      end
+
+      state :template do
+        # template end
+        rule %r/}/, Str::Interpol, :pop!
+
+        # Allow JS lexer to handle matched curly braces within template
+        rule(/(?<=^|[^\\])\{.*?(?<=^|[^\\])\}/) do
+          delegate @js
+        end
+
+        # keywords
+        rule %r/@(debug|html)\b/, Keyword
+        rule %r/(#await)(.*)(then|catch)(\s+)(\w+)/ do |m|
+          token Keyword, m[1]
+          delegate @js, m[2]
+          token Keyword, m[3]
+          token Text, m[4]
+          delegate @js, m[5]
+        end
+        rule %r/([#\/])(await|each|if|key)\b/, Keyword
+        rule %r/(:else)(\s+)(if)?\b/ do
+          groups Keyword, Text, Keyword
+        end
+        rule %r/:?(catch|then)\b/, Keyword
+
+        # allow JS parser to handle anything that's not a curly brace
+        rule %r/[^{}]+/ do
+          delegate @js
+        end
+      end
+    end
+  end
+end

data/lib/rouge/lexers/swift.rb

@@ -15,28 +15,29 @@ module Rouge
       id = /#{id_head}#{id_rest}*/
 
       keywords = Set.new %w(
-        await break case continue default do else fallthrough if in for return switch where while try catch throw guard defer repeat
+        autoreleasepool await break case catch consume continue default defer discard do each else fallthrough guard if in for repeat return switch throw try where while
 
-        as dynamicType is new super self Self Type __COLUMN__ __FILE__ __FUNCTION__ __LINE__
+        as dynamicType is new super self Self Type
 
-        associativity async didSet get infix inout isolated mutating none nonmutating operator override postfix precedence prefix set unowned weak willSet throws rethrows precedencegroup
-
-        #available #colorLiteral #column #else #elseif #endif #error #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation #warning
+        associativity async didSet get infix inout isolated left mutating none nonmutating operator override postfix precedence precedencegroup prefix rethrows right set throws unowned weak willSet
       )
 
       declarations = Set.new %w(
-        actor class deinit enum convenience extension final func import init internal lazy let nonisolated optional private protocol public required static struct subscript typealias var dynamic indirect associatedtype open fileprivate some
+        actor any associatedtype borrowing class consuming deinit distributed dynamic enum convenience extension fileprivate final func import indirect init internal lazy let macro nonisolated open optional package private protocol public required some static struct subscript typealias var
       )
 
       constants = Set.new %w(
         true false nil
       )
 
-      start { push :bol }
+      start do
+        push :bol
+        @re_delim = "" # multi-line regex delimiter
+      end
 
       # beginning of line
       state :bol do
-        rule %r/#.*/, Comment::Preproc
+        rule %r/#(?![#"\/]).*/, Comment::Preproc
 
         mixin :inline_whitespace
 
@@ -69,8 +70,11 @@ module Rouge
         mixin :whitespace
         
         rule %r/\$(([1-9]\d*)?\d)/, Name::Variable
+        rule %r/\$#{id}/, Name
+        rule %r/~Copyable\b/, Keyword::Type
 
         rule %r{[()\[\]{}:;,?\\]}, Punctuation
+        rule %r{(#*)/(?!\s).*(?<![\s\\])/\1}, Str::Regex
         rule %r([-/=+*%<>!&|^.~]+), Operator
         rule %r/@?"/, Str, :dq
         rule %r/'(\\.|.)'/, Str::Char
@@ -82,6 +86,7 @@ module Rouge
         rule %r{[\d]+(?:_\d+)*}, Num::Integer
 
         rule %r/@#{id}/, Keyword::Declaration
+        rule %r/##{id}/, Keyword
 
         rule %r/(private|internal)(\([ ]*)(\w+)([ ]*\))/ do |m|
           if m[3] == 'set'
@@ -99,14 +104,6 @@ module Rouge
           end
         end
 
-        rule %r/#available\([^)]+\)/, Keyword::Declaration
-
-        rule %r/(#(?:selector|keyPath)\()([^)]+?(?:[(].*?[)])?)(\))/ do
-          groups Keyword::Declaration, Name::Function, Keyword::Declaration
-        end
-
-        rule %r/#(line|file|column|function|dsohandle)/, Keyword::Declaration
-
         rule %r/(let|var)\b(\s*)(#{id})/ do
           groups Keyword, Text, Name::Variable
         end
@@ -148,6 +145,12 @@ module Rouge
         rule %r/(`)(#{id})(`)/ do
           groups Punctuation, Name::Variable, Punctuation
         end
+
+        rule %r{(#+)/\n} do |m|
+          @re_delim = m[1]
+          token Str::Regex
+          push :re_multi
+        end
       end
 
       state :tuple do
@@ -181,6 +184,19 @@ module Rouge
         rule %r/[)]/, Punctuation, :pop!
         mixin :root
       end
+
+      state :re_multi do
+        rule %r{^\s*/#+} do |m|
+          token Str::Regex
+          if m[0].end_with?("/#{@re_delim}")
+            @re_delim = ""
+            pop!
+          end
+        end
+
+        rule %r/#.*/, Comment::Single
+        rule %r/./m, Str::Regex
+      end
     end
   end
 end

data/lib/rouge/lexers/terraform.rb

@@ -37,14 +37,6 @@ module Rouge
         @builtins ||= %w()
       end
 
-      prepend :hash do
-        rule %r/[.,()*]/, Punctuation
-      end
-
-      prepend :array do
-        rule %r/[.,()*]/, Punctuation
-      end
-
       state :strings do
         rule %r/\\./, Str::Escape
         rule %r/\$\{/ do

data/lib/rouge/lexers/typescript.rb

@@ -10,12 +10,12 @@ module Rouge
       extend TypescriptCommon
 
       title "TypeScript"
-      desc "TypeScript, a superset of JavaScript"
+      desc "TypeScript, a superset of JavaScript (https://www.typescriptlang.org/)"
 
       tag 'typescript'
       aliases 'ts'
 
-      filenames '*.ts', '*.d.ts'
+      filenames '*.ts', '*.d.ts', '*.cts', '*.mts'
 
       mimetypes 'text/typescript'
     end

data/lib/rouge/lexers/wollok.rb

@@ -14,8 +14,6 @@ module Rouge
       entity_name = /[a-zA-Z][a-zA-Z0-9]*/
       variable_naming = /_?#{entity_name}/
 
-      entities = []
-
       state :whitespaces_and_comments do
         rule %r/\s+/m, Text::Whitespace
         rule %r(//.*$), Comment::Single
@@ -98,6 +96,12 @@ module Rouge
         rule %r/\(|\)|=/, Text
         rule %r/,/, Punctuation
       end
+
+      private
+
+      def entities
+        @entities ||= []
+      end
     end
   end
 end

data/lib/rouge/lexers/xojo.rb

@@ -12,20 +12,20 @@ module Rouge
 
       keywords = %w(
           addhandler aggregates array asc assigns attributes begin break
-          byref byval call case catch class const continue char ctype declare
+          byref byval call case catch class const continue color ctype declare
           delegate dim do downto each else elseif end enum event exception
           exit extends false finally for function global goto if
           implements inherits interface lib loop mod module
           new next nil object of optional paramarray
           private property protected public raise raiseevent rect redim
           removehandler return select shared soft static step sub super
-          then to true try until using uend uhile
+          then to true try until using var wend while
         )
 
       keywords_type = %w(
-          boolean cfstringref cgfloat cstring curency date double int8 int16
-          int32 int64 integer ostype pstring ptr short single
-          single string structure variant uinteger uint8 uint16 uint32 uint64
+          boolean byte cfstringref cgfloat cstring currency date datetime double int8 int16
+          int32 int64 integer ostype pair pstring ptr short single
+          string structure variant uinteger uint8 uint16 uint32 uint64
           ushort windowptr wstring
         )
 

data/lib/rouge/lexers/xquery.rb

@@ -8,7 +8,7 @@ module Rouge
       title 'XQuery'
       desc 'XQuery 3.1: An XML Query Language'
       tag 'xquery'
-      filenames '*.xquery', '*.xq'
+      filenames '*.xquery', '*.xq', '*.xqm'
       mimetypes 'application/xquery'
 
       def self.keywords

data/lib/rouge/version.rb

@@ -3,6 +3,6 @@
 
 module Rouge
   def self.version
-    "4.1.1"
+    "4.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -49,6 +49,7 @@ files:
 - lib/rouge/demos/clojure
 - lib/rouge/demos/cmake
 - lib/rouge/demos/cmhg
+- lib/rouge/demos/codeowners
 - lib/rouge/demos/coffeescript
 - lib/rouge/demos/common_lisp
 - lib/rouge/demos/conf
@@ -210,6 +211,7 @@ files:
 - lib/rouge/demos/stan
 - lib/rouge/demos/stata
 - lib/rouge/demos/supercollider
+- lib/rouge/demos/svelte
 - lib/rouge/demos/swift
 - lib/rouge/demos/systemd
 - lib/rouge/demos/syzlang
@@ -290,6 +292,7 @@ files:
 - lib/rouge/lexers/clojure.rb
 - lib/rouge/lexers/cmake.rb
 - lib/rouge/lexers/cmhg.rb
+- lib/rouge/lexers/codeowners.rb
 - lib/rouge/lexers/coffeescript.rb
 - lib/rouge/lexers/common_lisp.rb
 - lib/rouge/lexers/conf.rb
@@ -463,6 +466,7 @@ files:
 - lib/rouge/lexers/stan.rb
 - lib/rouge/lexers/stata.rb
 - lib/rouge/lexers/supercollider.rb
+- lib/rouge/lexers/svelte.rb
 - lib/rouge/lexers/swift.rb
 - lib/rouge/lexers/systemd.rb
 - lib/rouge/lexers/syzlang.rb
@@ -543,7 +547,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A pure-ruby colorizer based on pygments