@@ -88,10 +88,17 @@ class AckInProject::Search
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)
-
+ # (putting it into defaults instead of params didn't change anything) ~David
+ options << case plist['ackFileType']
+ when 'Normal'
+ ''
+ when 'All'
+ '--all-types'
+ else
+ '--type='+plist['ackFileType']
+ end
+
AckInProject.update_search_history result['returnArgument']
AckInProject.update_pbfind result['returnArgument']
Support/lib/search.rb
@@ -29,7 +29,7 @@ class AckInProject::SearchDialog
'ackExpression' => AckInProject.pbfind,
'ackHistory' => AckInProject.search_history,
'ackFileTypes' => filetypes,
- 'ackFileType' => 'All'
+ 'ackFileType' => 'Normal'
}
end
@@ -44,55 +44,8 @@ class AckInProject::SearchDialog
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'}
- ]
+ # I'm sure there's a better way to pass these to the NIB than an array of objects... but I'm not familiar with it.
+ %x{#{e_sh ack} --help=types}.scan(/--\[no\]([^ ]+)/).unshift(['Normal'], ['All']).map{ |type_array| {'filetype'=>type_array[0],} }
end
end
Support/lib/search_dialog.rb
@@ -14,8 +14,16 @@ class AckInProject::SearchResults
:page_title => title,
:html_head => header_extra()
)
+ note = case plist['ackFileType']
+ when 'Normal'
+ ''
+ when 'All'
+ ' (all types)'
+ else
+ ' ('+plist['ackFileType']+' only)'
+ end
puts <<-HTML
- <h2>Searching for “#{ h search_string }” in #{ searched_in }#{plist['ackFileType'] == 'All' ? '' : (' ('+plist['ackFileType']+' only)')}</h2>
+ <h2>Searching for “#{ h search_string }” in #{ searched_in }#{note}</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
ad6729c2b40cf804179bfbdc472f9047d49aeeec
David Lynch
kemayo@gmail.com
http://github.com/adinardi/ack-tmbundle/commit/6a30a02477b8def66143f74083efc62c739a862d
6a30a02477b8def66143f74083efc62c739a862d
2009-11-05T04:54:22-08:00
2009-02-13T01:17:04-08:00
Dynamic generation of the filetypes list
315de19af81a7f06187e3e0200530427efbae184
Angelo DiNardi
adinardi@fragtop.local