rubylens 0.1.0 → 0.2.0

data/lib/rubylens/git_repository.rb

@@ -22,19 +22,25 @@ module RubyLens
     end
 
     def selected_files
-      output, status = capture("ls-files", "-z", "--cached", "--others", "--exclude-standard")
+      arguments = ["ls-files", "-z", "--cached", "--others", "--exclude-standard"]
+      unless @target_root == @git_root
+        relative_target = @target_root.relative_path_from(@git_root)
+        arguments.concat(["--", ":(literal)#{relative_target}"])
+      end
+      output, status = capture(*arguments)
       raise GitError, "failed to enumerate tracked and unignored files" unless status.success?
 
+      git_root = @git_root.to_s
+      target_root = @target_root.to_s
       output.split("\0").filter_map do |relative_to_git|
         next unless INDEXABLE_EXTENSIONS.include?(File.extname(relative_to_git))
 
-        absolute = @git_root.join(relative_to_git).cleanpath
-        next unless Paths.inside?(absolute, @target_root)
-        next unless absolute.file?
-        resolved = absolute.realpath
-        next unless Paths.inside?(resolved, @target_root.realpath)
+        absolute = File.join(git_root, relative_to_git)
+        next unless File.file?(absolute)
+        resolved = File.realpath(absolute)
+        next unless Paths.inside?(resolved, target_root)
 
-        resolved.to_s
+        resolved
       rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
         nil
       end.sort

data/lib/rubylens/index/manifest.rb

@@ -70,10 +70,11 @@ module RubyLens
 
       def package_index_for(path)
         path = path.to_s
-        return @package_index_by_file[path] if @package_index_by_file.key?(path)
-        return @package_index_cache[path] if @package_index_cache.key?(path)
-
-        @package_index_cache[path] = uncached_package_index_for(path)
+        @package_index_by_file.fetch(path) do
+          @package_index_cache.fetch(path) do
+            @package_index_cache[path] = uncached_package_index_for(path)
+          end
+        end
       rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
         nil
       end
@@ -84,9 +85,9 @@ module RubyLens
 
       def relative_workspace_path(path)
         path = path.to_s
-        return @relative_workspace_path_cache[path] if @relative_workspace_path_cache.key?(path)
-
-        @relative_workspace_path_cache[path] = uncached_relative_workspace_path(path)
+        @relative_workspace_path_cache.fetch(path) do
+          @relative_workspace_path_cache[path] = uncached_relative_workspace_path(path)
+        end
       end
 
       private

data/lib/rubylens/index/rspec_extractor.rb

@@ -11,28 +11,24 @@ module RubyLens
       SPEC_SEGMENTS = Set.new(%w[spec specs]).freeze
       PROXY_NAME_PREFIX = "RSpec example group #"
 
-      Group = Data.define(:name, :component)
       Result = Data.define(:groups, :method_count)
 
-      def initialize(graph:, manifest:, package_document_paths: Set.new)
+      def initialize(graph:, manifest:, package_document_paths: Set.new, documents_with_paths: nil)
         @graph = graph
         @manifest = manifest
         @package_document_paths = package_document_paths
+        @documents_with_paths = documents_with_paths
       end
 
       def call
         groups = []
         method_count = 0
 
-        spec_documents.each do |document, relative|
+        spec_documents.each do |document, _relative|
           group_count, example_count = reference_counts(document.method_references)
           method_count += example_count
-          component = SourcePath.component_for(relative)
           group_count.times do
-            groups << Group.new(
-              format("%s%06d", PROXY_NAME_PREFIX, groups.length + 1),
-              component,
-            )
+            groups << format("%s%06d", PROXY_NAME_PREFIX, groups.length + 1)
           end
         end
 
@@ -41,10 +37,16 @@ module RubyLens
 
       private
 
+      # The adapter passes its already-resolved [document, path] pairs so the
+      # documents are not re-enumerated and their URIs not re-parsed here;
+      # standalone construction still resolves them from the graph.
       def spec_documents
-        @graph.documents.filter_map do |document|
+        pairs = @documents_with_paths || @graph.documents.filter_map do |document|
           path = SourcePath.from_file_uri(document.uri)
-          next unless path && @manifest.workspace_path?(path)
+          [document, path] if path
+        end
+        pairs.filter_map do |document, path|
+          next unless @manifest.workspace_path?(path)
           next if @package_document_paths.include?(path)
 
           relative = @manifest.relative_workspace_path(path)