Increase the source level for strings and regexps.

alloy · Aug 6, 2010 · 3fe8374 · 3fe8374
1 parent 020111a
commit 3fe8374
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/lib/irb/source.rb b/lib/irb/source.rb
@@ -183,6 +183,36 @@ def on_rbrace(token) #:nodoc:
         @level -= 1
         super
       end
+
+      def on_tstring_beg(token)
+        @level += 1
+        super
+      end
+
+      def on_tstring_end(token)
+        @level -= 1
+        super
+      end
+
+      def on_qwords_beg(token)
+        @level += 1
+        super
+      end
+
+      def on_words_sep(token)
+        @level -= 1
+        super
+      end
+
+      def on_regexp_beg(token)
+        @level += 1
+        super
+      end
+
+      def on_regexp_end(token)
+        @level -= 1
+        super
+      end
     end
   end
 end
diff --git a/spec/source_spec.rb b/spec/source_spec.rb
@@ -186,8 +186,13 @@ def reflect(source)
     [
       ["lambda { |x|", "}"],
       ["{", "}"],
-      ['"#{', '}"'],
-      ["[", "]"]
+      ["[", "]"],
+      ["'", "'"],
+      ['"', '"'],
+      ["%{", "}"],
+      ["%w{", "}"],
+      ["%r{", "}"],
+      ["/", "/"]
     ].each do |open, close|
       reflect(open).level.should == 1
       reflect("#{open}\n#{close}").level.should == 0