Changeset ebe0f0d

Timestamp:

Apr 6, 2020, 1:28:00 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

057298e

Parents:

b52abe0

Message:

Added basic language server which now properly communicates with the client

Location:

tools

Files:

• langserver/src/json.hpp (modified) (1 diff)
• langserver/src/main.cpp (modified) (4 diffs)
• langserver/src/server.cpp (added)
• langserver/src/server.hpp (modified) (1 diff)
• vscode/uwaterloo.cforall-0.1.0/client/main.js (modified) (2 diffs)
• vscode/uwaterloo.cforall-0.1.0/package.json (modified) (1 diff)

tools/langserver/src/json.hpp

@@ -4 +4 @@
 
 namespace json {
-      auto parse(const std::vector<char> & buff) {
+      static inline auto parse(const std::vector<char> & buff) {
             return nlohmann::json::parse(buff.begin(), buff.end());
       }

tools/langserver/src/main.cpp

@@ +1 @@
+#include <cstdio>
+
 #include <iostream>
 #include <string>
 #include <vector>
 
+#include <unistd.h>
+
 #include "json.hpp"
 #include "log.hpp"
+#include "server.hpp"
 
 static void request(std::vector<char> & buf);
+static void reply(const json::obj & );
 
-namespace server {
-        json::obj init(const json::obj & ) {
-                return {
-                        { "capabilities", json::obj::array() },
-                        { "serverInfo", {
-                                { "name", "Cforall Language Server" },
-                                { "version", "0.1" }
-                        }}
-                };
-        }
+json::obj noop( const json::obj & ) {
+        return {};
 }
 
 std::unordered_map<std::string, json::obj (*)( const json::obj & )> actions {
-        { "initialize", server::init }
+        { "initialize", server::init },
+        { "initialized", noop }
 };
 
@@ -32 +31 @@
                 log() << "\t- " << argv[i] << std::endl;
         }
+
+        // std::cout.setf(std::ios::unitbuf);
+
+        // char buff[1000];
+        // int r = 0;
+        // while(0 != (r = read(STDIN_FILENO, buff, 1000))) {
+        //      for(int i = 0; i < r; i++) {
+        //              log() << buff[i];
+        //      }
+        // }
+        // log() << std::endl;
+
+        // return 0;
 
         std::vector<char> buffer;
@@ -53 +65 @@
                                 response["error"] = error;
                         }
-                        log() << "Responding with : " << response.dump(4) << std::endl;
-                        std::cout << response.dump() << std::endl;
+
+                        reply(response);
                 }
                 else {
@@ -86 +98 @@
         buffer.resize( len + 2 );
         std::cin.read(buffer.data(), buffer.size());
+
+        for(char c : buffer) {
+                log() << c;
+        }
+        log() << std::endl;
         return;
 }
+
+static void reply( const json::obj & response) {
+        if(response["result"].is_null()) {
+                log() << "No response needed" << std::endl;
+                return;
+        }
+
+        log() << "Responding with : " << response.dump(4) << std::endl;
+        const std::string & r = response.dump();
+        std::cout << "Content-Length: " << r.length() << "\r\n\r\n";
+        std::cout.flush();
+        std::cout  << r << "\r\n";
+        std::cout.flush();
+}

tools/langserver/src/server.hpp

@@ +1 @@
+#pragma once
+
+#include "json.hpp"
+
+namespace server {
+        json::obj init(const json::obj & );
+};

tools/vscode/uwaterloo.cforall-0.1.0/client/main.js

@@ -23 +23 @@
         // Otherwise the run options are used
         let serverOptions = {
-                run: { command: 'cfa-ls', transport: vscode_lc.TransportKind.ipc },
+                run: { command: 'cfa-ls', transport: vscode_lc.TransportKind.stdio },
                 debug: {
                         command: 'cfa-ls',
-                        transport: vscode_lc.TransportKind.ipc,
+                        transport: vscode_lc.TransportKind.stdio,
                         options: debugOptions
                 }
@@ -32 +32 @@
 
         // Options to control the language client
+        let selector = [{ scheme: 'file', language: 'cforall' }];
         let clientOptions = {
-                // Register the server for plain text documents
-                documentSelector: [{ scheme: 'file', language: 'cforall' }]
+                // Register the server for cforall documents
+                documentSelector: selector
         };
 
         // Create the language client and start the client.
         client = new vscode_lc.LanguageClient(
-                'CforallServer',
+                'cforall',
                 'Cforall Language Server',
                 serverOptions,

tools/vscode/uwaterloo.cforall-0.1.0/package.json

@@ -43 +43 @@
                                 "path": "./syntaxes/cfa.tmLanguage.json"
                         }
-                ]
-        },
-        "configuration": {
-                "type": "object",
-                "title": "Example configuration",
-                "properties": {
-                        "languageServerExample.maxNumberOfProblems": {
-                                "scope": "resource",
-                                "type": "number",
-                                "default": 100,
-                                "description": "Controls the maximum number of problems produced by the server."
+                ],
+                "configuration": {
+                        "type": "object",
+                        "title": "Example configuration",
+                        "properties": {
+                                "cforall.maxNumberOfProblems": {
+                                        "scope": "resource",
+                                        "type": "number",
+                                        "default": 100,
+                                        "description": "Controls the maximum number of problems produced by the server."
+                                },
+                                "cforall.trace.server": {
+                                        "scope": "window",
+                                        "type": "string",
+                                        "enum": [
+                                                "off",
+                                                "messages",
+                                                "verbose"
+                                        ],
+                                        "default": "off",
+                                        "description": "Traces the communication between VS Code and the language server."
+                                }
                         }
                 }