Merge pull request #714 from REditorSupport/ignore-didSave-without-didOpen

Ignore did save without did open

Author: renkun-ken

R/handlers-textsync.R

@@ -67,6 +67,13 @@ text_document_did_save <- function(self, params) {
     text <- params[["text"]]
     uri <- uri_escape_unicode(textDocument[["uri"]])
     logger$info("did save:", list(uri = uri))
+
+    # https://github.com/microsoft/language-server-protocol/issues/2110
+    # follow dbaeumer's take on not handling files that weren't claimed before didSave
+    if (!self$workspace$documents$has(uri)) {
+        return(NULL)
+    }
+
     path <- path_from_uri(uri)
     if (!is.null(text)) {
         content <- stringi::stri_split_lines(text)[[1]]
@@ -75,13 +82,8 @@ text_document_did_save <- function(self, params) {
     } else {
         content <- NULL
     }
-    if (self$workspace$documents$has(uri)) {
-        doc <- self$workspace$documents$get(uri)
-        doc$set_content(doc$version, content)
-    } else {
-        doc <- Document$new(uri, language = NULL, version = NULL, content = content)
-        self$workspace$documents$set(uri, doc)
-    }
+    doc <- self$workspace$documents$get(uri)
+    doc$set_content(doc$version, content)
     doc$did_open()
     self$text_sync(uri, document = doc, run_lintr = TRUE, parse = TRUE)
 }

tests/testthat/test-call-hierarchy.R

@@ -9,7 +9,7 @@ test_that("Call hierarchy works in single file", {
         "fun <- function(x) { foo(x) + bar(x) + 1 }"
     ), single_file)
 
-    client %>% did_save(single_file)
+    client %>% did_open(single_file)
 
     result <- client %>% respond_prepare_call_hierarchy(
         single_file, c(0, 1), retry_when = function(result) length(result) == 0)
@@ -74,8 +74,8 @@ test_that("Call hierarchy works in multiple files", {
         "fun <- function(x) { foo(x) + bar(x) + 1 }"
     ), file2)
 
-    client %>% did_save(file1)
-    client %>% did_save(file2)
+    client %>% did_open(file1)
+    client %>% did_open(file2)
 
     result <- client %>% respond_prepare_call_hierarchy(
         file2, c(0, 22), retry_when = function(result) length(result) == 0)
@@ -120,7 +120,7 @@ test_that("Call hierarchy incoming calls works", {
         "fun <- function(x) { foo(x) + bar(x) + foo(bar(x)) }"
     ), single_file)
 
-    client %>% did_save(single_file)
+    client %>% did_open(single_file)
 
     items <- client %>% respond_prepare_call_hierarchy(
         single_file, c(0, 1), retry_when = function(result) length(result) == 0)
@@ -183,7 +183,7 @@ test_that("Call hierarchy outgoing calls works", {
         "fun <- function(x) { foo(x) + bar(x) + foo(bar(x)) }"
     ), single_file)
 
-    client %>% did_save(single_file)
+    client %>% did_open(single_file)
 
     items <- client %>% respond_prepare_call_hierarchy(
         single_file, c(2, 1), retry_when = function(result) length(result) == 0)

tests/testthat/test-color.R

@@ -18,7 +18,7 @@ test_that("Document color works", {
         temp_file
     )
 
-    client %>% did_save(temp_file)
+    client %>% did_open(temp_file)
 
     result <- client %>% respond_document_color(temp_file)
     expect_length(result, 5)
@@ -65,7 +65,7 @@ test_that("Document color works in Rmarkdown", {
         temp_file
     )
 
-    client %>% did_save(temp_file)
+    client %>% did_open(temp_file)
 
     result <- client %>% respond_document_color(temp_file)
     expect_length(result, 5)