From 17fb48eaa302ef3eb7bdcb3fa791e9aed73dc2a4 Mon Sep 17 00:00:00 2001 From: William Vu Date: Thu, 29 May 2014 13:06:47 -0500 Subject: [PATCH] Refactor check_nokogiri in msftidy --- tools/msftidy.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/msftidy.rb b/tools/msftidy.rb index 81e3a5367e..949c20ce2c 100755 --- a/tools/msftidy.rb +++ b/tools/msftidy.rb @@ -125,17 +125,15 @@ class Msftidy has_nokogiri = false has_nokogiri_xml_parser = false @source.each_line do |line| - if line =~ /^\s*(require|load)\s+['"]nokogiri['"]/ - has_nokogiri = true - break - end - end - if has_nokogiri - @source.each_line do |line| - if line =~ /Nokogiri::XML.parse/ or line =~ /Nokogiri::XML::Reader/ + if has_nokogiri + if line =~ /Nokogiri::XML\.parse/ or line =~ /Nokogiri::XML::Reader/ has_nokogiri_xml_parser = true break end + else + if line =~ /^\s*(require|load)\s+['"]nokogiri['"]/ + has_nokogiri = true + end end end error(msg) if has_nokogiri_xml_parser