danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

catch TypeParseTreeException

Browse Source
This commit is contained in:
Andrew Nagy 2022-02-04 19:49:46 +00:00
parent a697c79a37
commit 19a3f4d935
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/Psalm/Internal/LanguageServer/Server/TextDocument.php
View File

@ -24,6 +24,7 @@ use LanguageServerProtocol\TextEdit;
use LanguageServerProtocol\VersionedTextDocumentIdentifier;
use LanguageServerProtocol\WorkspaceEdit;
use Psalm\Codebase;
use Psalm\Exception\TypeParseTreeException;
use Psalm\Exception\UnanalyzedFileException;
use Psalm\Internal\Analyzer\ProjectAnalyzer;
use Psalm\Internal\LanguageServer\LanguageServer;
@ -327,31 +328,37 @@ class TextDocument
return new Success(null);
}
if ($completion_data) {
[$recent_type, $gap, $offset] = $completion_data;
try {
if ($completion_data) {
[$recent_type, $gap, $offset] = $completion_data;
if ($gap === '->' || $gap === '::') {
$snippetSupport = ($this->server->clientCapabilities &&
$this->server->clientCapabilities->textDocument &&
$this->server->clientCapabilities->textDocument->completion &&
$this->server->clientCapabilities->textDocument->completion->completionItem &&
$this->server->clientCapabilities->textDocument->completion->completionItem->snippetSupport)
? true : false;
$completion_items =
$this->codebase->getCompletionItemsForClassishThing($recent_type, $gap, $snippetSupport);
} elseif ($gap === '[') {
$completion_items = $this->codebase->getCompletionItemsForArrayKeys($recent_type);
if ($gap === '->' || $gap === '::') {
$snippetSupport = ($this->server->clientCapabilities &&
$this->server->clientCapabilities->textDocument &&
$this->server->clientCapabilities->textDocument->completion &&
$this->server->clientCapabilities->textDocument->completion->completionItem &&
$this->server->clientCapabilities->textDocument->completion->completionItem->snippetSupport)
? true : false;
$completion_items =
$this->codebase->getCompletionItemsForClassishThing($recent_type, $gap, $snippetSupport);
} elseif ($gap === '[') {
$completion_items = $this->codebase->getCompletionItemsForArrayKeys($recent_type);
} else {
$completion_items = $this->codebase->getCompletionItemsForPartialSymbol(
$recent_type,
$offset,
$file_path
);
}
} else {
$completion_items = $this->codebase->getCompletionItemsForPartialSymbol(
$recent_type,
$offset,
$file_path
);
$completion_items = $this->codebase->getCompletionItemsForType($type_context);
}
} else {
$completion_items = $this->codebase->getCompletionItemsForType($type_context);
} catch (TypeParseTreeException $e) {
$this->server->logError((string) $e);
return new Success(null);
}
return new Success(new CompletionList($completion_items, false));
}