icedream
/
php-language-server
1
0
Fork 0
Code Releases Activity

Removed parser instance

pull/250/head
Ivan Bozhanov 2017-01-21 20:58:37 +02:00
parent 96948c44bd
commit 9e822fbb61
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/SignatureHelpProvider.php
View File

@ -26,16 +26,6 @@ class SignatureHelpProvider
*/ */
private $index; private $index;
/**
* @var Parser
*/
private $parser;
/**
* @var Parser
*/
private $parserErrorHandler;
/** /**
* @param DefinitionResolver $definitionResolver * @param DefinitionResolver $definitionResolver
* @param ReadableIndex $index * @param ReadableIndex $index
@ -44,8 +34,6 @@ class SignatureHelpProvider
{ {
$this->definitionResolver = $definitionResolver; $this->definitionResolver = $definitionResolver;
$this->index = $index; $this->index = $index;
$this->parser = new Parser;
$this->parserErrorHandler = new Collecting;
} }
/** /**
@ -71,7 +59,7 @@ class SignatureHelpProvider
$filePos = ftell($handle) + $pos->character; $filePos = ftell($handle) + $pos->character;
$line = substr(fgets($handle), 0, $pos->character); $line = substr(fgets($handle), 0, $pos->character);
fseek($handle, 0); fseek($handle, 0);
$i = 0; $i = 0;
$orig = null; $orig = null;
do { do {
@ -103,7 +91,7 @@ class SignatureHelpProvider
fclose($handle); fclose($handle);
return $help; return $help;
} }
$params = ''; $params = '';
if ($node instanceof Node\Expr\PropertyFetch) { if ($node instanceof Node\Expr\PropertyFetch) {
fseek($handle, $node->name->getAttribute('startFilePos')); fseek($handle, $node->name->getAttribute('startFilePos'));
@ -175,7 +163,7 @@ class SignatureHelpProvider
if (strlen(trim($params))) { if (strlen(trim($params))) {
try { try {
$lex = new \PhpParser\Lexer(); $lex = new \PhpParser\Lexer();
$lex->startLexing('<?php $a = [ ' . $params, $this->parserErrorHandler); $lex->startLexing('<?php $a = [ ' . $params, new Collecting);
$value = null; $value = null;
$lex->getNextToken($value); $lex->getNextToken($value);
$lex->getNextToken($value); $lex->getNextToken($value);