add tests and fix code actions

jryans · Feb 9, 2023 · fc37990 · fc37990
1 parent 5f283eb
commit fc37990
Show file tree

Hide file tree

Showing 27 changed files with 725 additions and 17 deletions.
diff --git a/doc-trace.rkt b/doc-trace.rkt
@@ -104,9 +104,9 @@
           #:edit (WorkspaceEdit
                   #:changes
                   (hasheq (string->symbol (path->uri src-obj))
-                          (TextEdit #:range (Range #:start (abs-pos->Pos doc-text start)
-                                                   #:end   (abs-pos->Pos doc-text finish))
-                                    #:newText "_")))))
+                          (list (TextEdit #:range (Range #:start (abs-pos->Pos doc-text start)
+                                                         #:end   (abs-pos->Pos doc-text start))
+                                          #:newText "_"))))))
 
         (set-add! warn-diags diag)))
     (define/override (syncheck:add-mouse-over-status src-obj start finish text)

diff --git a/tests/client.rkt b/tests/client.rkt
@@ -1,14 +1,16 @@
-#lang racket/base
+#lang racket
 
 ;; This module provides a simple incomplete lsp client for test.
 
 (provide with-racket-lsp
+         Lsp?
          client-send
          client-wait-response
          make-request
          make-notification)
 
 (require racket/os
+         json
          "../msg-io.rkt")
 
 (struct Lsp
@@ -23,12 +25,13 @@
   (for ([str (in-port read-line in)])
     (displayln (format "LSP ERROR: ~a" str) (current-error-port))))
 
-;; (-> string? (-> Lsp? any/c) void?)
-(define (with-racket-lsp path thunk)
+(define/contract (with-racket-lsp path proc)
+  (-> string? (-> Lsp? any/c) void?)
+
   (define racket-path (find-executable-path "racket"))
   (define-values (sp stdout stdin stderr)
     (subprocess #f #f #f racket-path path))
-  (define err-thd (thread (forward-errors stderr)))
+  (define _err-thd (thread (forward-errors stderr)))
   (define lsp (Lsp stdout stdin stderr))
 
   (define init-req
@@ -38,7 +41,7 @@
   (client-send lsp init-req)
   (client-wait-response lsp)
 
-  (thunk (Lsp stdout stdin stderr))
+  (proc (Lsp stdout stdin stderr))
 
   (define shutdown-req
     (make-request lsp "shutdown" #f))
@@ -47,25 +50,38 @@
 
   (define exit-notf (make-notification "exit" #f))
   (client-send lsp exit-notf)
-  (client-wait-response lsp)
+  (client-should-no-response lsp)
 
   (subprocess-wait sp))
 
-(define (client-send lsp req)
+(define/contract (client-send lsp req)
+  (-> Lsp? jsexpr? void?)
+
   (display-message/flush req (Lsp-stdin lsp)))
 
-(define (client-wait-response lsp)
+(define/contract (client-wait-response lsp)
+  (-> Lsp? jsexpr?)
+
   (read-message (Lsp-stdout lsp)))
 
-(define (make-request lsp method params)
+(define/contract (client-should-no-response lsp)
+  (-> Lsp? eof-object?)
+
+  (read-message (Lsp-stdout lsp)))
+
+(define/contract (make-request lsp method params)
+  (-> Lsp? string? jsexpr? jsexpr?)
+
   (define req
     (hasheq 'jsonrpc "2.0"
             'id (Lsp-genid lsp)
             'method method))
   (cond [(not params) req]
         [else (hash-set req 'params params)]))
 
-(define (make-notification method params)
+(define/contract (make-notification method params)
+  (-> string? jsexpr? jsexpr?)
+
   (define req
     (hasheq 'jsonrpc "2.0"
             'method method))

diff --git a/tests/lifecycle/test-main.rkt b/tests/lifecycle/test-main.rkt
@@ -30,7 +30,7 @@
   (define racket-path (find-executable-path "racket"))
   (define-values (sp stdout stdin stderr)
     (subprocess #f #f #f racket-path "-t" "../../main.rkt"))
-  (define err-thd (thread (forward-errors stderr)))
+  (define _err-thd (thread (forward-errors stderr)))
 
   ;; Initialize request
   (display-message/flush init-req stdin)

diff --git a/tests/textDocument/code-action/code-action.rkt b/tests/textDocument/code-action/code-action.rkt
@@ -0,0 +1,24 @@
+#lang racket
+
+(require "../with-document.rkt"
+         chk
+         json)
+
+(define uri "file:///test.rkt")
+
+(define code
+  #<<END
+#lang racket/base
+
+(define x 0)
+END
+  )
+
+(module+ test
+  (with-document "../../../main.rkt" uri code
+    (λ (lsp)
+      (let ([req (read-json (open-input-file "req1.json"))]
+            [resp (read-json (open-input-file "resp1.json"))])
+        (client-send lsp req)
+
+        (chk #:= (client-wait-response lsp) resp)))))
diff --git a/tests/textDocument/code-action/req1.json b/tests/textDocument/code-action/req1.json
@@ -0,0 +1,23 @@
+{
+    "id": 0,
+    "jsonrpc": "2.0",
+    "method": "textDocument/codeAction",
+    "params": {
+        "context": {
+            "diagnostics": []
+        },
+        "range": {
+            "end": {
+                "character": 9,
+                "line": 2
+            },
+            "start": {
+                "character": 8,
+                "line": 2
+            }
+        },
+        "textDocument": {
+            "uri": "file:///test.rkt"
+        }
+    }
+}
diff --git a/tests/textDocument/code-action/resp1.json b/tests/textDocument/code-action/resp1.json
@@ -0,0 +1,47 @@
+{
+    "id": 0,
+    "jsonrpc": "2.0",
+    "result": [
+        {
+            "diagnostics": [
+                {
+                    "message": "unused variable",
+                    "range": {
+                        "end": {
+                            "character": 9,
+                            "line": 2
+                        },
+                        "start": {
+                            "character": 8,
+                            "line": 2
+                        }
+                    },
+                    "severity": 3,
+                    "source": "file:///test.rkt"
+                }
+            ],
+            "edit": {
+                "changes": {
+                    "file:///test.rkt": [
+                        {
+                            "newText": "_",
+                            "range": {
+                                "end": {
+                                    "character": 8,
+                                    "line": 2
+                                },
+                                "start": {
+                                    "character": 8,
+                                    "line": 2
+                                }
+                            }
+                        }
+                    ]
+                }
+            },
+            "isPreferred": false,
+            "kind": "quickfix",
+            "title": "Add prefix `_` to ignore"
+        }
+    ]
+}
diff --git a/tests/textDocument/completion/change-req.json b/tests/textDocument/completion/change-req.json
@@ -0,0 +1,26 @@
+{
+    "jsonrpc": "2.0",
+    "method": "textDocument/didChange",
+    "params": {
+        "contentChanges": [
+            {
+                "range": {
+                    "end": {
+                        "character": 0,
+                        "line": 2
+                    },
+                    "start": {
+                        "character": 0,
+                        "line": 2
+                    }
+                },
+                "rangeLength": 0,
+                "text": "()"
+            }
+        ],
+        "textDocument": {
+            "uri": "file:///test.rkt",
+            "version": 1
+        }
+    }
+}
diff --git a/tests/textDocument/completion/comp-req.json b/tests/textDocument/completion/comp-req.json
@@ -0,0 +1,18 @@
+{
+    "id": 0,
+    "jsonrpc": "2.0",
+    "method": "textDocument/completion",
+    "params": {
+        "context": {
+            "triggerCharacter": "(",
+            "triggerKind": 2
+        },
+        "position": {
+            "character": 1,
+            "line": 2
+        },
+        "textDocument": {
+            "uri": "file:///test.rkt"
+        }
+    }
+}
diff --git a/tests/textDocument/completion/completion.rkt b/tests/textDocument/completion/completion.rkt
@@ -0,0 +1,39 @@
+#lang racket
+
+(require "../with-document.rkt"
+         "../../../json-util.rkt"
+         chk
+         json)
+
+(define uri "file:///test.rkt")
+
+(define code
+  #<<END
+#lang racket/base
+END
+  )
+
+(module+ test
+  (with-document "../../../main.rkt" uri code
+    (λ (lsp)
+
+      ;; completion requires a document change.
+      ;; only move cursor to that position is not enough.
+      (define didchange-req (read-json (open-input-file "change-req.json")))
+      (client-send lsp didchange-req)
+      (client-wait-response lsp)
+
+      (define comp-req (read-json (open-input-file "comp-req.json")))
+      (client-send lsp comp-req)
+      ;; we only verify the returned completion item list
+      ;; meet some conditions
+      (let ([resp (client-wait-response lsp)])
+        (chk (jsexpr-has-key? resp '(result)))
+        (define result (jsexpr-ref resp '(result)))
+        (chk (list? result))
+        (chk (for/and ([item result])
+               (jsexpr-has-key? item '(label))))
+        (chk (for/and ([item result])
+               (string? (jsexpr-ref item '(label)))))
+        (chk (for/and ([item result])
+               (not (string=? "" (jsexpr-ref item '(label))))))))))
diff --git a/tests/textDocument/find-symbol/definition-req1.json b/tests/textDocument/find-symbol/definition-req1.json
@@ -0,0 +1,14 @@
+{
+    "id": 0,
+    "jsonrpc": "2.0",
+    "method": "textDocument/definition",
+    "params": {
+        "position": {
+            "character": 2,
+            "line": 5
+        },
+        "textDocument": {
+            "uri": "file:///test.rkt"
+        }
+    }
+}
diff --git a/tests/textDocument/find-symbol/definition-resp1.json b/tests/textDocument/find-symbol/definition-resp1.json
@@ -0,0 +1,17 @@
+{
+    "id": 0,
+    "jsonrpc": "2.0",
+    "result": {
+        "range": {
+            "end": {
+                "character": 8,
+                "line": 4
+            },
+            "start": {
+                "character": 7,
+                "line": 4
+            }
+        },
+        "uri": "file:///test.rkt"
+    }
+}
diff --git a/tests/textDocument/find-symbol/highlight-req1.json b/tests/textDocument/find-symbol/highlight-req1.json
@@ -0,0 +1,14 @@
+{
+    "id": 0,
+    "jsonrpc": "2.0",
+    "method": "textDocument/documentHighlight",
+    "params": {
+        "position": {
+            "character": 2,
+            "line": 5
+        },
+        "textDocument": {
+            "uri": "file:///test.rkt"
+        }
+    }
+}
diff --git a/tests/textDocument/find-symbol/highlight-resp1.json b/tests/textDocument/find-symbol/highlight-resp1.json
@@ -0,0 +1,30 @@
+{
+    "id": 0,
+    "jsonrpc": "2.0",
+    "result": [
+        {
+            "range": {
+                "end": {
+                    "character": 3,
+                    "line": 5
+                },
+                "start": {
+                    "character": 2,
+                    "line": 5
+                }
+            }
+        },
+        {
+            "range": {
+                "end": {
+                    "character": 8,
+                    "line": 4
+                },
+                "start": {
+                    "character": 7,
+                    "line": 4
+                }
+            }
+        }
+    ]
+}
diff --git a/tests/textDocument/find-symbol/ref-req1.json b/tests/textDocument/find-symbol/ref-req1.json
@@ -0,0 +1,17 @@
+{
+    "id": 0,
+    "jsonrpc": "2.0",
+    "method": "textDocument/references",
+    "params": {
+        "context": {
+            "includeDeclaration": true
+        },
+        "position": {
+            "character": 7,
+            "line": 4
+        },
+        "textDocument": {
+            "uri": "file:///test.rkt"
+        }
+    }
+}