Merge branch 'merged'

brandondrew · Oct 3, 2010 · aa8829c · aa8829c
2 parents e36beb4 + c00e7e2
commit aa8829c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/sass/util.rb b/lib/sass/util.rb
@@ -121,10 +121,12 @@ def restrict(value, range)
     # @example
     #   merge_adjacent_strings([1, "foo", "bar", 2, "baz"])
     #     #=> [1, "foobar", 2, "baz"]
-    # @param enum [Enumerable]
+    # @param arr [Array]
     # @return [Array] The enumerable with strings merged
-    def merge_adjacent_strings(enum)
-      enum.inject([]) do |a, e|
+    def merge_adjacent_strings(arr)
+      # Optimize for the common case of one element
+      return arr if arr.size < 2
+      arr.inject([]) do |a, e|
         if e.is_a?(String)
           if a.last.is_a?(String)
             a.last << e