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

Ensure duplicate ScopedPropertyAccess expressions don't appear

pull/357/head
Sara Itani 2017-04-13 09:12:30 -07:00
parent 8d11ec7a9c
commit 05bccec84d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/TolerantTreeAnalyzer.php
View File

@ -95,7 +95,10 @@ class TolerantTreeAnalyzer implements TreeAnalyzerInterface {
$parent = $node->parent; $parent = $node->parent;
if (!( if (!(
($node instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression (
// $node->parent instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
($node instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
$node instanceof Tolerant\Node\Expression\MemberAccessExpression)
&& !( && !(
$node->parent instanceof Tolerant\Node\Expression\CallExpression || $node->parent instanceof Tolerant\Node\Expression\CallExpression ||
$node->memberName instanceof Tolerant\Token $node->memberName instanceof Tolerant\Token
@ -127,7 +130,9 @@ class TolerantTreeAnalyzer implements TreeAnalyzerInterface {
if (TolerantDefinitionResolver::isConstantFetch($node) || if (TolerantDefinitionResolver::isConstantFetch($node) ||
($parent instanceof Tolerant\Node\Expression\CallExpression ($parent instanceof Tolerant\Node\Expression\CallExpression
&& !( && !(
$node instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression $parent->callableExpression instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
$node instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
$node instanceof Tolerant\Node\Expression\MemberAccessExpression
))) { ))) {
$parts = explode('\\', $fqn); $parts = explode('\\', $fqn);
if (count($parts) > 1) { if (count($parts) > 1) {