@@ -87,6 +87,10 @@ class AckInProject::Search options << '-C' if result['showContext'] == 1 options << "--#{result['followSymLinks'] == 1 ? '' : 'no'}follow" options << "--#{result['loadAckRC'] == 1 ? '' : 'no'}env" + + options << "--type="+plist['ackFileType'] if plist['ackFileType'] != 'All' + # I don't know why ackFileType doesn't go into result. I am an Interface Builder n00b. + # (putting it into defaults instead of params didn't change anything) AckInProject.update_search_history result['returnArgument'] AckInProject.update_pbfind result['returnArgument'] Support/lib/search.rb @@ -25,11 +25,11 @@ class AckInProject::SearchDialog end def params - history = AckInProject.search_history { - #'contentHeight' => 168, 'ackExpression' => AckInProject.pbfind, - 'ackHistory' => history + 'ackHistory' => AckInProject.search_history, + 'ackFileTypes' => filetypes, + 'ackFileType' => 'All' } end @@ -42,6 +42,58 @@ class AckInProject::SearchDialog </body></html> HTML end + + def filetypes + # I'm sure there's a better way to do this. But I'm not familiar with it. + [ + {'filetype'=>'All'}, + {'filetype'=>'actionscript'}, + {'filetype'=>'asm'}, + {'filetype'=>'batch'}, + {'filetype'=>'binary'}, + {'filetype'=>'cc'}, + {'filetype'=>'cfmx'}, + {'filetype'=>'cpp'}, + {'filetype'=>'csharp'}, + {'filetype'=>'css'}, + {'filetype'=>'elisp'}, + {'filetype'=>'erlang'}, + {'filetype'=>'fortran'}, + {'filetype'=>'haskell'}, + {'filetype'=>'hh'}, + {'filetype'=>'html'}, + {'filetype'=>'java'}, + {'filetype'=>'js'}, + {'filetype'=>'jsp'}, + {'filetype'=>'lisp'}, + {'filetype'=>'lua'}, + {'filetype'=>'make'}, + {'filetype'=>'mason'}, + {'filetype'=>'objc'}, + {'filetype'=>'objcpp'}, + {'filetype'=>'ocaml'}, + {'filetype'=>'parrot'}, + {'filetype'=>'perl'}, + {'filetype'=>'php'}, + {'filetype'=>'plone'}, + {'filetype'=>'python'}, + {'filetype'=>'rake'}, + {'filetype'=>'ruby'}, + {'filetype'=>'scheme'}, + {'filetype'=>'shell'}, + {'filetype'=>'skipped'}, + {'filetype'=>'smalltalk'}, + {'filetype'=>'sql'}, + {'filetype'=>'tcl'}, + {'filetype'=>'tex'}, + {'filetype'=>'text'}, + {'filetype'=>'tt'}, + {'filetype'=>'vb'}, + {'filetype'=>'vim'}, + {'filetype'=>'xml'}, + {'filetype'=>'yaml'} + ] + end end Support/lib/search_dialog.rb @@ -15,7 +15,7 @@ class AckInProject::SearchResults :html_head => header_extra() ) puts <<-HTML - <h2>Searching for “#{ h search_string }” in #{ searched_in }</h2> + <h2>Searching for “#{ h search_string }” in #{ searched_in }#{plist['ackFileType'] == 'All' ? '' : (' ('+plist['ackFileType']+' only)')}</h2> <div id="counters"><span id="linecount">0 lines</span> matched in <span id="filecount">0 files</span></div> <script type="text/javascript">searchStarted();</script> <table id="results" width="100%" cellspacing="0"> Support/lib/search_results.rb @@ -1,7 +1,30 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {ACTIONS = {performButtonClick = id; }; CLASS = NSObject; LANGUAGE = ObjC; } - ); - IBVersion = 1; -} \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>IBClasses</key> + <array> + <dict> + <key>CLASS</key> + <string>FirstResponder</string> + <key>LANGUAGE</key> + <string>ObjC</string> + <key>SUPERCLASS</key> + <string>NSObject</string> + </dict> + <dict> + <key>ACTIONS</key> + <dict> + <key>performButtonClick</key> + <string>id</string> + </dict> + <key>CLASS</key> + <string>NSObject</string> + <key>LANGUAGE</key> + <string>ObjC</string> + </dict> + </array> + <key>IBVersion</key> + <string>1</string> +</dict> +</plist> Support/nibs/AckInProjectSearch.nib/classes.nib @@ -1,22 +1,19 @@ <?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>IBDocumentLocation</key> - <string>425 98 703 386 0 0 1680 1028 </string> - <key>IBEditorPositions</key> - <dict> - <key>185</key> - <string>756 617 214 136 0 0 1680 1028 </string> - </dict> <key>IBFramework Version</key> - <string>443.0</string> + <string>629</string> + <key>IBOldestOS</key> + <integer>5</integer> <key>IBOpenObjects</key> <array> - <integer>5</integer> + <integer>40</integer> <integer>185</integer> </array> <key>IBSystem Version</key> - <string>8S2167</string> + <string>9G55</string> + <key>targetFramework</key> + <string>IBCocoaFramework</string> </dict> </plist> Support/nibs/AckInProjectSearch.nib/info.nib Support/nibs/AckInProjectSearch.nib/keyedobjects.nib 2684ce1818db301f3f3f7e16cbbfda82cc6978c6 David Lynch kemayo@gmail.com http://github.com/adinardi/ack-tmbundle/commit/90f16268f721cffc900dc2c7eae84f32b39e8faf 90f16268f721cffc900dc2c7eae84f32b39e8faf 2009-11-05T04:54:22-08:00 2009-02-12T19:50:03-08:00 Filetypes support Adds a dropdown in the advanced drawer which lets you pick an option to pass to --type It's a bit clunky, as I couldn't work out how some of the tm_dialog stuff works (why some values went into 'result' and others didn't, and how to make the .nib pass through separate values and labels for a dropdown). 7130decec668eb12612124612a9453ae4d2ca4f9 Angelo DiNardi adinardi@fragtop.local