Fix searching for files by path

1 files changed, 32 insertions, 11 deletions

diff --git a/lib/gitlab/file_finder.rb b/lib/gitlab/file_finder.rb
index 093d9ed8092..10ffc345bd5 100644
--- a/lib/gitlab/file_finder.rb
+++ b/lib/gitlab/file_finder.rb
@@ -6,27 +6,48 @@ module Gitlab
 
     attr_reader :project, :ref
 
+    delegate :repository, to: :project
+
     def initialize(project, ref)
       @project = project
       @ref = ref
     end
 
     def find(query)
-      blobs = project.repository.search_files_by_content(query, ref).first(BATCH_SIZE)
-      found_file_names = Set.new
+      by_content = find_by_content(query)
 
-      results = blobs.map do |blob|
-        blob = Gitlab::ProjectSearchResults.parse_search_result(blob)
-        found_file_names << blob.filename
+      already_found = Set.new(by_content.map(&:filename))
+      by_filename = find_by_filename(query, except: already_found)
 
-        [blob.filename, blob]
-      end
+      (by_content + by_filename)
+        .sort_by(&:filename)
+        .map { |blob| [blob.filename, blob] }
+    end
 
-      project.repository.search_files_by_name(query, ref).first(BATCH_SIZE).each do |filename|
-        results << [filename, OpenStruct.new(ref: ref)] unless found_file_names.include?(filename)
-      end
+    private
 
-      results.sort_by(&:first)
+    def find_by_content(query)
+      results = repository.search_files_by_content(query, ref).first(BATCH_SIZE)
+      results.map { |result| Gitlab::ProjectSearchResults.parse_search_result(result) }
+    end
+
+    def find_by_filename(query, except: [])
+      filenames = repository.search_files_by_name(query, ref).first(BATCH_SIZE)
+      filenames.delete_if { |filename| except.include?(filename) } unless except.empty?
+
+      blob_refs = filenames.map { |filename| [ref, filename] }
+      blobs = Gitlab::Git::Blob.batch(repository, blob_refs, blob_size_limit: 1024)
+
+      blobs.map do |blob|
+        Gitlab::SearchResults::FoundBlob.new(
+          id: blob.id,
+          filename: blob.path,
+          basename: File.basename(blob.path),
+          ref: ref,
+          startline: 1,
+          data: blob.data
+        )
+      end
     end
   end
 end