lib/yoda/server/providers/definition.rb in yoda-language-server-0.7.2 vs lib/yoda/server/providers/definition.rb in yoda-language-server-0.8.0

@@ -1,42 +1,70 @@
 module Yoda
   class Server
     module Providers
       class Definition < Base
+        include WithTimeout
+
         def self.provider_method
           :'textDocument/definition'
         end
 
         def provide(params)
           calculate(params[:text_document][:uri], params[:position])
         end
 
+        private
+
         def timeout
           10
         end
 
-        private
+        def timeout_message(params)
+          uri = params[:text_document][:uri]
+          position = params[:position]
 
+          "#{self.class.provider_method}: #{uri}:#{position[:line]}:#{position[:character]}"
+        end
+
         # @param uri      [String]
         # @param position [{Symbol => Integer}]
         # @param include_declaration [Boolean]
         def calculate(uri, position, include_declaration = false)
-          source = session.file_store.get(uri)
+          workspace = session.workspace_for(uri)
+          source = workspace.read_at(uri)
           location = Parsing::Location.of_language_server_protocol_position(line: position[:line], character: position[:character])
 
-          node_worker = Evaluation::CurrentNodeExplain.new(session.registry, source, location)
-          references = node_worker.defined_files
-          references.map { |(path, line, column)| create_location(path, line, column) }
-        end
+          session.workspaces.each do |workspace|
+            next unless workspace.suburi?(uri)
 
+            node_worker = Services::CurrentNodeExplain.from_source(environment: workspace.project.environment, source: source, location: location)
+
+            if (current_comment_signature = node_worker.current_comment_signature)&.providable?
+              references = current_comment_signature.defined_files
+              locations = references.map { |(path, line, column)| create_location(workspace.uri_of_path(path), line, column) }
+
+              return locations unless locations.empty?
+            elsif current_node_signature = node_worker.current_node_signature
+              references = current_node_signature.defined_files
+              locations = references.map { |(path, line, column)| create_location(workspace.uri_of_path(path), line, column) }
+
+              return locations unless locations.empty?
+            else
+              nil
+            end
+          end
+
+          []
+        end
+        
         # @param path [String]
         # @param line [Integer]
         # @param column [Integer]
-        def create_location(path, line, column)
-          location = Parsing::Location.new(row: line - 1, column: column)
+        def create_location(uri, line, column)
+          location = Parsing::Location.new(row: line, column: column)
           LanguageServer::Protocol::Interface::Location.new(
-            uri: session.uri_of_path(path),
-            range: LanguageServer::Protocol::Interface::Range.new(Parsing::Range.new(location, location).to_language_server_protocol_range),
+            uri: uri,
+            range: LanguageServer::Protocol::Interface::Range.new(**Parsing::Range.new(location, location).to_language_server_protocol_range),
           )
         end
       end
     end
   end