@@ -1,5 +1,10 @@ JavaScript Tools TextMate Bundle -------------------------------- +v0.2.7 (Sat Jul 5 17:32:41 EDT 2008) -- Thomas Aylott ++ Made the Lint Validator work with a selection and fallback to the whole document ++ Converted the Lint code into a method so that it could theoretically be required by another file ++ Added some basic Unit Tests for lint.rb + v0.2.6 (Sat May 17 20:14:50 EDT 2008) -- Thomas Aylott + Now you can just set and environment variable to toggle the Packr base62 option CHANGELOG.txt @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>beforeRunningCommand</key> @@ -8,9 +8,10 @@ <string>. "$TM_SUPPORT_PATH/lib/webpreview.sh" html_header "Validate Javascript" "${TM_RUBY:-ruby}" "$TM_BUNDLE_SUPPORT/bin/lint.rb" -html_footer</string> +html_footer +</string> <key>input</key> - <string>none</string> + <string>selection</string> <key>keyEquivalent</key> <string>^V</string> <key>name</key> @@ -18,7 +19,7 @@ html_footer</string> <key>output</key> <string>showAsHTML</string> <key>scope</key> - <string>source.js, source.prototype.js</string> + <string>source.js</string> <key>uuid</key> <string>4108455E-925C-4009-B87F-4635199F6DE7</string> </dict> Commands/Run JavaScript Lint on current file.tmCommand @@ -1,11 +1,20 @@ #!/usr/bin/env ruby FILENAME = ENV['TM_FILENAME'] FILEPATH = ENV['TM_FILEPATH'] -SUPPORT = ENV['TM_BUNDLE_SUPPORT'] +# SUPPORT = ENV['TM_BUNDLE_SUPPORT'] +SUPPORT = '/Users/taylott/Library/Application Support/TextMate/Bundles/JavaScript Tools.tmbundle/Support' BINARY = "#{SUPPORT}/bin/jsl" # BINARY = `uname -a` =~ /i386/ ? "#{SUPPORT}/bin/intel/jsl" : "#{SUPPORT}/bin/ppc/jsl" -output = `"#{BINARY}" -process "#{FILEPATH}" -nologo -conf "#{SUPPORT}/conf/jsl.textmate.conf"` +def lint!(javascript,offset_line=0,offset_column=0) +# File.write +# output = `"#{BINARY}" -process "#{FILEPATH}" -nologo -conf "#{SUPPORT}/conf/jsl.textmate.conf"` +output = IO::popen(%`"#{BINARY}" -stdin -nologo -conf "#{SUPPORT}/conf/jsl.textmate.conf" 2>&1`, 'r+') do |io| + io << javascript + io.close_write + io.read.chomp +end + output.gsub!('lint warning:', '<span class="warning">Warning:</span>') output.gsub!('SyntaxError:', '<span class="error">Syntax Error:</span>') @@ -26,10 +35,14 @@ output = output.map do |chunk| j = 0 lines = lines.map do |line| if line =~ /^(\d+):/ - column = (lines[j+2].rindex("^") + 1).to_s rescue '' - line.gsub!(/^(\d+):/, %{<a href="txmt://open?url=file://#{FILEPATH}&line=\\1&column=#{column}">\\1</a>}) - line.gsub!('#{column}', column); - line.gsub!('#{FILEPATH}', FILEPATH); + + linenum = line.scan(/^(\d+):/).first.first + linenum = linenum.to_i + offset_line rescue 1 + + column = lines[j+2].rindex("^") rescue 1 + column = column.to_i + 1 + offset_column rescue 1 + + line.gsub!(/^(\d+):/, %{<a href="txmt://open?url=file://#{FILEPATH}&line=#{linenum}&column=#{column}">\\1</a>}) end j += 1 line @@ -43,7 +56,7 @@ output = output.map do |chunk| end output = output.join("\n\n") -html = <<WTF +html = <<-HTML <html> <head> <title>JavaScript Lint Results</title> @@ -94,6 +107,42 @@ html = <<WTF </ul> </body> </html> -WTF +HTML + +html +end + +if __FILE__ == $0 + +if ENV['TM_SCOPE'] =~ /source\.js/ + puts lint!(STDIN.read, ENV['TM_INPUT_START_LINE'].to_i, ENV['TM_INPUT_START_COLUMN'].to_i) +else + require "test/unit" + class TestLint < Test::Unit::TestCase + def test_basic + js = '1+1;' + result = lint!(js) + assert result.include?('0 error(s), 0 warning(s)'), result + end + def test_basic_error + js = '"' + result = lint!(js) + assert result.include?('1 error(s), 0 warning(s)'), result + assert result.include?('&line=1&column=1'), result + end + def test_offset + js = '"' + result = lint!(js, 100) + assert result.include?('1 error(s), 0 warning(s)'), result + assert result.include?('&line=101&column=1'), result + end + def test_offset2 + js = "{'singleQuotedString': null}" + result = lint!(js, 100, 100) + assert result.include?('1 error(s), 0 warning(s)'), result + assert result.include?('&line=101&column=122'), result + end + end +end #TESTING -puts html \ No newline at end of file +end #if Support/bin/lint.rb cc2f43b7118740d95d5a9f10ee9a9909282de418 Thomas Aylott oblivious+git@subtlegradient.com http://github.com/johnmuhl/javascript-tools-tmbundle/commit/7aefb596a603171a38b0a92b96b0db832944de03 7aefb596a603171a38b0a92b96b0db832944de03

2008-07-05T14:40:21-07:00

+ Made the Lint Validator work with a selection and fallback to the whole document + Converted the Lint code into a method so that it could theoretically be required by another file + Added some basic Unit Tests for lint.rb 1aff3000fcc0d57670e763a6c2aa0ed453c56239 Thomas Aylott oblivious+git@subtlegradient.com