@@ -15,6 +15,11 @@
# Updated to use with ack by Pedro Melo <melo@simplicidade.org> 2008-05-26
# Support for TM_SELECTED_FILES by Corey Jewett <ml@syntheticplayground.com> 2008-05-30
#
+# 2008-08-11 (melo): Added flag ':' you must start your query with a : to
+# search only in the "selected files". I added this because using the
+# selected files ends up not being something that I commonly do.
+#
+#
# **NOTE WELL**: TextMate does not inherit your PATH, so if you this
# command does not find it define the environment variable
# TM_ACK_COMMAND_PATH in your Preferences > Advanced > Shell Variables with
@@ -121,18 +126,28 @@ bail("Not in a saved file") unless directory
query = TextMate::UI.request_string(:title => "Search in Project with ack", :prompt => "Find this:", :default => %x{pbpaste -pboard find})
bail("Search aborted") unless query
+
+if query[0,1] == ':'
+ query[0,1] = ''
+ use_selected_files = true
+else
+ use_selected_files = false
+end
+
IO.popen('pbcopy -pboard find', 'w') { |copy| copy.print query }
puts <<-HTML
<h2>Searching for #{ escape(query) }</h2>
HTML
-selected_files=TextMate.selected_files
+if use_selected_files
+ selected_files=TextMate.selected_files
+end
if selected_files
command = [ack_cmd, "-H", '--', query, selected_files]
puts <<-HTML
- <p><small>Search limited to #{ escape(selected_files.join(' ')) }</small></p>
+ <p><small>Search limited to #{ escape(selected_files.join(' ')) }</small></p>
HTML
else
Dir.chdir(directory)
SearchInProjectWithAck.tmCommand
@@ -6,6 +6,11 @@
# Updated to use with ack by Pedro Melo <melo@simplicidade.org> 2008-05-26
# Support for TM_SELECTED_FILES by Corey Jewett <ml@syntheticplayground.com> 2008-05-30
#
+# 2008-08-11 (melo): Added flag ':' you must start your query with a : to
+# search only in the "selected files". I added this because using the
+# selected files ends up not being something that I commonly do.
+#
+#
# **NOTE WELL**: TextMate does not inherit your PATH, so if you this
# command does not find it define the environment variable
# TM_ACK_COMMAND_PATH in your Preferences > Advanced > Shell Variables with
@@ -112,13 +117,23 @@ bail("Not in a saved file") unless directory
query = TextMate::UI.request_string(:title => "Search in Project with ack", :prompt => "Find this:", :default => %x{pbpaste -pboard find})
bail("Search aborted") unless query
+
+if query[0,1] == ':'
+ query[0,1] = ''
+ use_selected_files = true
+else
+ use_selected_files = false
+end
+
IO.popen('pbcopy -pboard find', 'w') { |copy| copy.print query }
puts <<-HTML
<h2>Searching for #{ escape(query) }</h2>
HTML
-selected_files=TextMate.selected_files
+if use_selected_files
+ selected_files=TextMate.selected_files
+end
if selected_files
command = [ack_cmd, "-H", '--', query, selected_files]
search_with_ack.rb
6abdeb4e31c5e4837fd8f8529e0df310e2c27154
Pedro Melo
melo@simplicidade.org
http://github.com/melo/search-in-project-with-ack-tmcommand/commit/a598b52aad56c1d07414d013174b2fa9e4b0324d
a598b52aad56c1d07414d013174b2fa9e4b0324d
2008-08-11T05:30:23-07:00
2008-08-11T05:30:23-07:00
Make search in selected files opt-in
By default we search everywhere now. To search only on the selected files,
start your query with a ':' (a single colon sign).
The colon sign will be removed from the query but will enable the selected
files filter.
I did this because I prefer the default to be search everywhere.
I rarely use the "search in selected files" feature.
Signed-off-by: Pedro Melo <melo@simplicidade.org>
af87f0aef1703c1d899c3581ddac15d1a98bf4fa
Pedro Melo
melo@simplicidade.org