Update graph on edits

Author: vinistock

lib/ruby_lsp/server.rb

@@ -415,7 +415,16 @@ def text_document_did_change(message)
       params = message[:params]
       text_document = params[:textDocument]
 
-      @store.push_edits(uri: text_document[:uri], edits: params[:contentChanges], version: text_document[:version])
+      document = @store.get(text_document[:uri])
+      document.push_edits(params[:contentChanges], version: text_document[:version])
+
+      language_id = document.language_id
+
+      if [:ruby, :rbs].include?(language_id)
+        graph = @global_state.graph
+        graph.index_source(text_document[:uri].to_s, document.source, language_id.to_s)
+        graph.resolve
+      end
     end
 
     #: (Hash[Symbol, untyped] message) -> void
@@ -1033,6 +1042,23 @@ def workspace_did_change_watched_files(message)
       # is fine, but we shouldn't process the same file changes more than once
       changes.uniq!
 
+      graph = @global_state.graph
+
+      # Handle deletions and accumulate additions and changes for indexing
+      additions_and_changes = changes.each_with_object([]) do |change, acc|
+        if change[:type] == Constant::FileChangeType::DELETED
+          graph.delete_document(change[:uri])
+        else
+          path = URI(change[:uri]).to_standardized_path
+          next if path.nil?
+          next unless File.directory?(path) || [".rb", ".rbs"].include?(File.extname(path))
+
+          acc << path
+        end
+      end
+      graph.index_all(additions_and_changes)
+      graph.resolve
+
       index = @global_state.index
       changes.each do |change|
         # File change events include folders, but we're only interested in files

lib/ruby_lsp/store.rb

@@ -53,12 +53,6 @@ def set(uri:, source:, version:, language_id:)
       end
     end
 
-    #: (uri: URI::Generic, edits: Array[Hash[Symbol, untyped]], version: Integer) -> void
-    def push_edits(uri:, edits:, version:)
-      @state[uri.to_s] #: as !nil
-        .push_edits(edits, version: version)
-    end
-
     #: -> void
     def clear
       @state.clear

test/server_test.rb

@@ -465,7 +465,7 @@ def test_changed_file_only_indexes_ruby
               type: RubyLsp::Constant::FileChangeType::CREATED,
             },
             {
-              uri: URI("file:///.rubocop.yml"),
+              uri: URI("file:///.rubocop.yml").to_s,
               type: RubyLsp::Constant::FileChangeType::CREATED,
             },
           ],
@@ -505,7 +505,7 @@ def test_did_change_watched_files_handles_deletions
       uri.full_path == path
     end
 
-    uri = URI::Generic.from_path(path: path)
+    uri = URI::Generic.from_path(path: path).to_s
 
     @server.global_state.index.index_all(uris: [])
     @server.process_message({
@@ -1175,7 +1175,7 @@ def test_rubocop_config_changes_trigger_workspace_diagnostic_refresh
     @server.global_state.index.index_all(uris: [])
 
     [".rubocop.yml", ".rubocop", ".rubocop_todo.yml"].each do |config_file|
-      uri = URI::Generic.from_path(path: File.join(Dir.pwd, config_file))
+      uri = URI::Generic.from_path(path: File.join(Dir.pwd, config_file)).to_s
 
       @server.process_message({
         method: "workspace/didChangeWatchedFiles",
@@ -1324,7 +1324,7 @@ class Foo
       end
     RUBY
     File.write(path, source)
-    uri = URI::Generic.from_path(path: path)
+    uri = URI::Generic.from_path(path: path).to_s
 
     begin
       @server.process_message({

test/store_test.rb

@@ -168,73 +168,6 @@ def test_cache
     assert_equal(2, counter)
   end
 
-  def test_push_edits
-    uri = URI("file:///foo/bar.rb")
-    @store.set(uri: uri, source: +"def bar; end", version: 1, language_id: :ruby)
-
-    # Write puts 'a' in incremental edits
-    @store.push_edits(
-      uri: uri,
-      edits: [{ range: { start: { line: 0, character: 8 }, end: { line: 0, character: 8 } }, text: " " }],
-      version: 2,
-    )
-    @store.push_edits(
-      uri: uri,
-      edits: [{ range: { start: { line: 0, character: 9 }, end: { line: 0, character: 9 } }, text: "p" }],
-      version: 3,
-    )
-    @store.push_edits(
-      uri: uri,
-      edits: [{ range: { start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, text: "u" }],
-      version: 4,
-    )
-    @store.push_edits(
-      uri: uri,
-      edits: [{ range: { start: { line: 0, character: 11 }, end: { line: 0, character: 11 } }, text: "t" }],
-      version: 5,
-    )
-    @store.push_edits(
-      uri: uri,
-      edits: [{ range: { start: { line: 0, character: 12 }, end: { line: 0, character: 12 } }, text: "s" }],
-      version: 6,
-    )
-    @store.push_edits(
-      uri: uri,
-      edits: [{ range: { start: { line: 0, character: 13 }, end: { line: 0, character: 13 } }, text: " " }],
-      version: 7,
-    )
-    @store.push_edits(
-      uri: uri,
-      edits: [{ range: { start: { line: 0, character: 14 }, end: { line: 0, character: 14 } }, text: "'" }],
-      version: 8,
-    )
-    @store.push_edits(
-      uri: uri,
-      edits: [{ range: { start: { line: 0, character: 15 }, end: { line: 0, character: 15 } }, text: "a" }],
-      version: 9,
-    )
-    @store.push_edits(
-      uri: uri,
-      edits: [{ range: { start: { line: 0, character: 16 }, end: { line: 0, character: 16 } }, text: "'" }],
-      version: 10,
-    )
-    @store.push_edits(
-      uri: uri,
-      edits: [{ range: { start: { line: 0, character: 17 }, end: { line: 0, character: 17 } }, text: ";" }],
-      version: 11,
-    )
-
-    assert_equal(
-      RubyLsp::RubyDocument.new(
-        source: "def bar; puts 'a'; end",
-        version: 1,
-        uri: uri,
-        global_state: @global_state,
-      ),
-      @store.get(uri),
-    )
-  end
-
   def test_raises_non_existing_document_error_on_unknown_unsaved_files
     assert_raises(RubyLsp::Store::NonExistingDocumentError) do
       @store.get(URI("untitled:Untitled-1"))