hind 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47976412f00e1ef73ece58033efbfbdc363deeafd8c02b773b8d4416808819f9
-  data.tar.gz: 1712f5118a6d4fe4fd05cc25cd425288fa1fffe0bba8368ac9d020249332229b
+  metadata.gz: edc5339a6fe71b30f48781500d996901bef7732b5d6ed6a54ce561d057edce19
+  data.tar.gz: 8dd64ea610eaf53314e918d91846d42839b522550e2b29a2a626228f7c459fbd
 SHA512:
-  metadata.gz: ed15005304b079cefc8525fcd7fb534af2ab743f8fc4e68fdade9deb54d8e1e94a11a02441e815e6cb453ce4399ef91a0ae077f929b75b341e569de57fba8759
-  data.tar.gz: '08c465616f3f62a28882a80e1b637341604ac2725d8dd1b1ef7c4b8d908ada3c53ff5d53534573bbdb12aeab988e26944f75f297ef12afe9376b9a762d4560e8'
+  metadata.gz: d85651252a56a48c32c3285205cea32d0aa99e8098b396168cb1bf3357b61a9deff6ef90ceecee3b891761205bcb1d420235d4859b780629555080c040d9b25e
+  data.tar.gz: e69fa976556441508e1f46f7bb2636989a3cb810922636b1e460e3fa68130c7dc60538e55609349365506bf3fe21807a379c4afd5f54f4272582f02071164eef

data/lib/hind/cli.rb

@@ -49,22 +49,6 @@ module Hind
         }
       )
 
-      # Create file content map with relative paths
-      file_contents = {}
-      files.each do |file|
-        absolute_path = File.expand_path(file)
-        relative_path = Pathname.new(absolute_path)
-          .relative_path_from(Pathname.new(generator.metadata[:projectRoot]))
-          .to_s
-
-        begin
-          file_contents[relative_path] = File.read(absolute_path)
-        rescue => e
-          warn "Warning: Failed to read file '#{file}': #{e.message}"
-          next
-        end
-      end
-
       File.open(options[:output], 'w') do |output_file|
         say 'First pass: Collecting declarations...', :cyan if options[:verbose]
 
@@ -76,28 +60,54 @@ module Hind
         end
 
         # First pass: Process all files to collect declarations
-        declaration_data = generator.collect_declarations(file_contents)
+        declaration_data = {}
+        files.each do |file|
+          absolute_path = File.expand_path(file)
+          relative_path = Pathname.new(absolute_path)
+            .relative_path_from(Pathname.new(generator.metadata[:projectRoot]))
+            .to_s
+
+          begin
+            content = File.read(absolute_path)
+            file_declaration_data = generator.collect_file_declarations(content, relative_path)
+            declaration_data.merge!(file_declaration_data)
+          rescue => e
+            warn "Warning: Failed to read file '#{file}': #{e.message}"
+            next
+          end
+        end
 
-        say "Found #{declaration_data[:declarations].size} declarations (classes, modules, constants)", :cyan if options[:verbose]
+        say "Found #{declaration_data[:declarations]&.size} declarations (classes, modules, constants)", :cyan if options[:verbose]
 
         # Write declaration LSIF data next
-        if declaration_data[:lsif_data]&.any?
+        if declaration_data[:lsif_data].any?
           output_file.puts(declaration_data[:lsif_data].map(&:to_json).join("\n"))
         end
 
         say 'Processing files for references...', :cyan if options[:verbose]
 
         # Second pass: Process each file for references
-        file_contents.each do |relative_path, content|
+        files.each do |file|
+          absolute_path = File.expand_path(file)
+          relative_path = Pathname.new(absolute_path)
+            .relative_path_from(Pathname.new(generator.metadata[:projectRoot]))
+            .to_s
+
           if options[:verbose]
             say "Processing file: #{relative_path}", :cyan
           end
 
-          reference_lsif_data = generator.process_file(
-            content: content,
-            uri: relative_path
-          )
-          output_file.puts(reference_lsif_data.map(&:to_json).join("\n"))
+          begin
+            content = File.read(absolute_path)
+            reference_lsif_data = generator.process_file(
+              content: content,
+              uri: relative_path
+            )
+            output_file.puts(reference_lsif_data.map(&:to_json).join("\n"))
+          rescue => e
+            warn "Warning: Failed to read file '#{file}': #{e.message}"
+            next
+          end
         end
       end
     end

data/lib/hind/lsif/generator.rb

@@ -32,24 +32,22 @@ module Hind
         initialize_project if metadata[:initial]
       end
 
-      def collect_declarations(files)
-        files.each do |path, content|
-          @current_uri = path
-          @document_id = nil
-          @current_document_id = nil
-
-          begin
-            ast = Parser.new(content).parse
-            setup_document
-            visitor = DeclarationVisitor.new(self, path)
-            visitor.visit(ast)
-            finalize_document_state
-          rescue => e
-            warn "Warning: Failed to collect declarations from '#{path}': #{e.message}"
-          end
+      def collect_file_declarations(content, path)
+        @current_uri = path
+        @document_id = nil
+        @current_document_id = nil
+
+        begin
+          ast = Parser.new(content).parse
+          setup_document
+          visitor = DeclarationVisitor.new(self, path)
+          visitor.visit(ast)
+          finalize_document_state
+        rescue => e
+          warn "Warning: Failed to collect declarations from '#{path}': #{e.message}"
         end
 
-        # Store the last used vertex ID and reset reference index
+        # Store the last used vertex ID and reference index
         @last_vertex_id = @vertex_id
         @last_reference_index = @lsif_data.length
 
@@ -98,12 +96,12 @@ module Hind
         setup_document if @document_id.nil?
         current_doc_id = @document_id
 
-        range_id = if declaration[:type] == :constant_write
+        range_id = if declaration[:type] == :constant
           create_range(declaration[:node].name_loc)
         elsif declaration[:type] == :module
-          create_range(declaration[:node].module_keyword_loc)
+          create_range(declaration[:node].constant_path.location)
         elsif declaration[:type] == :class
-          create_range(declaration[:node].constant_path)
+          create_range(declaration[:node].constant_path.location)
         else
           create_range(declaration[:node].location)
         end
@@ -153,6 +151,10 @@ module Hind
 
         @global_state.add_reference(reference[:name], @current_uri, range_id, current_doc_id)
         emit_edge('next', range_id, declaration[:result_set_id])
+
+        reference_result = emit_vertex('referenceResult')
+        emit_edge('textDocument/references', declaration[:result_set_id], reference_result)
+        emit_edge('item', reference_result, [range_id], 'references', @document_id)
       end
 
       private

data/lib/hind/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hind
-  VERSION = '0.1.12'
+  VERSION = '0.1.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hind
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Aboobacker MK