Merge branch 'master' of github.com:sekiguchi-nagisa/arsh

sekiguchi-nagisa · Feb 25, 2025 · b8a5406 · b8a5406
2 parents d65ea80 + 5fd23bc
commit b8a5406
Show file tree

Hide file tree

Showing 32 changed files with 313 additions and 125 deletions.
diff --git a/test/analyzer/cases/cancel.test b/test/analyzer/cases/cancel.test
@@ -0,0 +1,70 @@
+# RUN: call $cmd --test $self --log info
+
+{"id": 0, "jsonrpc": "2.0", "method": "initialize",
+ "params": {"capabilities": {}, "rootUri": "file:///test", "processId": 46}}
+
+#    CHECK: {
+# CHECK_IF:     "capabilities": {
+# CHECK_IF: }
+
+<<<
+{"jsonrpc": "2.0", "method": "textDocument/didOpen",
+ "params": {
+    "textDocument": {"languageId": "arsh", "version": 1, "uri": "file:///test/test.ds",
+                     "text": "var ZZZ = $false; { var ZAAA = 34; var ZE22 = 23; var Z000 = 23;"}
+ }
+}
+
+<<<
+{"jsonrpc": "2.0", "method": "$/sleep",
+ "params": {
+    "msec": 200
+ }
+}
+
+<<<
+{"id": 1, "jsonrpc": "2.0", "method": "textDocument/completion",
+  "params": {
+    "context": { "triggerKind": 1 },
+    "position": { "character": 2, "line": 1 },
+    "textDocument": { "uri": "file:///test/test/hoge.ds" }
+  }
+}
+
+<<<
+{"jsonrpc": "2.0", "method": "$/cancelRequest",
+ "params": {
+    "id": 1
+ }
+}
+
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32800,
+#    CHECK:     "message": "canceled"
+#    CHECK:   },
+#    CHECK:   "id": 1,
+#    CHECK:   "jsonrpc": "2.0"
+#    CHECK: }
+
+# CHECKERR_RE_IF: ^.+ <info> .+ try cancel: request id=1
+
+# CHECKERR_RE_IF: ^.+ <info> .+ do cancel: request id=1
+
+
+## invalid cancel
+<<<
+{"jsonrpc": "2.0", "method": "$/cancelRequest",
+ "params": {
+    "id": "nothing"
+ }
+}
+
+<<<
+{"id": 2, "jsonrpc": "2.0", "method": "shutdown"}
+
+# CHECK_IF:   "result": null
+#    CHECK: }
+
+<<<
+{"jsonrpc": "2.0", "method": "exit"}
+# STATUS: 0
diff --git a/test/analyzer/cases/change_error.test b/test/analyzer/cases/change_error.test
@@ -27,7 +27,9 @@
 #    CHECK:   "params": {
 #    CHECK:     "diagnostics": [],
 
----
+# CHECKERR_RE_IF: ^.+ <error> .+ broken textDocument: file:///test/not-found
+
+--- 50
 {"id": 2, "jsonrpc": "2.0", "method": "shutdown"}
 
 # CHECK_IF:   "result": null

diff --git a/test/analyzer/cases/completion_error.test b/test/analyzer/cases/completion_error.test
@@ -24,8 +24,12 @@
   }
 }
 
-# CHECK_IF:   "code": -32602,
-#    CHECK:   "message": "broken textDocument: file:///test/test/hoge.ds"
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32602,
+#    CHECK:     "message": "broken textDocument: file:///test/test/hoge.ds"
+#    CHECK:   },
+#    CHECK:   "id": 1,
+#    CHECK:   "jsonrpc": "2.0"
 #    CHECK: }
 
 <<<

diff --git a/test/analyzer/cases/definition_error.test b/test/analyzer/cases/definition_error.test
@@ -26,9 +26,12 @@
   }
 }
 
-# CHECK_IF: {
-# CHECK_IF:   "code": -32602,
-#    CHECK:   "message": "broken position at: file:///test/test.ds:-123:-10000"
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32602,
+#    CHECK:     "message": "broken position at: file:///test/test.ds:-123:-10000"
+#    CHECK:   },
+#    CHECK:   "id": 1,
+#    CHECK:   "jsonrpc": "2.0"
 #    CHECK: }
 
 <<<

diff --git a/test/analyzer/cases/doc_highlight_error.test b/test/analyzer/cases/doc_highlight_error.test
@@ -26,10 +26,15 @@
   }
 }
 
-# CHECK_IF:   "code": -32602,
-#    CHECK:   "message": "broken textDocument: file:///test/test.ds234"
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32602,
+#    CHECK:     "message": "broken textDocument: file:///test/test.ds234"
+#    CHECK:   },
+#    CHECK:   "id": 1,
+#    CHECK:   "jsonrpc": "2.0"
 #    CHECK: }
 
+
 <<<
 {"id": 2, "jsonrpc": "2.0", "method": "shutdown"}
 

diff --git a/test/analyzer/cases/document_link_error.test b/test/analyzer/cases/document_link_error.test
@@ -22,8 +22,12 @@
   }
 }
 
-# CHECK_IF:   "code": -32602,
-#    CHECK:   "message": "broken textDocument: file:///test/test.ds234"
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32602,
+#    CHECK:     "message": "broken textDocument: file:///test/test.ds234"
+#    CHECK:   },
+#    CHECK:   "id": 1,
+#    CHECK:   "jsonrpc": "2.0"
 #    CHECK: }
 
 <<<

diff --git a/test/analyzer/cases/document_symbol_error.test b/test/analyzer/cases/document_symbol_error.test
@@ -22,8 +22,12 @@
   }
 }
 
-# CHECK_IF:   "code": -32602,
-#    CHECK:   "message": "broken textDocument: file:///test/test.ds234"
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32602,
+#    CHECK:     "message": "broken textDocument: file:///test/test.ds234"
+#    CHECK:   },
+#    CHECK:   "id": 1,
+#    CHECK:   "jsonrpc": "2.0"
 #    CHECK: }
 
 <<<

diff --git a/test/analyzer/cases/hover_error.test b/test/analyzer/cases/hover_error.test
@@ -26,8 +26,12 @@
   }
 }
 
-# CHECK_IF:   "code": -32602,
-#    CHECK:   "message": "broken textDocument: file:///test/test.ds234"
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32602,
+#    CHECK:     "message": "broken textDocument: file:///test/test.ds234"
+#    CHECK:   },
+#    CHECK:   "id": 1,
+#    CHECK:   "jsonrpc": "2.0"
 #    CHECK: }
 
 <<<

diff --git a/test/analyzer/cases/initialize_already.test b/test/analyzer/cases/initialize_already.test
@@ -6,8 +6,13 @@
 {"id": 1, "jsonrpc": "2.0", "method": "initialize",
  "params": {"capabilities": {}, "rootUri": "file:///test", "processId": 46}}
 
-# CHECK_IF:   "code": -32600,
-#    CHECK:   "message": "server has already initialized"
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32600,
+#    CHECK:     "message": "server has already initialized"
+#    CHECK:   },
+#    CHECK:   "id": 1,
+#    CHECK:   "jsonrpc": "2.0"
 #    CHECK: }
+
 <<<
 # STATUS: 137
diff --git a/test/analyzer/cases/initialize_error1.test b/test/analyzer/cases/initialize_error1.test
@@ -4,10 +4,13 @@
 {"id": 0, "jsonrpc": "2.0", "method": "initialize",
  "params": {"capabilities---": {}, "rootUri": "file:///test", "processId": 46}}
 
-# CHECK: {
-# CHECK:   "code": -32602,
-# CHECK:   "message": "undefined field `capabilities'"
-# CHECK: }
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32602,
+#    CHECK:     "message": "undefined field `capabilities'"
+#    CHECK:   },
+#    CHECK:   "id": 0,
+#    CHECK:   "jsonrpc": "2.0"
+#    CHECK: }
 
 <<<
 # STATUS: 137
diff --git a/test/analyzer/cases/initialize_error2.test b/test/analyzer/cases/initialize_error2.test
@@ -4,10 +4,13 @@
 {"id": 0, "jsonrpc": "2.0", "method": "initialize",
  "params": {"capabilities": {}, "rootUri": "file:///test", "processId": true}}
 
-# CHECK: {
-# CHECK:   "code": -32602,
-# CHECK:   "message": "require `null', but is `bool'"
-# CHECK: }
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32602,
+#    CHECK:     "message": "require `null', but is `bool'"
+#    CHECK:   },
+#    CHECK:   "id": 0,
+#    CHECK:   "jsonrpc": "2.0"
+#    CHECK: }
 
 <<<
 # STATUS: 137
diff --git a/test/analyzer/cases/invalid_request1.test b/test/analyzer/cases/invalid_request1.test
@@ -3,10 +3,15 @@
 { "fare" : [
     true, false]
 }
-# CHECK: {
-# CHECK:   "code": -32600,
-# CHECK:   "data": "undefined field `jsonrpc'",
-# CHECK:   "message": "Invalid Request"
-# CHECK: }
+
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32600,
+#    CHECK:     "data": "undefined field `jsonrpc'",
+#    CHECK:     "message": "Invalid Request"
+#    CHECK:   },
+#    CHECK:   "id": null,
+#    CHECK:   "jsonrpc": "2.0"
+#    CHECK: }
+
 <<<
 # STATUS: 137
diff --git a/test/analyzer/cases/invalid_request2.test b/test/analyzer/cases/invalid_request2.test
@@ -1,17 +1,29 @@
 # RUN: call $cmd --test $self
 
 23
+
 # CHECK: {
-# CHECK:   "code": -32600,
-# CHECK:   "data": "require `object', but is `long'",
-# CHECK:   "message": "Invalid Request"
+# CHECK:   "error": {
+# CHECK:     "code": -32600,
+# CHECK:     "data": "require `object', but is `long'",
+# CHECK:     "message": "Invalid Request"
+# CHECK:   },
+# CHECK:   "id": null,
+# CHECK:   "jsonrpc": "2.0"
 # CHECK: }
+
 <<<
 { "34" : false}
+
 # CHECK: {
-# CHECK:   "code": -32600,
-# CHECK:   "data": "undefined field `jsonrpc'",
-# CHECK:   "message": "Invalid Request"
+# CHECK:   "error": {
+# CHECK:     "code": -32600,
+# CHECK:     "data": "undefined field `jsonrpc'",
+# CHECK:     "message": "Invalid Request"
+# CHECK:   },
+# CHECK:   "id": null,
+# CHECK:   "jsonrpc": "2.0"
 # CHECK: }
+
 <<<
 # STATUS: 137
diff --git a/test/analyzer/cases/open_error.test b/test/analyzer/cases/open_error.test
@@ -15,7 +15,9 @@
  }
 }
 
----
+# CHECKERR_RE_IF: ^.+ <error> .+ broken uri: hoge hohge
+
+--- 50
 {"id": 2, "jsonrpc": "2.0", "method": "shutdown"}
 
 # CHECK_IF: {

diff --git a/test/analyzer/cases/prepare_rename_error.test b/test/analyzer/cases/prepare_rename_error.test
@@ -32,8 +32,12 @@
   }
 }
 
-# CHECK_IF:   "code": -32602,
-#    CHECK:   "message": "broken position at: file:///test/test.ds:0:-4"
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32602,
+#    CHECK:     "message": "broken position at: file:///test/test.ds:0:-4"
+#    CHECK:   },
+#    CHECK:   "id": 1,
+#    CHECK:   "jsonrpc": "2.0"
 #    CHECK: }
 
 <<<

diff --git a/test/analyzer/cases/reference_error.test b/test/analyzer/cases/reference_error.test
@@ -27,8 +27,12 @@
   }
 }
 
-# CHECK_IF:   "code": -32602,
-#    CHECK:   "message": "broken uri: test.ds not found"
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32602,
+#    CHECK:     "message": "broken uri: test.ds not found"
+#    CHECK:   },
+#    CHECK:   "id": 1,
+#    CHECK:   "jsonrpc": "2.0"
 #    CHECK: }
 
 <<<

diff --git a/test/analyzer/cases/rename_error1.test b/test/analyzer/cases/rename_error1.test
@@ -43,8 +43,12 @@
   }
 }
 
-# CHECK_IF:   "code": -32602,
-#    CHECK:   "message": "broken position at: file:///test/test.ds:-23:3"
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32602,
+#    CHECK:     "message": "broken position at: file:///test/test.ds:-23:3"
+#    CHECK:   },
+#    CHECK:   "id": 1,
+#    CHECK:   "jsonrpc": "2.0"
 #    CHECK: }
 
 
@@ -62,11 +66,14 @@
   }
 }
 
-# CHECK_IF:   "code": -32803,
-#    CHECK:   "message": "cannot perform rename since builtin symbol"
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32803,
+#    CHECK:     "message": "cannot perform rename since builtin symbol"
+#    CHECK:   },
+#    CHECK:   "id": 2,
+#    CHECK:   "jsonrpc": "2.0"
 #    CHECK: }
 
-
 # rename failed since no symbol
 
 <<<
@@ -81,11 +88,14 @@
   }
 }
 
-# CHECK_IF:   "code": -32803,
-#    CHECK:   "message": "rename target must be symbol"
+# CHECK_IF:   "error": {
+#    CHECK:     "code": -32803,
+#    CHECK:     "message": "rename target must be symbol"
+#    CHECK:   },
+#    CHECK:   "id": 3,
+#    CHECK:   "jsonrpc": "2.0"
 #    CHECK: }
 
-
 <<<
 {"id": 5, "jsonrpc": "2.0", "method": "shutdown"}
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,9 @@ @@
      }
     }
-    ---
+    # CHECKERR_RE_IF: ^.+ <error> .+ broken uri: hoge hohge
+    --- 50
     {"id": 2, "jsonrpc": "2.0", "method": "shutdown"}
     # CHECK_IF: {
@@ Expand Down @@