From 64e496fac94073c437b288b46f220d1f4806f0c3 Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Mon, 22 Aug 2016 17:32:31 +0200
Subject: [PATCH] Update

---
 composer.json                                 |   7 +-
 src/Protocol/ClientCapabilites.php            |   8 ++
 src/Protocol/CompletionItem.php               |  79 +++++++++++++
 src/Protocol/CompletionKind.php               |  27 +++++
 src/Protocol/CompletionList.php               |  25 ++++
 src/Protocol/ContentChangeEvent.php           |  32 +++++
 src/Protocol/ErrorCode.php                    |  15 +++
 src/Protocol/FileChangeType.php               |  24 ++++
 src/Protocol/FileEvent.php                    |  23 ++++
 src/Protocol/Hover.php                        |  23 ++++
 src/Protocol/LanguageServer.php               |  25 ++++
 src/Protocol/Message.php                      |  11 ++
 .../Methods/CompletionItem/ResolveRequest.php |  15 +++
 .../Methods/Initialize/InitializeError.php    |  14 +++
 .../Methods/Initialize/InitializeParams.php   |  28 +++++
 .../Methods/Initialize/InitializeRequest.php  |  14 +++
 .../Methods/Initialize/InitializeResponse.php |  15 +++
 src/Protocol/Methods/Telemetry/Event.php      |  12 ++
 .../TextDocument/CompletionRequest.php        |  21 ++++
 .../TextDocument/CompletionResponse.php       |  17 +++
 .../Methods/TextDocument/DidChangeParams.php  |  26 ++++
 .../DidChangeWatchedFilesParams.php           |  19 +++
 .../Methods/TextDocument/DidCloseParams.php   |  21 ++++
 .../Methods/TextDocument/DidSaveParams.php    |  19 +++
 .../Methods/TextDocument/HoverRequest.php     |  13 ++
 .../Methods/TextDocument/HoverResponse.php    |  13 ++
 .../Methods/TextDocument/PositionParams.php   |  26 ++++
 .../Methods/Window/LogMessageParams.php       |  26 ++++
 .../Methods/Window/MessageActionItem.php      |  13 ++
 src/Protocol/Methods/Window/MessageType.php   |  27 +++++
 .../Methods/Window/ShowMessageParams.php      |  20 ++++
 .../Window/ShowMessageRequestParams.php       |  27 +++++
 .../DidChangeConfigurationNotification.php    |  17 +++
 .../DidChangeConfigurationParams.php          |  15 +++
 src/Protocol/Notification.php                 |  24 ++++
 src/Protocol/Params.php                       |   8 ++
 .../ProtocolServer.php}                       |  39 +++---
 src/Protocol/PublishDiagnosticParams.php      |  26 ++++
 src/Protocol/Request.php                      |  43 +++++++
 src/Protocol/Response.php                     |  26 ++++
 src/Protocol/ResponseError.php                |  26 ++++
 src/Protocol/ServerCapabilities.php           | 111 ++++++++++++++++++
 .../ServerCapabilities/CodeLensOptions.php    |  16 +++
 .../ServerCapabilities/CompletionOptions.php  |  24 ++++
 .../DocumentOnTypeFormattingOptions.php       |  23 ++++
 .../SignatureHelpOptions.php                  |  16 +++
 .../TextDocumentSyncKind.php                  |  25 ++++
 47 files changed, 1106 insertions(+), 18 deletions(-)
 create mode 100644 src/Protocol/ClientCapabilites.php
 create mode 100644 src/Protocol/CompletionItem.php
 create mode 100644 src/Protocol/CompletionKind.php
 create mode 100644 src/Protocol/CompletionList.php
 create mode 100644 src/Protocol/ContentChangeEvent.php
 create mode 100644 src/Protocol/ErrorCode.php
 create mode 100644 src/Protocol/FileChangeType.php
 create mode 100644 src/Protocol/FileEvent.php
 create mode 100644 src/Protocol/Hover.php
 create mode 100644 src/Protocol/LanguageServer.php
 create mode 100644 src/Protocol/Message.php
 create mode 100644 src/Protocol/Methods/CompletionItem/ResolveRequest.php
 create mode 100644 src/Protocol/Methods/Initialize/InitializeError.php
 create mode 100644 src/Protocol/Methods/Initialize/InitializeParams.php
 create mode 100644 src/Protocol/Methods/Initialize/InitializeRequest.php
 create mode 100644 src/Protocol/Methods/Initialize/InitializeResponse.php
 create mode 100644 src/Protocol/Methods/Telemetry/Event.php
 create mode 100644 src/Protocol/Methods/TextDocument/CompletionRequest.php
 create mode 100644 src/Protocol/Methods/TextDocument/CompletionResponse.php
 create mode 100644 src/Protocol/Methods/TextDocument/DidChangeParams.php
 create mode 100644 src/Protocol/Methods/TextDocument/DidChangeWatchedFilesParams.php
 create mode 100644 src/Protocol/Methods/TextDocument/DidCloseParams.php
 create mode 100644 src/Protocol/Methods/TextDocument/DidSaveParams.php
 create mode 100644 src/Protocol/Methods/TextDocument/HoverRequest.php
 create mode 100644 src/Protocol/Methods/TextDocument/HoverResponse.php
 create mode 100644 src/Protocol/Methods/TextDocument/PositionParams.php
 create mode 100644 src/Protocol/Methods/Window/LogMessageParams.php
 create mode 100644 src/Protocol/Methods/Window/MessageActionItem.php
 create mode 100644 src/Protocol/Methods/Window/MessageType.php
 create mode 100644 src/Protocol/Methods/Window/ShowMessageParams.php
 create mode 100644 src/Protocol/Methods/Window/ShowMessageRequestParams.php
 create mode 100644 src/Protocol/Methods/Workspace/DidChangeConfigurationNotification.php
 create mode 100644 src/Protocol/Methods/Workspace/DidChangeConfigurationParams.php
 create mode 100644 src/Protocol/Notification.php
 create mode 100644 src/Protocol/Params.php
 rename src/{LanguageServer.php => Protocol/ProtocolServer.php} (51%)
 create mode 100644 src/Protocol/PublishDiagnosticParams.php
 create mode 100644 src/Protocol/Request.php
 create mode 100644 src/Protocol/Response.php
 create mode 100644 src/Protocol/ResponseError.php
 create mode 100644 src/Protocol/ServerCapabilities.php
 create mode 100644 src/Protocol/ServerCapabilities/CodeLensOptions.php
 create mode 100644 src/Protocol/ServerCapabilities/CompletionOptions.php
 create mode 100644 src/Protocol/ServerCapabilities/DocumentOnTypeFormattingOptions.php
 create mode 100644 src/Protocol/ServerCapabilities/SignatureHelpOptions.php
 create mode 100644 src/Protocol/ServerCapabilities/TextDocumentSyncKind.php

diff --git a/composer.json b/composer.json
index 3fccf7b..fbe3aae 100644
--- a/composer.json
+++ b/composer.json
@@ -5,13 +5,18 @@
     "bin": ["bin/main.php"],
     "minimum-stability": "dev",
     "require": {
+        "php": ">=7.0",
         "nikic/php-parser": "3.0.0alpha1",
         "phpdocumentor/reflection-docblock": "^3.0",
-        "sabre/event": "^3.0"
+        "sabre/event": "^3.0",
+        "netresearch/jsonmapper": "^0.11.0"
     },
     "autoload": {
         "psr-4": {
             "LanguageServer\\": "src/"
         }
+    },
+    "require-dev": {
+        "squizlabs/php_codesniffer": "^2.6"
     }
 }
diff --git a/src/Protocol/ClientCapabilites.php b/src/Protocol/ClientCapabilites.php
new file mode 100644
index 0000000..746791d
--- /dev/null
+++ b/src/Protocol/ClientCapabilites.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+class ClientCapabilites
+{
+
+}
diff --git a/src/Protocol/CompletionItem.php b/src/Protocol/CompletionItem.php
new file mode 100644
index 0000000..6c68644
--- /dev/null
+++ b/src/Protocol/CompletionItem.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+class CompletionItem
+{
+    /**
+     * The label of this completion item. By default
+     * also the text that is inserted when selecting
+     * this completion.
+     *
+     * @var string
+     */
+    public $label;
+
+    /**
+     * The kind of this completion item. Based of the kind
+     * an icon is chosen by the editor.
+     *
+     * @var number|null
+     */
+    public $kind;
+
+    /**
+     * A human-readable string with additional information
+     * about this item, like type or symbol information.
+     *
+     * @var string|null
+     */
+    public $detail;
+
+    /**
+     * A human-readable string that represents a doc-comment.
+     *
+     * @var string|null
+     */
+    public $documentation;
+
+    /**
+     * A string that shoud be used when comparing this item
+     * with other items. When `falsy` the label is used.
+     *
+     * @var string|null
+     */
+    public $sortText;
+
+    /**
+     * A string that should be used when filtering a set of
+     * completion items. When `falsy` the label is used.
+     *
+     * @var string|null
+     */
+    public $filterText;
+
+    /**
+     * A string that should be inserted a document when selecting
+     * this completion. When `falsy` the label is used.
+     *
+     * @var string|null
+     */
+    public $insertText;
+
+    /**
+     * An edit which is applied to a document when selecting
+     * this completion. When an edit is provided the value of
+     * insertText is ignored.
+     *
+     * @var TextEdit|null
+     */
+    public $textEdit;
+
+    /**
+     * An data entry field that is preserved on a completion item between
+     * a completion and a completion resolve request.
+     *
+     * @var mixed
+     */
+    public $data;
+}
diff --git a/src/Protocol/CompletionKind.php b/src/Protocol/CompletionKind.php
new file mode 100644
index 0000000..7121760
--- /dev/null
+++ b/src/Protocol/CompletionKind.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+/**
+ * The kind of a completion entry.
+ */
+abstract class CompletionItemKind {
+    const TEXT = 1;
+    const METHOD = 2;
+    const _FUNCTION = 3;
+    const CONSTRUCTOR = 4;
+    const FIELD = 5;
+    const VARIABLE = 6;
+    const _CLASS = 7;
+    const _INTERFACE = 8;
+    const MODULE = 9;
+    const PROPERTY = 10;
+    const UNIT = 11;
+    const VALUE = 12;
+    const ENUM = 13;
+    const KEYWORD = 14;
+    const SNIPPET = 15;
+    const COLOR = 16;
+    const FILE = 17;
+    const REFERENCE = 18;
+}
diff --git a/src/Protocol/CompletionList.php b/src/Protocol/CompletionList.php
new file mode 100644
index 0000000..a725144
--- /dev/null
+++ b/src/Protocol/CompletionList.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+/**
+ * Represents a collection of [completion items](#CompletionItem) to be presented in
+ * the editor.
+ */
+class CompletionList
+{
+    /**
+     * This list it not complete. Further typing should result in recomputing this
+     * list.
+     *
+     * @var bool
+     */
+    public $isIncomplete;
+
+    /**
+     * The completion items.
+     *
+     * @var CompletionItem[]
+     */
+    public $items;
+}
diff --git a/src/Protocol/ContentChangeEvent.php b/src/Protocol/ContentChangeEvent.php
new file mode 100644
index 0000000..2d99a27
--- /dev/null
+++ b/src/Protocol/ContentChangeEvent.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+/**
+ * An event describing a change to a text document. If range and rangeLength are
+ * omitted the new text is considered to be the full content of the document.
+ */
+class ContentChangeEvent
+{
+
+    /**
+     * The range of the document that changed.
+     *
+     * @var Range|null
+     */
+    public $range;
+
+    /**
+     * The length of the range that got replaced.
+     *
+     * @var int|null
+     */
+    public $rangeLength;
+
+    /**
+     * The new text of the document.
+     *
+     * @var string
+     */
+    public $text;
+}
diff --git a/src/Protocol/ErrorCode.php b/src/Protocol/ErrorCode.php
new file mode 100644
index 0000000..d667fec
--- /dev/null
+++ b/src/Protocol/ErrorCode.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * Enum
+ */
+abstract class ErrorCode
+{
+    const PARSE_ERROR = -32700;
+    const INVALID_REQUEST = -32600;
+    const METHOD_NOT_FOUND = -32601;
+    const INVALID_PARAMS = -32602;
+    const INTERNAL_ERROR = -32603;
+    const SERVER_ERROR_START = -32099;
+    const SERVER_ERROR_END = -32000;
+}
diff --git a/src/Protocol/FileChangeType.php b/src/Protocol/FileChangeType.php
new file mode 100644
index 0000000..631c4e7
--- /dev/null
+++ b/src/Protocol/FileChangeType.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * The file event type. Enum
+ */
+abstract class FileChangeType
+{
+    /**
+     * The file got created.
+     */
+    const CREATED = 1;
+
+    /**
+     * The file got changed.
+     */
+    const CHANGED = 2;
+
+    /**
+     * The file got deleted.
+     */
+    const DELETED = 3;
+}
diff --git a/src/Protocol/FileEvent.php b/src/Protocol/FileEvent.php
new file mode 100644
index 0000000..cff008b
--- /dev/null
+++ b/src/Protocol/FileEvent.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+/**
+ * An event describing a file change.
+ */
+class FileEvent
+{
+    /**
+     * The file's URI.
+     *
+     * @var string
+     */
+    public $uri;
+
+    /**
+     * The change type.
+     *
+     * @var int
+     */
+    public $type;
+}
diff --git a/src/Protocol/Hover.php b/src/Protocol/Hover.php
new file mode 100644
index 0000000..cde5d37
--- /dev/null
+++ b/src/Protocol/Hover.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * The result of a hover request.
+ */
+class Hover
+{
+    /**
+     * The hover's content
+     *
+     * @var string|string[]|MarkedString|MarkedString[]
+     */
+    public $contents;
+
+    /**
+     * An optional range
+     *
+     * @var Range|null
+     */
+    public $range;
+}
diff --git a/src/Protocol/LanguageServer.php b/src/Protocol/LanguageServer.php
new file mode 100644
index 0000000..c6a99c0
--- /dev/null
+++ b/src/Protocol/LanguageServer.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace LanguageServer;
+
+use LanguageServer\Protocol\ProtocolServer;
+
+/**
+ * Enum
+ */
+abstract class ParsingMode {
+    const HEADERS = 1;
+    const BODY = 2;
+}
+
+class LanguageServer extends ProtocolServer
+{
+    public function listen()
+    {
+        $this->on('initialize', function (InitializeRequest $req) {
+            $res = new InitializeResponse();
+            $this->sendResponse($res);
+        });
+        parent::listen();
+    }
+}
diff --git a/src/Protocol/Message.php b/src/Protocol/Message.php
new file mode 100644
index 0000000..e043c49
--- /dev/null
+++ b/src/Protocol/Message.php
@@ -0,0 +1,11 @@
+<?php
+
+abstract class Message
+{
+    /**
+     * The version (2.0)
+     *
+     * @var string
+     */
+    public $jsonrpc;
+}
diff --git a/src/Protocol/Methods/CompletionItem/ResolveRequest.php b/src/Protocol/Methods/CompletionItem/ResolveRequest.php
new file mode 100644
index 0000000..0143bd6
--- /dev/null
+++ b/src/Protocol/Methods/CompletionItem/ResolveRequest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\CompletionItem\ResolveRequest;
+
+/**
+ * The request is sent from the client to the server to resolve additional
+ * information for a given completion item.
+ */
+class CompletionItemResolveRequest
+{
+    /**
+     * @var CompletionItem
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/Initialize/InitializeError.php b/src/Protocol/Methods/Initialize/InitializeError.php
new file mode 100644
index 0000000..8a8e005
--- /dev/null
+++ b/src/Protocol/Methods/Initialize/InitializeError.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\Initialize;
+
+class InitializeError
+{
+    /*
+     * Indicates whether the client should retry to send the initilize request after
+     * showing the message provided in the ResponseError.
+     *
+     * @var bool
+     */
+    public $retry;
+}
diff --git a/src/Protocol/Methods/Initialize/InitializeParams.php b/src/Protocol/Methods/Initialize/InitializeParams.php
new file mode 100644
index 0000000..9c0e899
--- /dev/null
+++ b/src/Protocol/Methods/Initialize/InitializeParams.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\Initialize;
+
+class InitializeParams
+{
+
+    /**
+     * The rootPath of the workspace. Is null if no folder is open.
+     *
+     * @var string
+     */
+    public $rootPath;
+
+    /**
+     * The process Id of the parent process that started the server.
+     *
+     * @var number
+     */
+    public $processId;
+
+    /**
+     * The capabilities provided by the client (editor)
+     *
+     * @var ClientCapabilities
+     */
+    public $capabilities;
+}
diff --git a/src/Protocol/Methods/Initialize/InitializeRequest.php b/src/Protocol/Methods/Initialize/InitializeRequest.php
new file mode 100644
index 0000000..905dfd9
--- /dev/null
+++ b/src/Protocol/Methods/Initialize/InitializeRequest.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\InitializeRequest;
+
+/*
+ * The initialize request is sent as the first request from the client to the server.
+ */
+class CompletionItemResolveRequest
+{
+    /**
+     * @var InitializeParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/Initialize/InitializeResponse.php b/src/Protocol/Methods/Initialize/InitializeResponse.php
new file mode 100644
index 0000000..e4f927c
--- /dev/null
+++ b/src/Protocol/Methods/Initialize/InitializeResponse.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\Initialize;
+
+use LanguageServer\Protocol\Response;
+
+class InitializeResponse extends Response
+{
+    /**
+     * The capabilities the language server provides.
+     *
+     * @var ServerCapabilities
+     */
+    public $capabilites;
+}
diff --git a/src/Protocol/Methods/Telemetry/Event.php b/src/Protocol/Methods/Telemetry/Event.php
new file mode 100644
index 0000000..51dac89
--- /dev/null
+++ b/src/Protocol/Methods/Telemetry/Event.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace LanguageServer\Protocol\Telementry;
+
+/**
+ * The telemetry notification is sent from the server to the client to ask the client
+ * to log a telemetry event.
+ */
+class EventParams
+{
+
+}
diff --git a/src/Protocol/Methods/TextDocument/CompletionRequest.php b/src/Protocol/Methods/TextDocument/CompletionRequest.php
new file mode 100644
index 0000000..28142d1
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/CompletionRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Request;
+
+/*
+ * The Completion request is sent from the client to the server to compute completion
+ * items at a given cursor position. Completion items are presented in the
+ * [IntelliSense](https://code.visualstudio.com/docs/editor/editingevolved#_intellisense)
+ * user interface. If computing full completion items is expensive, servers can
+ * additionally provide a handler for the completion item resolve request. This
+ * request is sent when a completion item is selected in the user interface.
+ */
+class CompletionRequest extends Request
+{
+    /**
+     * @var PositionParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/CompletionResponse.php b/src/Protocol/Methods/TextDocument/CompletionResponse.php
new file mode 100644
index 0000000..73b760f
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/CompletionResponse.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+/**
+ * Diagnostics notification are sent from the server to the client to signal results
+ * of validation runs.
+ */
+class PublishDiagnosticsParams extends Response
+{
+    /**
+     * @var CompletionItem[]|CompletionList
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/TextDocument/DidChangeParams.php b/src/Protocol/Methods/TextDocument/DidChangeParams.php
new file mode 100644
index 0000000..fc135c1
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DidChangeParams.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+/**
+ * The log message notification is sent from the server to the client to ask the
+ * client to log a particular message.
+ */
+class DidChangeParams
+{
+    /**
+     * The document that did change. The version number points
+     * to the version after all provided content changes have
+     * been applied.
+     *
+     * @var VersionedTextDocumentIdentifier
+     */
+    public $textDocument;
+
+    /**
+     * The actual content changes.
+     *
+     * @var ContentChangeEvent[]
+     */
+    public $contentChanges;
+}
diff --git a/src/Protocol/Methods/TextDocument/DidChangeWatchedFilesParams.php b/src/Protocol/Methods/TextDocument/DidChangeWatchedFilesParams.php
new file mode 100644
index 0000000..f4be07f
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DidChangeWatchedFilesParams.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+/**
+ * The watched files notification is sent from the client to the server when the
+ * client detects changes to files watched by the language client.
+ */
+class DidChangeWatchedFilesParams extends Params
+{
+    /**
+     * The actual file events.
+     *
+     * @var FileEvent[]
+     */
+    public $changes;
+}
diff --git a/src/Protocol/Methods/TextDocument/DidCloseParams.php b/src/Protocol/Methods/TextDocument/DidCloseParams.php
new file mode 100644
index 0000000..b1b693b
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DidCloseParams.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+/**
+ * The document close notification is sent from the client to the server when the
+ * document got closed in the client. The document's truth now exists where the
+ * document's uri points to (e.g. if the document's uri is a file uri the truth now
+ * exists on disk).
+ */
+class DidCloseTextDocumentParams extends Params
+{
+    /**
+     * The document that was closed.
+     *
+     * @var TextDocumentIdentifier
+     */
+    public $textDocument;
+}
diff --git a/src/Protocol/Methods/TextDocument/DidSaveParams.php b/src/Protocol/Methods/TextDocument/DidSaveParams.php
new file mode 100644
index 0000000..91a3dca
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DidSaveParams.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+/**
+ * The document save notification is sent from the client to the server when the
+ * document was saved in the client.
+ */
+class DidSaveTextDocumentParams extends Params
+{
+    /**
+     * The document that was closed.
+     *
+     * @var TextDocumentIdentifier
+     */
+    public $textDocument;
+}
diff --git a/src/Protocol/Methods/TextDocument/HoverRequest.php b/src/Protocol/Methods/TextDocument/HoverRequest.php
new file mode 100644
index 0000000..86a1f0b
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/HoverRequest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument\HoverRequest;
+
+use LanguageServer\Protocol\Request;
+
+class HoverRequest extends Request
+{
+    /**
+     * @var PositionParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/HoverResponse.php b/src/Protocol/Methods/TextDocument/HoverResponse.php
new file mode 100644
index 0000000..7e37442
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/HoverResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+class HoverResponse extends Response
+{
+    /**
+     * @var Hover
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/TextDocument/PositionParams.php b/src/Protocol/Methods/TextDocument/PositionParams.php
new file mode 100644
index 0000000..cdcb7ec
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/PositionParams.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\RequestParams;
+
+/*
+ * A parameter literal used in requests to pass a text document and a position inside
+ * that document.
+ */
+class TextDocumentPositionParams extends RequestParams
+{
+    /**
+     * The text document.
+     *
+     * @var TextDocumentIdentifier
+     */
+    public $textDocument;
+
+    /**
+     * The position inside the text document.
+     *
+     * @var Position
+     */
+    public $position;
+}
diff --git a/src/Protocol/Methods/Window/LogMessageParams.php b/src/Protocol/Methods/Window/LogMessageParams.php
new file mode 100644
index 0000000..bcdc64b
--- /dev/null
+++ b/src/Protocol/Methods/Window/LogMessageParams.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace LanguageServer\Protocol\Window;
+
+use LanguageServer\Protocol\RequestParams;
+
+/**
+ * The log message notification is sent from the server to the client to ask the
+ * client to log a particular message.
+ */
+class LogMessageParams extends RequestParams
+{
+    /**
+     * The message type. See {@link MessageType}
+     *
+     * @var number
+     */
+    public $type;
+
+    /**
+     * The actual message
+     *
+     * @var string
+     */
+    public $message;
+}
diff --git a/src/Protocol/Methods/Window/MessageActionItem.php b/src/Protocol/Methods/Window/MessageActionItem.php
new file mode 100644
index 0000000..3dd276a
--- /dev/null
+++ b/src/Protocol/Methods/Window/MessageActionItem.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Window;
+
+class ShowMessageParams
+{
+    /**
+     * A short title like 'Retry', 'Open Log' etc.
+     *
+     * @var string
+     */
+    public $title;
+}
diff --git a/src/Protocol/Methods/Window/MessageType.php b/src/Protocol/Methods/Window/MessageType.php
new file mode 100644
index 0000000..a7d8195
--- /dev/null
+++ b/src/Protocol/Methods/Window/MessageType.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Enum
+ */
+abstract class MessageType
+{
+    /**
+     * An error message.
+     */
+    const ERROR = 1;
+
+    /**
+     * A warning message.
+     */
+    const WARNING = 2;
+
+    /**
+     * An information message.
+     */
+    const INFO = 3;
+
+    /**
+     * A log message.
+     */
+    const LOG = 4;
+}
diff --git a/src/Protocol/Methods/Window/ShowMessageParams.php b/src/Protocol/Methods/Window/ShowMessageParams.php
new file mode 100644
index 0000000..ae0ee16
--- /dev/null
+++ b/src/Protocol/Methods/Window/ShowMessageParams.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace LanguageServer\Protocol\Window;
+
+class ShowMessageParams
+{
+    /**
+     * The message type. See {@link MessageType}.
+     *
+     * @var int
+     */
+    public $type;
+
+    /**
+     * The actual message.
+     *
+     * @var string
+     */
+    public $message;
+}
diff --git a/src/Protocol/Methods/Window/ShowMessageRequestParams.php b/src/Protocol/Methods/Window/ShowMessageRequestParams.php
new file mode 100644
index 0000000..426e95d
--- /dev/null
+++ b/src/Protocol/Methods/Window/ShowMessageRequestParams.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace LanguageServer\Protocol\Window;
+
+class ShowMessageParams
+{
+    /**
+     * The message type. See {@link MessageType}
+     *
+     * @var int
+     */
+    public $type;
+
+    /**
+     * The actual message
+     *
+     * @var string
+     */
+    public $message;
+
+    /**
+     * The message action items to present.
+     *
+     * @var MessageActionItem[]|null
+     */
+    public $actions;
+}
diff --git a/src/Protocol/Methods/Workspace/DidChangeConfigurationNotification.php b/src/Protocol/Methods/Workspace/DidChangeConfigurationNotification.php
new file mode 100644
index 0000000..a72d538
--- /dev/null
+++ b/src/Protocol/Methods/Workspace/DidChangeConfigurationNotification.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\InitializeRequest;
+
+use LanguageServer\Protocol\Notification;
+
+/**
+ * A notification sent from the client to the server to signal the change of
+ * configuration settings.
+ */
+class DidChangeConfigurationNotification extends Notification
+{
+    /**
+     * @var DidChangeConfigurationParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/Workspace/DidChangeConfigurationParams.php b/src/Protocol/Methods/Workspace/DidChangeConfigurationParams.php
new file mode 100644
index 0000000..a5fd8e1
--- /dev/null
+++ b/src/Protocol/Methods/Workspace/DidChangeConfigurationParams.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace LanguageServer\Protocol\Workspace;
+
+use LanguageServer\Protocol\Params;
+
+class DidChangeConfigurationParams extends Params
+{
+    /**
+     * The actual changed settings
+     *
+     * @var mixed
+     */
+    public $settings;
+}
diff --git a/src/Protocol/Notification.php b/src/Protocol/Notification.php
new file mode 100644
index 0000000..6d3a310
--- /dev/null
+++ b/src/Protocol/Notification.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * A notification message. A processed notification message must not send a response
+ * back. They work like events.
+ */
+abstract class Notification extends Message
+{
+    /**
+     * The method to be invoked.
+     *
+     * @var string
+     */
+    public $method;
+
+    /**
+     * The notification's params.
+     *
+     * @var mixed|null
+     */
+    public $params;
+}
diff --git a/src/Protocol/Params.php b/src/Protocol/Params.php
new file mode 100644
index 0000000..96004a4
--- /dev/null
+++ b/src/Protocol/Params.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+abstract class Params
+{
+
+}
diff --git a/src/LanguageServer.php b/src/Protocol/ProtocolServer.php
similarity index 51%
rename from src/LanguageServer.php
rename to src/Protocol/ProtocolServer.php
index 09a70e8..e664e3a 100644
--- a/src/LanguageServer.php
+++ b/src/Protocol/ProtocolServer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer;
+namespace LanguageServer\Protocol;
 
 use Sabre\Event\Loop;
 use Sabre\Event\EventEmitter;
@@ -10,13 +10,17 @@ abstract class ParsingMode {
     const BODY = 2;
 }
 
-class LanguageServer extends EventEmitter
+class ProtocolServer extends EventEmitter
 {
     private $input;
     private $output;
+    private $buffer = '';
+    private $parsingMode = ParsingMode::HEADERS;
+    private $headers = [];
+    private $contentLength = 0;
 
     /**
-     * @param resource $input The input stream
+     * @param resource $input  The input stream
      * @param resource $output The output stream
      */
     public function __construct($input, $output)
@@ -27,31 +31,27 @@ class LanguageServer extends EventEmitter
 
     public function listen()
     {
-        $buffer = '';
-        $parsingMode = ParsingMode::HEADERS;
-        $headers = [];
-        $contentLength = 0;
 
-        Loop\addReadStream($this->input, function() use ($buffer, $parsingMode, $headers, $contentLength) {
-            $buffer .= fgetc($this->output);
+        Loop\addReadStream($this->input, function() {
+            $this->buffer .= fgetc($this->output);
             switch ($parsingMode) {
                 case ParsingMode::HEADERS:
                     if (substr($buffer, -4) === '\r\n\r\n') {
-                        $parsingMode = ParsingMode::BODY;
-                        $contentLength = (int)$headers['Content-Length'];
-                        $buffer = '';
+                        $this->parsingMode = ParsingMode::BODY;
+                        $this->contentLength = (int)$headers['Content-Length'];
+                        $this->buffer = '';
                     } else if (substr($buffer, -2) === '\r\n') {
                         $parts = explode(': ', $buffer);
                         $headers[$parts[0]] = $parts[1];
-                        $buffer = '';
+                        $this->buffer = '';
                     }
                     break;
                 case ParsingMode::BODY:
                     if (strlen($buffer) === $contentLength) {
-                        $body = json_decode($buffer);
-                        $this->emit($body->method, [$body->params]);
-                        $parsingMode = ParsingMode::HEADERS;
-                        $buffer = '';
+                        $req = Request::parse($body);
+                        $this->emit($body->method, [$req]);
+                        $this->parsingMode = ParsingMode::HEADERS;
+                        $this->buffer = '';
                     }
                     break;
             }
@@ -59,4 +59,9 @@ class LanguageServer extends EventEmitter
 
         Loop\run();
     }
+
+    public function sendResponse(Response $res)
+    {
+        fwrite($this->output, json_encode($res));
+    }
 }
diff --git a/src/Protocol/PublishDiagnosticParams.php b/src/Protocol/PublishDiagnosticParams.php
new file mode 100644
index 0000000..d81382c
--- /dev/null
+++ b/src/Protocol/PublishDiagnosticParams.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\RequestParams;
+
+/**
+ * Diagnostics notification are sent from the server to the client to signal results
+ * of validation runs.
+ */
+class PublishDiagnosticsParams extends RequestParams
+{
+    /**
+     * The URI for which diagnostic information is reported.
+     *
+     * @var string
+     */
+    public $uri;
+
+    /**
+     * An array of diagnostic information items.
+     *
+     * @var Diagnostic[]
+     */
+    public $diagnostics;
+}
diff --git a/src/Protocol/Request.php b/src/Protocol/Request.php
new file mode 100644
index 0000000..92f209f
--- /dev/null
+++ b/src/Protocol/Request.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+use JsonMapper;
+
+class Request extends Message
+{
+    /**
+     * @var int|string
+     */
+    public $id;
+
+    /**
+     * @var string
+     */
+    public $method;
+
+    /**
+     * @var object
+     */
+    public $params;
+
+    public static function parse(string $body)
+    {
+        $mapper = new JsonMapper();
+        $request->id = $decoded->id;
+        $request->method = $decoded->method;
+        $pascalCasedMethod = ucfirst($decoded->method);
+        $namespace = __NAMESPACE__ . '\\' . str_replace('/', '\\', $pascalCasedMethod);
+        $className = end(explode('\\', $request->method)) . 'Params';
+        $fullyQualifiedName = $namespace . $className;
+        $mapper->classMap['RequestParams'] = $fullyQualifiedName;
+        $request = $mapper->map(json_decode($body), new self());
+        if (class_exists($fullyQualifiedName)) {
+            $request->params = new $fullyQualifiedName();
+        }
+        foreach ($request->params as $key => $value) {
+            $request->{$key} = $value;
+        }
+        return $request;
+    }
+}
diff --git a/src/Protocol/Response.php b/src/Protocol/Response.php
new file mode 100644
index 0000000..3401e47
--- /dev/null
+++ b/src/Protocol/Response.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+class Response extends Message
+{
+    /**
+     * @var int|string
+     */
+    public $id;
+
+    /**
+     * @var string
+     */
+    public $method;
+
+    /**
+     * @var object|null
+     */
+    public $params;
+
+    /**
+     * @var ResponseError|null
+     */
+    public $error;
+}
diff --git a/src/Protocol/ResponseError.php b/src/Protocol/ResponseError.php
new file mode 100644
index 0000000..134d955
--- /dev/null
+++ b/src/Protocol/ResponseError.php
@@ -0,0 +1,26 @@
+<?php
+
+class ResponseError
+{
+    /**
+     * A number indicating the error type that occurred.
+     *
+     * @var int
+     */
+    public $code;
+
+    /**
+     * A string providing a short description of the error.
+     *
+     * @var string
+     */
+    public $message;
+
+    /**
+     * A Primitive or Structured value that contains additional information about the
+     * error. Can be omitted.
+     *
+     * @var mixed
+     */
+    public $data;
+}
diff --git a/src/Protocol/ServerCapabilities.php b/src/Protocol/ServerCapabilities.php
new file mode 100644
index 0000000..dbc66f4
--- /dev/null
+++ b/src/Protocol/ServerCapabilities.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+class ServerCapabilites
+{
+    /**
+     * Defines how text documents are synced.
+     *
+     * @var int|null
+     */
+    public $textDocumentSync;
+
+    /**
+     * The server provides hover support.
+     *
+     * @var bool|null
+     */
+    public $hoverProvider;
+
+    /**
+     * The server provides completion support.
+     *
+     * @var CompletionOptions|null
+     */
+    public $completionProvider;
+
+    /**
+     * The server provides signature help support.
+     *
+     * @var SignatureHelpOptions|null
+     */
+    public $signatureHelpProvider;
+
+    /**
+     * The server provides goto definition support.
+     *
+     * @var bool|null
+     */
+    public $definitionProvider;
+
+    /**
+     * The server provides find references support.
+     *
+     * @var bool|null
+     */
+    public $referencesProvider;
+
+    /**
+     * The server provides document highlight support.
+     *
+     * @var bool|null
+     */
+    public $documentHighlightProvider;
+
+    /**
+     * The server provides document symbol support.
+     *
+     * @var bool|null
+     */
+    public $documentSymbolProvider;
+
+    /**
+     * The server provides workspace symbol support.
+     *
+     * @var bool|null
+     */
+    public $workspaceSymbolProvider;
+
+    /**
+     * The server provides code actions.
+     *
+     * @var bool|null
+     */
+    public $codeActionProvider;
+
+    /**
+     * The server provides code lens.
+     *
+     * @var CodeLensOptions|null
+     */
+    public $codeLensProvider;
+
+    /**
+     * The server provides document formatting.
+     *
+     * @var bool|null
+     */
+    public $documentFormattingProvider;
+
+    /**
+     * The server provides document range formatting.
+     *
+     * @var bool|null
+     */
+    public $documentRangeFormattingProvider;
+
+    /**
+     * The server provides document formatting on typing.
+     *
+     * @var DocumentOnTypeFormattingOptions|null
+     */
+    public $documentOnTypeFormattingProvider;
+
+    /**
+     * The server provides rename support.
+     *
+     * @var bool|null
+     */
+    public $renameProvidern;
+}
diff --git a/src/Protocol/ServerCapabilities/CodeLensOptions.php b/src/Protocol/ServerCapabilities/CodeLensOptions.php
new file mode 100644
index 0000000..6dd9019
--- /dev/null
+++ b/src/Protocol/ServerCapabilities/CodeLensOptions.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\Initialize\ServerCapabilities;
+
+/**
+ * Code Lens options.
+ */
+class CodeLensOptions
+{
+    /**
+     * Code lens has a resolve provider as well.
+     *
+     * @var bool|null
+     */
+    public $resolveProvider;
+}
diff --git a/src/Protocol/ServerCapabilities/CompletionOptions.php b/src/Protocol/ServerCapabilities/CompletionOptions.php
new file mode 100644
index 0000000..7fd10a1
--- /dev/null
+++ b/src/Protocol/ServerCapabilities/CompletionOptions.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\Initialize\ServerCapabilities;
+
+/**
+ * Completion options.
+ */
+class CompletionOptions
+{
+    /*
+     * The server provides support to resolve additional information for a completion
+     * item.
+     *
+     * @var bool
+     */
+    public $resolveProvider;
+
+    /**
+     * The characters that trigger completion automatically.
+     *
+     * @var string|null
+     */
+    public $triggerCharacters;
+}
diff --git a/src/Protocol/ServerCapabilities/DocumentOnTypeFormattingOptions.php b/src/Protocol/ServerCapabilities/DocumentOnTypeFormattingOptions.php
new file mode 100644
index 0000000..f726266
--- /dev/null
+++ b/src/Protocol/ServerCapabilities/DocumentOnTypeFormattingOptions.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\Initialize\ServerCapabilities;
+
+/**
+ * Format document on type options
+ */
+class DocumentOnTypeFormattingOptions
+{
+    /**
+     * A character on which formatting should be triggered, like `}`.
+     *
+     * @var string
+     */
+    public $firstTriggerCharacter;
+
+    /**
+     * More trigger characters.
+     *
+     * @var string[]|null
+     */
+    public $moreTriggerCharacter;
+}
diff --git a/src/Protocol/ServerCapabilities/SignatureHelpOptions.php b/src/Protocol/ServerCapabilities/SignatureHelpOptions.php
new file mode 100644
index 0000000..513b3d4
--- /dev/null
+++ b/src/Protocol/ServerCapabilities/SignatureHelpOptions.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\Initialize\ServerCapabilities;
+
+/**
+ * Signature help options.
+ */
+class SignatureHelpOptions
+{
+    /**
+     * The characters that trigger signature help automatically.
+     *
+     * @var string[]|null
+     */
+    public $triggerCharacters;
+}
diff --git a/src/Protocol/ServerCapabilities/TextDocumentSyncKind.php b/src/Protocol/ServerCapabilities/TextDocumentSyncKind.php
new file mode 100644
index 0000000..93b7b0c
--- /dev/null
+++ b/src/Protocol/ServerCapabilities/TextDocumentSyncKind.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\Initialize\ServerCapabilities;
+
+/**
+ * Defines how the host (editor) should sync document changes to the language server.
+ */
+abstract class TextDocumentSyncKind
+{
+    /**
+     * Documents should not be synced at all.
+     */
+    const NONE = 0;
+
+    /**
+     * Documents are synced by always sending the full content of the document.
+     */
+    const FULL = 1;
+
+    /*
+     * Documents are synced by sending the full content on open. After that only
+     * incremental updates to the document are sent.
+     */
+    const INCREMENTAL = 2;
+}