Additional language client tests

tests/CMakeLists.txt

@@ -90,6 +90,7 @@ if(BUILD_TESTING)
   add_test(language_protocol_client_test language_protocol_client_test)
 
   add_executable(language_protocol_server_test language_protocol_server_test.cpp)
+  target_link_libraries(language_protocol_server_test Boost::filesystem)
 endif()
 
 if(BUILD_FUZZING)

tests/language_protocol_client_test.cpp

@@ -1,4 +1,3 @@
-#include "config.hpp"
 #include "source_language_protocol.hpp"
 #include <glib.h>
 
@@ -31,16 +30,61 @@ int main() {
 
   view->get_buffer()->insert_at_cursor(" ");
   g_assert(view->get_buffer()->get_text() == R"( fn main() {
-    println!("Hello, world!");
+    let a = 2;
+    println!("{}", a);
 }
 )");
 
   view->format_style(false);
   g_assert(view->get_buffer()->get_text() == R"(fn main() {
-    println!("Hello, world!");
+    let a = 2;
+    println!("{}", a);
 }
 )");
 
+  g_assert(view->get_declaration_location);
+  auto location = view->get_declaration_location();
+  g_assert(location);
+  g_assert(location.file_path == "main.rs");
+  g_assert_cmpuint(location.line, ==, 0);
+  g_assert_cmpuint(location.index, ==, 3);
+
+  g_assert(view->get_type_declaration_location);
+  location = view->get_type_declaration_location();
+  g_assert(location);
+  g_assert(location.file_path == "main.rs");
+  g_assert_cmpuint(location.line, ==, 0);
+  g_assert_cmpuint(location.index, ==, 4);
+
+  g_assert(view->get_implementation_locations);
+  auto locations = view->get_implementation_locations();
+  g_assert(locations.size() == 2);
+  g_assert(locations[0].file_path == "main.rs");
+  g_assert(locations[1].file_path == "main.rs");
+  g_assert_cmpuint(locations[0].line, ==, 0);
+  g_assert_cmpuint(locations[0].index, ==, 0);
+  g_assert_cmpuint(locations[1].line, ==, 1);
+  g_assert_cmpuint(locations[1].index, ==, 0);
+
+  g_assert(view->get_usages);
+  auto usages = view->get_usages();
+  g_assert(usages.size() == 2);
+  g_assert(usages[0].first.file_path == view->file_path);
+  g_assert(usages[1].first.file_path == view->file_path);
+  g_assert_cmpuint(usages[0].first.line, ==, 1);
+  g_assert_cmpuint(usages[0].first.index, ==, 8);
+  g_assert_cmpuint(usages[1].first.line, ==, 2);
+  g_assert_cmpuint(usages[1].first.index, ==, 19);
+  g_assert(usages[0].second == "let <b>a</b> = 2;");
+  g_assert(usages[1].second == "println!(&quot;{}&quot;, <b>a</b>);");
+
+  g_assert(view->get_methods);
+  auto methods = view->get_methods();
+  g_assert(methods.size() == 1);
+  g_assert_cmpuint(methods[0].first.line, ==, 0);
+  g_assert_cmpuint(methods[0].first.index, ==, 0);
+  g_assert(methods[0].second == "1: <b>main</b>");
+
   std::atomic<int> exit_status(-1);
   view->client->on_exit_status = [&exit_status](int exit_status_) {
     exit_status = exit_status_;

tests/language_protocol_server_test.cpp

@@ -1,3 +1,4 @@
+#include <boost/filesystem.hpp>
 #include <boost/property_tree/json_parser.hpp>
 #include <iostream>
 
@@ -12,6 +13,9 @@ int main() {
   _setmode(_fileno(stdout), _O_BINARY);
 #endif
 
+  auto tests_path = boost::filesystem::canonical(JUCI_TESTS_PATH);
+  auto file_path = boost::filesystem::canonical(tests_path / "language_protocol_test_files" / "main.rs");
+
   std::string line;
   try {
     // Read initialize and respond
@@ -41,17 +45,10 @@ int main() {
       "selectionRangeProvider": "true",
       "hoverProvider": "true",
       "completionProvider": {
-                "triggerCharacters": [
+        "triggerCharacters": [":", ".", "'"]
-                    ":",
-                    ".",
-                    "'"
-                ]
       },
       "signatureHelpProvider": {
-                "triggerCharacters": [
+        "triggerCharacters": ["(", ","]
-                    "(",
-                    ","
-                ]
       },
       "definitionProvider": "true",
       "typeDefinitionProvider": "true",
@@ -77,11 +74,7 @@ int main() {
       "documentFormattingProvider": "true",
       "documentOnTypeFormattingProvider": {
         "firstTriggerCharacter": "=",
-                "moreTriggerCharacter": [
+        "moreTriggerCharacter": [".", ">", "{"]
-                    ".",
-                    ">",
-                    "{"
-                ]
       },
       "renameProvider": {
         "prepareProvider": "true"
@@ -94,7 +87,7 @@ int main() {
               {
                 "scheme": "file",
                 "pattern": {
-                                    "glob": "**\/*.rs",
+                  "glob": "**/*.rs",
                   "matches": "file"
                 }
               },
@@ -194,9 +187,7 @@ int main() {
         "onEnter": "true",
         "parentModule": "true",
         "runnables": {
-                    "kinds": [
+          "kinds": ["cargo"]
-                        "cargo"
-                    ]
         },
         "workspaceSymbolScopeKindFiltering": "true"
       }
@@ -204,10 +195,10 @@ int main() {
     "serverInfo": {
       "name": "rust-analyzer",
       "version": "3022a2c3a 2021-05-25 dev"
-        },
-        "offsetEncoding": "utf-8"
     }
-})";
+  }
+}
+)";
       std::cout << "Content-Length: " << result.size() << "\r\n\r\n"
                 << result;
     }
@@ -224,7 +215,7 @@ int main() {
       boost::property_tree::ptree pt;
       boost::property_tree::json_parser::read_json(ss, pt);
       if(pt.get<std::string>("method") != "initialized")
-        return 2;
+        return 1;
     }
 
     // Read textDocument/didOpen
@@ -239,7 +230,7 @@ int main() {
       boost::property_tree::ptree pt;
       boost::property_tree::json_parser::read_json(ss, pt);
       if(pt.get<std::string>("method") != "textDocument/didOpen")
-        return 3;
+        return 1;
     }
 
     // Read textDocument/didChange
@@ -254,7 +245,7 @@ int main() {
       boost::property_tree::ptree pt;
       boost::property_tree::json_parser::read_json(ss, pt);
       if(pt.get<std::string>("method") != "textDocument/didChange")
-        return 4;
+        return 1;
     }
 
     // Read and write textDocument/formatting
@@ -269,7 +260,7 @@ int main() {
       boost::property_tree::ptree pt;
       boost::property_tree::json_parser::read_json(ss, pt);
       if(pt.get<std::string>("method") != "textDocument/formatting")
-        return 5;
+        return 1;
 
       std::string result = R"({
   "jsonrpc": "2.0",
@@ -289,7 +280,8 @@ int main() {
       "newText": ""
     }
   ]
-})";
+}
+)";
       std::cout << "Content-Length: " << result.size() << "\r\n\r\n"
                 << result;
     }
@@ -306,7 +298,231 @@ int main() {
       boost::property_tree::ptree pt;
       boost::property_tree::json_parser::read_json(ss, pt);
       if(pt.get<std::string>("method") != "textDocument/didChange")
-        return 6;
+        return 1;
+    }
+
+    // Read and write textDocument/definition
+    {
+      std::getline(std::cin, line);
+      auto size = std::atoi(line.substr(16).c_str());
+      std::getline(std::cin, line);
+      std::string buffer;
+      buffer.resize(size);
+      std::cin.read(&buffer[0], size);
+      std::stringstream ss(buffer);
+      boost::property_tree::ptree pt;
+      boost::property_tree::json_parser::read_json(ss, pt);
+      if(pt.get<std::string>("method") != "textDocument/definition")
+        return 1;
+
+      std::string result = R"({
+  "jsonrpc": "2.0",
+  "id": "2",
+  "result": [
+    {
+      "uri": "file://main.rs",
+      "range": {
+        "start": {
+          "line": "0",
+          "character": "3"
+        },
+        "end": {
+          "line": "0",
+          "character": "7"
+        }
+      }
+    }
+  ]
+}
+)";
+      std::cout << "Content-Length: " << result.size() << "\r\n\r\n"
+                << result;
+    }
+
+    // Read and write textDocument/typeDefinition
+    {
+      std::getline(std::cin, line);
+      auto size = std::atoi(line.substr(16).c_str());
+      std::getline(std::cin, line);
+      std::string buffer;
+      buffer.resize(size);
+      std::cin.read(&buffer[0], size);
+      std::stringstream ss(buffer);
+      boost::property_tree::ptree pt;
+      boost::property_tree::json_parser::read_json(ss, pt);
+      if(pt.get<std::string>("method") != "textDocument/typeDefinition")
+        return 1;
+
+      std::string result = R"({
+  "jsonrpc": "2.0",
+  "id": "3",
+  "result": [
+    {
+      "uri": "file://main.rs",
+      "range": {
+        "start": {
+          "line": "0",
+          "character": "4"
+        },
+        "end": {
+          "line": "0",
+          "character": "7"
+        }
+      }
+    }
+  ]
+}
+)";
+      std::cout << "Content-Length: " << result.size() << "\r\n\r\n"
+                << result;
+    }
+
+    // Read and write textDocument/implementation
+    {
+      std::getline(std::cin, line);
+      auto size = std::atoi(line.substr(16).c_str());
+      std::getline(std::cin, line);
+      std::string buffer;
+      buffer.resize(size);
+      std::cin.read(&buffer[0], size);
+      std::stringstream ss(buffer);
+      boost::property_tree::ptree pt;
+      boost::property_tree::json_parser::read_json(ss, pt);
+      if(pt.get<std::string>("method") != "textDocument/implementation")
+        return 1;
+
+      std::string result = R"({
+  "jsonrpc": "2.0",
+  "id": "4",
+  "result": [
+    {
+      "uri": "file://main.rs",
+      "range": {
+        "start": {
+          "line": "0",
+          "character": "0"
+        },
+        "end": {
+          "line": "0",
+          "character": "1"
+        }
+      }
+    },
+    {
+      "uri": "file://main.rs",
+      "range": {
+        "start": {
+          "line": "1",
+          "character": "0"
+        },
+        "end": {
+          "line": "1",
+          "character": "1"
+        }
+      }
+    }
+  ]
+}
+)";
+      std::cout << "Content-Length: " << result.size() << "\r\n\r\n"
+                << result;
+    }
+
+    // Read and write textDocument/references
+    {
+      std::getline(std::cin, line);
+      auto size = std::atoi(line.substr(16).c_str());
+      std::getline(std::cin, line);
+      std::string buffer;
+      buffer.resize(size);
+      std::cin.read(&buffer[0], size);
+      std::stringstream ss(buffer);
+      boost::property_tree::ptree pt;
+      boost::property_tree::json_parser::read_json(ss, pt);
+      if(pt.get<std::string>("method") != "textDocument/references")
+        return 1;
+
+      std::string result = R"({
+  "jsonrpc": "2.0",
+  "id": "5",
+  "result": [
+    {
+      "uri": "file://)" + file_path.string() +
+                           R"(",
+      "range": {
+        "start": {
+          "line": "2",
+          "character": "19"
+        },
+        "end": {
+          "line": "2",
+          "character": "20"
+        }
+      }
+    },
+    {
+      "uri": "file://)" + file_path.string() +
+                           R"(",
+      "range": {
+        "start": {
+          "line": "1",
+          "character": "8"
+        },
+        "end": {
+          "line": "1",
+          "character": "9"
+        }
+      }
+    }
+  ]
+}
+)";
+      std::cout << "Content-Length: " << result.size() << "\r\n\r\n"
+                << result;
+    }
+
+    // Read and write textDocument/references
+    {
+      std::getline(std::cin, line);
+      auto size = std::atoi(line.substr(16).c_str());
+      std::getline(std::cin, line);
+      std::string buffer;
+      buffer.resize(size);
+      std::cin.read(&buffer[0], size);
+      std::stringstream ss(buffer);
+      boost::property_tree::ptree pt;
+      boost::property_tree::json_parser::read_json(ss, pt);
+      if(pt.get<std::string>("method") != "textDocument/documentSymbol")
+        return 1;
+
+      std::string result = R"({
+  "jsonrpc": "2.0",
+  "id": "6",
+  "result": [
+    {
+      "name": "main",
+      "kind": "12",
+      "tags": "",
+      "deprecated": "false",
+      "location": {
+        "uri": "file://main.rs",
+        "range": {
+          "start": {
+            "line": "0",
+            "character": "0"
+          },
+          "end": {
+            "line": "3",
+            "character": "1"
+          }
+        }
+      }
+    }
+  ]
+}
+)";
+      std::cout << "Content-Length: " << result.size() << "\r\n\r\n"
+                << result;
     }
 
     // Read textDocument/didClose
@@ -321,7 +537,7 @@ int main() {
       boost::property_tree::ptree pt;
       boost::property_tree::json_parser::read_json(ss, pt);
       if(pt.get<std::string>("method") != "textDocument/didClose")
-        return 7;
+        return 1;
     }
 
     // Read shutdown and respond
@@ -336,11 +552,11 @@ int main() {
       boost::property_tree::ptree pt;
       boost::property_tree::json_parser::read_json(ss, pt);
       if(pt.get<std::string>("method") != "shutdown")
-        return 8;
+        return 1;
 
       std::string result = R"({
   "jsonrpc": "2.0",
-    "id": "2",
+  "id": "7",
   "result": {}
 })";
       std::cout << "Content-Length: " << result.size() << "\r\n\r\n"
@@ -359,11 +575,11 @@ int main() {
       boost::property_tree::ptree pt;
       boost::property_tree::json_parser::read_json(ss, pt);
       if(pt.get<std::string>("method") != "exit")
-        return 9;
+        return 1;
     }
   }
   catch(const std::exception &e) {
     std::cerr << e.what() << std::endl;
-    return 100;
+    return 2;
   }
 }

tests/language_protocol_test_files/main.rs

@@ -1,3 +1,4 @@
 fn main() {
-    println!("Hello, world!");
+    let a = 2;
+    println!("{}", a);
 }