pretty_print_javascript.rb in nilac-0.0.4.3.9.5

- old
+ new

@@ -44,11 +44,11 @@
 
     def fix_newlines(file_contents)
 
       def extract_blocks(file_contents)
 
-        javascript_regexp = /(if |while |for |case |default:|switch\(|function\(|((=|:)\s+\{))/
+        javascript_regexp = /(if |for |while |case |default:|switch\(|\(function\(|= function\(|function\(|((=|:)\s+\{))/
 
         block_starting_lines = file_contents.dup.reject { |element| element.index(javascript_regexp).nil? }[1..-1]
 
         block_starting_lines = block_starting_lines.reject { |element| element.include?("    ") }
 
@@ -60,10 +60,10 @@
 
           starting_line_indices << file_contents.index(line)
 
         end
 
-        block_ending_lines = file_contents.dup.each_index.select { |index| (file_contents[index].eql? "  }\n" or file_contents[index].eql? "  };\n" or file_contents[index].lstrip.eql?("});\n"))}
+        block_ending_lines = file_contents.dup.each_index.select { |index| (file_contents[index].eql? "  }\n" or file_contents[index].eql? "  };\n" or file_contents[index].strip.eql?("});\n"))}
 
         modified_file_contents = file_contents.dup
 
         code_blocks = []
 
\ No newline at end of file