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

Remove dead if block

pull/357/head
Rob Lourens 2017-06-09 10:39:51 -07:00
parent d3d7f7dafe
commit 9ad3c5aef6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CompletionProvider.php
View File

@ -268,9 +268,8 @@ class CompletionProvider
} }
if (!$isNotFullyQualified && ($fqnStartsWithPrefix || strStartsWith($fqn, $namespacePrefix . "\\" . $prefix))) { $isFullyQualifiedAndPrefixMatches = !$isNotFullyQualified && ($fqnStartsWithPrefix || strStartsWith($fqn, $namespacePrefix . "\\" . $prefix));
// $fqn = $fqn; if (!$isFullyQualifiedAndPrefixMatches && !$isAliased && !array_search($fqn, array_values($namespaceImportTable))) {
} elseif (!$isAliased && !array_search($fqn, array_values($namespaceImportTable))) {
if (empty($prefix)) { if (empty($prefix)) {
$fqn = '\\' . $fqn; $fqn = '\\' . $fqn;
} elseif (strStartsWith($fqn, $namespacePrefix . "\\" . $prefix)) { } elseif (strStartsWith($fqn, $namespacePrefix . "\\" . $prefix)) {
@ -278,7 +277,7 @@ class CompletionProvider
} else { } else {
continue; continue;
} }
} elseif (!$isAliased) { } elseif (!$isFullyQualifiedAndPrefixMatches && !$isAliased) {
continue; continue;
} }
} elseif ($fqnStartsWithPrefix && $class instanceof Node\QualifiedName && $class->isFullyQualifiedName()) { } elseif ($fqnStartsWithPrefix && $class instanceof Node\QualifiedName && $class->isFullyQualifiedName()) {