fix: nested shells

pejuko · pejuko · commit 537edb19334d · 2012-03-14T08:00:24.000+01:00
diff --git a/lib/coderay/scanners/bash.rb b/lib/coderay/scanners/bash.rb
@@ -66,6 +66,8 @@ def initialize(*args)
       @state = :initial
       @quote = nil
       @shell = false
+      @brace_shell = 0
+      @quote_brace_shell = 0
     end
 
     def scan_tokens encoder, options
@@ -106,12 +108,13 @@ def scan_tokens encoder, options
             next
           elsif match = scan(/`/)
             if @shell
+              encoder.text_token(match, :delimiter)
               encoder.end_group :shell
             else
               encoder.begin_group :shell
+              encoder.text_token(match, :delimiter)
             end
             @shell = (not @shell)
-            encoder.text_token(match, :delimiter)
             next
           elsif match = scan(/'[^']*'?/)
             kind = :string
@@ -137,8 +140,19 @@ def scan_tokens encoder, options
             end
             kind = IDENT_KIND[var]
             kind = :instance_variable if kind == :ident
-          elsif match = scan(/ \$\( [^\)]+ \) /ox)
-            kind = :shell
+          #elsif match = scan(/ \$\( [^\)]+ \) /ox)
+          elsif match = scan(/ \$\( /ox)
+            @brace_shell += 1
+            encoder.begin_group :shell
+            encoder.text_token(match, :delimiter)
+            next
+          elsif match = scan(/ \) /ox)
+            if @brace_shell > 0
+              encoder.text_token(match, :delimiter)
+              encoder.end_group :shell
+              @brace_shell -= 1
+              next
+            end
           elsif match = scan(PRE_CONSTANTS)
             kind = :predefined_constant
           elsif match = scan(/[^\s'"]*[A-Za-z_][A-Za-z_0-9]*\+?=/)
@@ -202,6 +216,20 @@ def scan_tokens encoder, options
             kind = :predefined_constant
           elsif match = scan(/ (?: \$\(\(.*?\)\) ) /x)
             kind = :global_variable
+          elsif match = scan(/ \$\( /ox)
+            encoder.begin_group :shell
+            encoder.text_token(match, :delimiter)
+            @quote_brace_shell += 1
+            next
+          elsif match = scan(/\)/)
+            if @quote_brace_shell > 0
+              encoder.text_token(match, :delimiter)
+              encoder.end_group :shell
+              @quote_brace_shell -= 1
+              next
+            else
+              kind = :content
+            end
           elsif match = scan(/ \$ (?: (?: \{ [^\}]* \}) | (?: [A-Za-z_0-9]+ ) ) /x)
             match =~ /(\$\{?)([^\}]*)(\}?)/
             pre=$1
@@ -215,7 +243,7 @@ def scan_tokens encoder, options
             end
             kind = IDENT_KIND[match]
             kind = :instance_variable if kind == :ident
-          elsif match = scan(/[^#{@quote}\\]+/)
+          elsif match = scan(/[^\)\$#{@quote}\\]+/)
             kind = :content
           else match = scan(/.+/)
             # this shouldn't be
diff --git a/test/nested_shells.sh b/test/nested_shells.sh
@@ -0,0 +1 @@
+blueberry=$(date -d "$(stat -c $(%z) blueberry.exe)")
diff --git a/test/test.rb b/test/test.rb
@@ -22,7 +22,7 @@ def test_0010_ErbBash
     )
   end
 
-  def test_0011_ErbBash_Ignoring_Errors
+  def test_0020_ErbBash_Ignoring_Errors
     eb_file = File.join($current_dir, "erb_bash.sh")
     assert_equal(
       #["#!/bin/sh", :directive, "\n", :end_line, "\n", :end_line, "perl", :ident, " ", :space, "-", :operator, "e", :ident, "'s/to=5/to=10/'", :string, " ", :space, "/", :plain, "test", :method, "/", :plain, "file", :ident, "\n", :end_line, "echo", :method, " ", :space, :begin_group, :string, "\"", :delimiter, "Parsed at ", :content, :begin_group, :inline, "<%=", :inline_delimiter, " ", :space, "Time", :constant, ".", :operator, "now", :ident, " ", :space, "%>", :inline_delimiter, :end_group, :inline, "\"", :delimiter, :end_group, :string, "\n", :end_line, "echo", :method, " ", :space, :begin_group, :string, "\"", :delimiter, "Executed at `Date`", :content, "\"", :delimiter, :end_group, :string, "\n", :end_line, "command", :method, " ", :space, "'open quote", :plain, "\n", :end_line, "other_command", :ident, "\n", :end_line],
@@ -31,12 +31,20 @@ def test_0011_ErbBash_Ignoring_Errors
     )
   end
 
-  def test_0011_ErbBash_Ignoring_Errors
+  def test_0030_heredoc
     file = File.join($current_dir, "heredoc.sh")
     assert_equal(
       ["#/bin/bash", :comment, "\n", :end_line, "\n", :end_line, "cat", :ident, " ", :space, :begin_group, :string, "<<EOF", :delimiter, "\n", :end_line, "little brown fox jumps over lazy dog\n ", :content, "EOF", :delimiter, :end_group, :string, "\n", :end_line, "\n", :end_line, "echo", :method, " ", :space, :begin_group, :string, "\"", :delimiter, "end", :content, "\"", :delimiter, :end_group, :string, "\n", :end_line],
       CodeRay.scan(File.read(file), :bash).tokens
     )
   end
 
+  def test_0040_nested_shell
+    file = File.join($current_dir, "nested_shells.sh")
+    assert_equal(
+      ["blueberry", :instance_variable, "=", :operator, :begin_group, :shell, "$(", :delimiter, "date", :ident, " ", :space, "-", :operator, "d", :ident, " ", :space, :begin_group, :string, "\"", :delimiter, :begin_group, :shell, "$(", :delimiter, "stat -c ", :content, :begin_group, :shell, "$(", :delimiter, "%z", :content, ")", :delimiter, :end_group, :shell, " blueberry.exe", :content, ")", :delimiter, :end_group, :shell, "\"", :delimiter, :end_group, :string, ")", :delimiter, :end_group, :shell, "\n", :end_line],
+      CodeRay.scan(File.read(file), :bash).tokens
+    )
+  end
+
 end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+blueberry=$(date -d "$(stat -c $(%z) blueberry.exe)")`