From fb54d5f2ad59d1ffcb8ea274b03137fb1394a252 Mon Sep 17 00:00:00 2001 From: dantleech Date: Sun, 29 Jul 2018 15:59:21 +0100 Subject: [PATCH] Removed Protocol directory --- src/Protocol/ClientCapabilities.php | 27 --- src/Protocol/CodeActionContext.php | 17 -- src/Protocol/CodeLens.php | 35 ---- src/Protocol/CodeLensOptions.php | 16 -- src/Protocol/Command.php | 32 ---- src/Protocol/CompletionContext.php | 30 ---- src/Protocol/CompletionItem.php | 164 ------------------ src/Protocol/CompletionItemKind.php | 70 -------- src/Protocol/CompletionList.php | 35 ---- src/Protocol/CompletionOptions.php | 24 --- src/Protocol/CompletionTriggerKind.php | 16 -- src/Protocol/ContentChangeEvent.php | 31 ---- src/Protocol/DependencyReference.php | 27 --- src/Protocol/Diagnostic.php | 63 ------- src/Protocol/DiagnosticSeverity.php | 26 --- src/Protocol/DocumentHighlight.php | 25 --- src/Protocol/DocumentHighlightKind.php | 24 --- .../DocumentOnTypeFormattingOptions.php | 23 --- src/Protocol/ErrorCode.php | 17 -- src/Protocol/FileChangeType.php | 24 --- src/Protocol/FileEvent.php | 33 ---- src/Protocol/FormattingOptions.php | 25 --- src/Protocol/Hover.php | 33 ---- src/Protocol/InitializeResult.php | 21 --- src/Protocol/Location.php | 43 ----- src/Protocol/MarkedString.php | 22 --- src/Protocol/MessageActionItem.php | 13 -- src/Protocol/MessageType.php | 29 ---- src/Protocol/PackageDescriptor.php | 25 --- src/Protocol/ParameterInformation.php | 39 ----- src/Protocol/Position.php | 65 ------- src/Protocol/Range.php | 59 ------- src/Protocol/ReferenceContext.php | 13 -- src/Protocol/ReferenceInformation.php | 36 ---- src/Protocol/ServerCapabilities.php | 132 -------------- src/Protocol/SignatureHelp.php | 46 ----- src/Protocol/SignatureHelpOptions.php | 16 -- src/Protocol/SignatureInformation.php | 49 ------ src/Protocol/SymbolDescriptor.php | 34 ---- src/Protocol/SymbolInformation.php | 134 -------------- src/Protocol/SymbolKind.php | 28 --- src/Protocol/SymbolLocationInformation.php | 32 ---- .../TextDocumentContentChangeEvent.php | 31 ---- src/Protocol/TextDocumentIdentifier.php | 21 --- src/Protocol/TextDocumentItem.php | 38 ---- src/Protocol/TextDocumentSyncKind.php | 25 --- src/Protocol/TextEdit.php | 31 ---- .../VersionedTextDocumentIdentifier.php | 13 -- src/Protocol/WorkspaceEdit.php | 16 -- 49 files changed, 1828 deletions(-) delete mode 100644 src/Protocol/ClientCapabilities.php delete mode 100644 src/Protocol/CodeActionContext.php delete mode 100644 src/Protocol/CodeLens.php delete mode 100644 src/Protocol/CodeLensOptions.php delete mode 100644 src/Protocol/Command.php delete mode 100644 src/Protocol/CompletionContext.php delete mode 100644 src/Protocol/CompletionItem.php delete mode 100644 src/Protocol/CompletionItemKind.php delete mode 100644 src/Protocol/CompletionList.php delete mode 100644 src/Protocol/CompletionOptions.php delete mode 100644 src/Protocol/CompletionTriggerKind.php delete mode 100644 src/Protocol/ContentChangeEvent.php delete mode 100644 src/Protocol/DependencyReference.php delete mode 100644 src/Protocol/Diagnostic.php delete mode 100644 src/Protocol/DiagnosticSeverity.php delete mode 100644 src/Protocol/DocumentHighlight.php delete mode 100644 src/Protocol/DocumentHighlightKind.php delete mode 100644 src/Protocol/DocumentOnTypeFormattingOptions.php delete mode 100644 src/Protocol/ErrorCode.php delete mode 100644 src/Protocol/FileChangeType.php delete mode 100644 src/Protocol/FileEvent.php delete mode 100644 src/Protocol/FormattingOptions.php delete mode 100644 src/Protocol/Hover.php delete mode 100644 src/Protocol/InitializeResult.php delete mode 100644 src/Protocol/Location.php delete mode 100644 src/Protocol/MarkedString.php delete mode 100644 src/Protocol/MessageActionItem.php delete mode 100644 src/Protocol/MessageType.php delete mode 100644 src/Protocol/PackageDescriptor.php delete mode 100644 src/Protocol/ParameterInformation.php delete mode 100644 src/Protocol/Position.php delete mode 100644 src/Protocol/Range.php delete mode 100644 src/Protocol/ReferenceContext.php delete mode 100644 src/Protocol/ReferenceInformation.php delete mode 100644 src/Protocol/ServerCapabilities.php delete mode 100644 src/Protocol/SignatureHelp.php delete mode 100644 src/Protocol/SignatureHelpOptions.php delete mode 100644 src/Protocol/SignatureInformation.php delete mode 100644 src/Protocol/SymbolDescriptor.php delete mode 100644 src/Protocol/SymbolInformation.php delete mode 100644 src/Protocol/SymbolKind.php delete mode 100644 src/Protocol/SymbolLocationInformation.php delete mode 100644 src/Protocol/TextDocumentContentChangeEvent.php delete mode 100644 src/Protocol/TextDocumentIdentifier.php delete mode 100644 src/Protocol/TextDocumentItem.php delete mode 100644 src/Protocol/TextDocumentSyncKind.php delete mode 100644 src/Protocol/TextEdit.php delete mode 100644 src/Protocol/VersionedTextDocumentIdentifier.php delete mode 100644 src/Protocol/WorkspaceEdit.php diff --git a/src/Protocol/ClientCapabilities.php b/src/Protocol/ClientCapabilities.php deleted file mode 100644 index 5228c7d..0000000 --- a/src/Protocol/ClientCapabilities.php +++ /dev/null @@ -1,27 +0,0 @@ -triggerKind = $triggerKind; - $this->triggerCharacter = $triggerCharacter; - } -} diff --git a/src/Protocol/CompletionItem.php b/src/Protocol/CompletionItem.php deleted file mode 100644 index 64bc69d..0000000 --- a/src/Protocol/CompletionItem.php +++ /dev/null @@ -1,164 +0,0 @@ -label = $label; - $this->kind = $kind; - $this->detail = $detail; - $this->documentation = $documentation; - $this->sortText = $sortText; - $this->filterText = $filterText; - $this->insertText = $insertText; - $this->textEdit = $textEdit; - $this->additionalTextEdits = $additionalTextEdits; - $this->command = $command; - $this->data = $data; - } - - /** - * Creates a CompletionItem for a Definition - * - * @param Definition $def - * @return self - */ - public static function fromDefinition(Definition $def): self - { - $item = new CompletionItem; - $item->label = $def->symbolInformation->name; - $item->kind = CompletionItemKind::fromSymbolKind($def->symbolInformation->kind); - if ($def->type) { - $item->detail = (string)$def->type; - } else if ($def->symbolInformation->containerName) { - $item->detail = $def->symbolInformation->containerName; - } - if ($def->documentation) { - $item->documentation = $def->documentation; - } - if ($def->isStatic && $def->symbolInformation->kind === SymbolKind::PROPERTY) { - $item->insertText = '$' . $def->symbolInformation->name; - } - return $item; - } -} diff --git a/src/Protocol/CompletionItemKind.php b/src/Protocol/CompletionItemKind.php deleted file mode 100644 index 046f8ef..0000000 --- a/src/Protocol/CompletionItemKind.php +++ /dev/null @@ -1,70 +0,0 @@ -items = $items; - $this->isIncomplete = $isIncomplete; - } -} diff --git a/src/Protocol/CompletionOptions.php b/src/Protocol/CompletionOptions.php deleted file mode 100644 index f668ca0..0000000 --- a/src/Protocol/CompletionOptions.php +++ /dev/null @@ -1,24 +0,0 @@ -attributes = $attributes ?? new \stdClass; - $this->hints = $hints; - } -} diff --git a/src/Protocol/Diagnostic.php b/src/Protocol/Diagnostic.php deleted file mode 100644 index 7bf9895..0000000 --- a/src/Protocol/Diagnostic.php +++ /dev/null @@ -1,63 +0,0 @@ -message = $message; - $this->range = $range; - $this->code = $code; - $this->severity = $severity; - $this->source = $source; - } -} diff --git a/src/Protocol/DiagnosticSeverity.php b/src/Protocol/DiagnosticSeverity.php deleted file mode 100644 index e91da8f..0000000 --- a/src/Protocol/DiagnosticSeverity.php +++ /dev/null @@ -1,26 +0,0 @@ -uri = $uri; - $this->type = $type; - } -} diff --git a/src/Protocol/FormattingOptions.php b/src/Protocol/FormattingOptions.php deleted file mode 100644 index b672ddf..0000000 --- a/src/Protocol/FormattingOptions.php +++ /dev/null @@ -1,25 +0,0 @@ -contents = $contents; - $this->range = $range; - } -} diff --git a/src/Protocol/InitializeResult.php b/src/Protocol/InitializeResult.php deleted file mode 100644 index 4a18e82..0000000 --- a/src/Protocol/InitializeResult.php +++ /dev/null @@ -1,21 +0,0 @@ -capabilities = $capabilities ?? new ServerCapabilities(); - } -} diff --git a/src/Protocol/Location.php b/src/Protocol/Location.php deleted file mode 100644 index 50fedfa..0000000 --- a/src/Protocol/Location.php +++ /dev/null @@ -1,43 +0,0 @@ -getStart(), $node->getWidth(), $node->getFileContents()); - return new self($node->getUri(), new Range( - new Position($range->start->line, $range->start->character), - new Position($range->end->line, $range->end->character) - )); - } - - public function __construct(string $uri = null, Range $range = null) - { - $this->uri = $uri; - $this->range = $range; - } -} diff --git a/src/Protocol/MarkedString.php b/src/Protocol/MarkedString.php deleted file mode 100644 index 0799f14..0000000 --- a/src/Protocol/MarkedString.php +++ /dev/null @@ -1,22 +0,0 @@ -language = $language; - $this->value = $value; - } -} diff --git a/src/Protocol/MessageActionItem.php b/src/Protocol/MessageActionItem.php deleted file mode 100644 index 59dafe5..0000000 --- a/src/Protocol/MessageActionItem.php +++ /dev/null @@ -1,13 +0,0 @@ -name = $name; - } -} diff --git a/src/Protocol/ParameterInformation.php b/src/Protocol/ParameterInformation.php deleted file mode 100644 index fa9b7bf..0000000 --- a/src/Protocol/ParameterInformation.php +++ /dev/null @@ -1,39 +0,0 @@ -label = $label; - $this->documentation = $documentation; - } -} diff --git a/src/Protocol/Position.php b/src/Protocol/Position.php deleted file mode 100644 index f47afe2..0000000 --- a/src/Protocol/Position.php +++ /dev/null @@ -1,65 +0,0 @@ -line = $line; - $this->character = $character; - } - - /** - * Compares this position to another position - * Returns - * - 0 if the positions match - * - a negative number if $this is before $position - * - a positive number otherwise - * - * @param Position $position - * @return int - */ - public function compare(Position $position): int - { - if ($this->line === $position->line && $this->character === $position->character) { - return 0; - } - - if ($this->line !== $position->line) { - return $this->line - $position->line; - } - - return $this->character - $position->character; - } - - /** - * Returns the offset of the position in a string - * - * @param string $content - * @return int - */ - public function toOffset(string $content): int - { - $lines = explode("\n", $content); - $slice = array_slice($lines, 0, $this->line); - return array_sum(array_map('strlen', $slice)) + count($slice) + $this->character; - } -} diff --git a/src/Protocol/Range.php b/src/Protocol/Range.php deleted file mode 100644 index 1e19a5a..0000000 --- a/src/Protocol/Range.php +++ /dev/null @@ -1,59 +0,0 @@ -getStart(), $node->getWidth(), $node->getFileContents()); - - return new self( - new Position($range->start->line, $range->start->character), - new Position($range->end->line, $range->end->character) - ); - } - - public function __construct(Position $start = null, Position $end = null) - { - $this->start = $start; - $this->end = $end; - } - - /** - * Checks if a position is within the range - * - * @param Position $position - * @return bool - */ - public function includes(Position $position): bool - { - return $this->start->compare($position) <= 0 && $this->end->compare($position) >= 0; - } -} diff --git a/src/Protocol/ReferenceContext.php b/src/Protocol/ReferenceContext.php deleted file mode 100644 index bd546d5..0000000 --- a/src/Protocol/ReferenceContext.php +++ /dev/null @@ -1,13 +0,0 @@ -reference = $reference; - $this->symbol = $symbol; - } -} diff --git a/src/Protocol/ServerCapabilities.php b/src/Protocol/ServerCapabilities.php deleted file mode 100644 index 1893a51..0000000 --- a/src/Protocol/ServerCapabilities.php +++ /dev/null @@ -1,132 +0,0 @@ -signatures = $signatures; - $this->activeSignature = $activeSignature; - $this->activeParameter = $activeParameter; - } -} diff --git a/src/Protocol/SignatureHelpOptions.php b/src/Protocol/SignatureHelpOptions.php deleted file mode 100644 index 25b0e37..0000000 --- a/src/Protocol/SignatureHelpOptions.php +++ /dev/null @@ -1,16 +0,0 @@ -label = $label; - $this->parameters = $parameters; - $this->documentation = $documentation; - } -} diff --git a/src/Protocol/SymbolDescriptor.php b/src/Protocol/SymbolDescriptor.php deleted file mode 100644 index 4116864..0000000 --- a/src/Protocol/SymbolDescriptor.php +++ /dev/null @@ -1,34 +0,0 @@ -fqsen = $fqsen; - $this->package = $package; - } -} diff --git a/src/Protocol/SymbolInformation.php b/src/Protocol/SymbolInformation.php deleted file mode 100644 index 6ad560c..0000000 --- a/src/Protocol/SymbolInformation.php +++ /dev/null @@ -1,134 +0,0 @@ -kind = SymbolKind::CLASS_; - } else if ($node instanceof Node\Statement\TraitDeclaration) { - $symbol->kind = SymbolKind::CLASS_; - } else if (\LanguageServer\ParserHelpers\isConstDefineExpression($node)) { - // constants with define() like - // define('TEST_DEFINE_CONSTANT', false); - $symbol->kind = SymbolKind::CONSTANT; - $symbol->name = $node->argumentExpressionList->children[0]->expression->getStringContentsText(); - } else if ($node instanceof Node\Statement\InterfaceDeclaration) { - $symbol->kind = SymbolKind::INTERFACE; - } else if ($node instanceof Node\Statement\NamespaceDefinition) { - $symbol->kind = SymbolKind::NAMESPACE; - } else if ($node instanceof Node\Statement\FunctionDeclaration) { - $symbol->kind = SymbolKind::FUNCTION; - } else if ($node instanceof Node\MethodDeclaration) { - $nameText = $node->getName(); - if ($nameText === '__construct' || $nameText === '__destruct') { - $symbol->kind = SymbolKind::CONSTRUCTOR; - } else { - $symbol->kind = SymbolKind::METHOD; - } - } else if ($node instanceof Node\Expression\Variable && $node->getFirstAncestor(Node\PropertyDeclaration::class) !== null) { - $symbol->kind = SymbolKind::PROPERTY; - } else if ($node instanceof Node\ConstElement) { - $symbol->kind = SymbolKind::CONSTANT; - } else if ( - ( - ($node instanceof Node\Expression\AssignmentExpression) - && $node->leftOperand instanceof Node\Expression\Variable - ) - || $node instanceof Node\UseVariableName - || $node instanceof Node\Parameter - ) { - $symbol->kind = SymbolKind::VARIABLE; - } else { - return null; - } - - if ($node instanceof Node\Expression\AssignmentExpression) { - if ($node->leftOperand instanceof Node\Expression\Variable) { - $symbol->name = $node->leftOperand->getName(); - } elseif ($node->leftOperand instanceof PhpParser\Token) { - $symbol->name = trim($node->leftOperand->getText($node->getFileContents()), "$"); - } - } else if ($node instanceof Node\UseVariableName) { - $symbol->name = $node->getName(); - } else if (isset($node->name)) { - if ($node->name instanceof Node\QualifiedName) { - $symbol->name = (string)PhpParser\ResolvedName::buildName($node->name->nameParts, $node->getFileContents()); - } else { - $symbol->name = ltrim((string)$node->name->getText($node->getFileContents()), "$"); - } - } else if (isset($node->variableName)) { - $symbol->name = $node->variableName->getText($node); - } else if (!isset($symbol->name)) { - return null; - } - - $symbol->location = LocationFactory::fromNode($node); - if ($fqn !== null) { - $parts = preg_split('/(::|->|\\\\)/', $fqn); - array_pop($parts); - $symbol->containerName = implode('\\', $parts); - } - return $symbol; - } - - /** - * @param string $name - * @param int $kind - * @param Location $location - * @param string $containerName - */ - public function __construct($name = null, $kind = null, $location = null, $containerName = null) - { - $this->name = $name; - $this->kind = $kind; - $this->location = $location; - $this->containerName = $containerName; - } -} diff --git a/src/Protocol/SymbolKind.php b/src/Protocol/SymbolKind.php deleted file mode 100644 index e8a44e2..0000000 --- a/src/Protocol/SymbolKind.php +++ /dev/null @@ -1,28 +0,0 @@ -symbol = $symbol; - $this->location = $location; - } -} diff --git a/src/Protocol/TextDocumentContentChangeEvent.php b/src/Protocol/TextDocumentContentChangeEvent.php deleted file mode 100644 index 9cfa08b..0000000 --- a/src/Protocol/TextDocumentContentChangeEvent.php +++ /dev/null @@ -1,31 +0,0 @@ -uri = $uri; - } -} diff --git a/src/Protocol/TextDocumentItem.php b/src/Protocol/TextDocumentItem.php deleted file mode 100644 index 0c86664..0000000 --- a/src/Protocol/TextDocumentItem.php +++ /dev/null @@ -1,38 +0,0 @@ -range = $range; - $this->newText = $newText; - } -} diff --git a/src/Protocol/VersionedTextDocumentIdentifier.php b/src/Protocol/VersionedTextDocumentIdentifier.php deleted file mode 100644 index ba74e42..0000000 --- a/src/Protocol/VersionedTextDocumentIdentifier.php +++ /dev/null @@ -1,13 +0,0 @@ -