Only publish updated diagnostics

Author: mame

lib/typeprof/core/env.rb

@@ -8,6 +8,8 @@ def initialize
       @run_queue = []
       @run_queue_set = Set[]
 
+      @pending_diagnostic_paths = Set[]
+
       @mod_object = ModuleEntity.new([])
       @mod_object.inner_modules[:Object] = @mod_object
 
@@ -179,6 +181,19 @@ def run_all
       @run_count += run_count
     end
 
+    def process_diagnostic_paths
+      processed_paths = []
+      @pending_diagnostic_paths.each do |path|
+        processed = yield path
+        processed_paths << path if processed
+      end
+      processed_paths.each {|path| @pending_diagnostic_paths.delete(path) }
+    end
+
+    def add_diagnostic_path(path)
+      @pending_diagnostic_paths << path unless @pending_diagnostic_paths.include?(path)
+    end
+
     # just for validation
     def get_vertexes(vtxs)
       @mod_object.get_vertexes(vtxs)

lib/typeprof/core/graph/box.rb

@@ -44,7 +44,7 @@ def run0(genv, changes)
     end
 
     def to_s
-      "#{ self.class.to_s.split("::").last[0] }#{ @id ||= $new_id += 1 }"
+      "#{ self.class.to_s.split("::").last }#{ @id ||= $new_id += 1 }"
     end
 
     alias inspect to_s

lib/typeprof/core/graph/change_set.rb

@@ -172,9 +172,11 @@ def reinstall(genv)
       @new_boxes.clear
 
       @diagnostics.each do |diag|
+        genv.add_diagnostic_path(diag.node.lenv.path)
         diag.node.remove_diagnostic(diag)
       end
       @new_diagnostics.each do |diag|
+        genv.add_diagnostic_path(diag.node.lenv.path)
         diag.node.add_diagnostic(diag)
       end
       @diagnostics, @new_diagnostics = @new_diagnostics, @diagnostics

lib/typeprof/core/service.rb

@@ -138,6 +138,10 @@ def update_rbs_file(path, code)
       true
     end
 
+    def process_diagnostic_paths(&blk)
+      @genv.process_diagnostic_paths(&blk)
+    end
+
     def diagnostics(path, &blk)
       @rb_text_nodes[path]&.each_diagnostic(@genv, &blk)
     end

lib/typeprof/lsp/messages.rb

@@ -138,7 +138,7 @@ def run
       @server.open_texts[uri] = text
       @server.update_file(text.path, text.string)
       @server.send_request("workspace/codeLens/refresh")
-      @server.publish_diagnostics(uri)
+      @server.publish_updated_diagnostics
     end
   end
 
@@ -153,7 +153,7 @@ def run
       text.apply_changes(changes, version)
       @server.update_file(text.path, text.string)
       @server.send_request("workspace/codeLens/refresh")
-      @server.publish_diagnostics(uri)
+      @server.publish_updated_diagnostics
     end
   end
 

lib/typeprof/lsp/server.rb

@@ -47,7 +47,7 @@ def self.start_socket(core_options)
       end
     end
 
-    def initialize(core_options, reader, writer, url_schema: nil, publish_all_diagnostics: false)
+    def initialize(core_options, reader, writer, url_schema: nil)
       @core_options = core_options
       @cores = {}
       @reader = reader
@@ -59,7 +59,6 @@ def initialize(core_options, reader, writer, url_schema: nil, publish_all_diagno
       @exit = false
       @signature_enabled = true
       @url_schema = url_schema || (File::ALT_SEPARATOR != "\\" ? "file://" : "file:///")
-      @publish_all_diagnostics = publish_all_diagnostics # TODO: implement more dedicated publish feature
       @diagnostic_severity = :error
     end
 
@@ -238,21 +237,22 @@ def exit
       @exit = true
     end
 
-    def publish_diagnostics(uri)
-      (@publish_all_diagnostics ? @open_texts : [[uri, @open_texts[uri]]]).each do |uri, text|
+    def publish_updated_diagnostics
+      @cores.each do |_, core|
         diags = []
-        if text
-          @cores.each do |_, core|
-            core.diagnostics(text.path) do |diag|
-              diags << diag.to_lsp(severity: @diagnostic_severity)
-            end
+        core.process_diagnostic_paths do |path|
+          uri = path_to_uri(path)
+          next false unless @open_texts[uri]
+          core.diagnostics(path) do |diag|
+            diags << diag.to_lsp(severity: @diagnostic_severity)
           end
+          send_notification(
+            "textDocument/publishDiagnostics",
+            uri: uri,
+            diagnostics: diags
+          )
+          true
         end
-        send_notification(
-          "textDocument/publishDiagnostics",
-          uri: uri,
-          diagnostics: diags
-        )
       end
     end
   end

sig/typeprof.rbs

@@ -21,6 +21,7 @@ module TypeProf
       def completion: (String, untyped, CodePosition) { (untyped) -> untyped } -> Array[untyped]
       def dump_declarations: (String) -> String
       def rename: (String, CodePosition) -> void
+      def process_diagnostic_paths: { (String) -> bool } -> void
     end
   end
 end

test/lsp/lsp_test.rb

@@ -95,9 +95,6 @@ def foo(nnn)
       )
 
       expect_request("workspace/codeLens/refresh") {|json| }
-      expect_notification("textDocument/publishDiagnostics") do |json|
-        assert_equal([], json[:diagnostics])
-      end
 
       notify(
         "textDocument/didClose",
@@ -120,9 +117,6 @@ def foo(nnn)
       )
 
       expect_request("workspace/codeLens/refresh") {|json| }
-      expect_notification("textDocument/publishDiagnostics") do |json|
-        assert_equal([], json[:diagnostics])
-      end
 
       id = request(
         "textDocument/hover",
@@ -146,9 +140,6 @@ def foo(nnn)
       )
 
       expect_request("workspace/codeLens/refresh") {|json| }
-      expect_notification("textDocument/publishDiagnostics") do |json|
-        assert_equal([], json[:diagnostics])
-      end
 
       id = request(
         "textDocument/hover",
@@ -176,17 +167,75 @@ def foo(nnn)
 
       expect_request("workspace/codeLens/refresh") {|json| }
       expect_notification("textDocument/publishDiagnostics") do |json|
-        assert_equal([
-          {
-            message: "wrong number of arguments (2 for 1)",
-            range: {
-              start: { line: 4, character: 0 },
-              end: { line: 4, character: 3 },
+        assert_equal({
+          uri: @folder + "basic.rb",
+          diagnostics: [
+            {
+              message: "wrong number of arguments (2 for 1)",
+              range: {
+                start: { line: 4, character: 0 },
+                end: { line: 4, character: 3 },
+              },
+              severity: 1,
+              source: "TypeProf",
+            }
+          ],
+        }, json)
+      end
+    end
+
+    def test_diagnostics2
+      init("basic")
+
+      notify(
+        "textDocument/didOpen",
+        textDocument: { uri: @folder + "basic1.rb", version: 0, text: <<-END },
+def check(nnn)
+  nnn
+end
+        END
+      )
+      expect_request("workspace/codeLens/refresh") {|json| }
+
+      notify(
+        "textDocument/didOpen",
+        textDocument: { uri: @folder + "basic2.rb", version: 0, text: <<-END },
+check(1, 2)
+        END
+      )
+
+      expect_request("workspace/codeLens/refresh") {|json| }
+      expect_notification("textDocument/publishDiagnostics") do |json|
+        assert_equal({
+          uri: @folder + "basic2.rb",
+          diagnostics: [
+            {
+              message: "wrong number of arguments (2 for 1)",
+              range: {
+                start: { line: 0, character: 0 },
+                end: { line: 0, character: 5 },
+              },
+              severity: 1,
+              source: "TypeProf",
             },
-            severity: 1,
-            source: "TypeProf",
+          ],
+        }, json)
+      end
+
+      notify(
+        "textDocument/didChange",
+        textDocument: { uri: @folder + "basic1.rb", version: 1 },
+        contentChanges: [
+          {
+            range: { start: { line: 0, character: 13 }, end: { line: 0, character: 13 }},
+            text: ", mmm", # def check(nnn) => def check(nnn, mmm)
           }
-        ], json[:diagnostics])
+        ]
+      )
+
+      expect_request("workspace/codeLens/refresh") {|json| }
+      expect_notification("textDocument/publishDiagnostics") do |json|
+        assert_equal({ uri: @folder + "basic2.rb", diagnostics: [] }, json)
       end
     end
 
@@ -215,7 +264,6 @@ def test(x)
       )
 
       expect_request("workspace/codeLens/refresh") {|json| }
-      expect_notification("textDocument/publishDiagnostics") {|json| }
 
       id = request(
         "textDocument/completion",