From 4486ea0997ef42769536774d0b73e3131ce8d178 Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Fri, 9 Jun 2017 20:00:21 +0200 Subject: [PATCH] Don't recheck condition --- src/CompletionProvider.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/CompletionProvider.php b/src/CompletionProvider.php index 9299669..160798d 100644 --- a/src/CompletionProvider.php +++ b/src/CompletionProvider.php @@ -269,16 +269,18 @@ class CompletionProvider $prefixWithNamespace = $namespacePrefix . "\\" . $prefix; $fqnMatchesPrefixWithNamespace = substr($fqn, 0, strlen($prefixWithNamespace)) === $prefixWithNamespace; $isFullyQualifiedAndPrefixMatches = !$isNotFullyQualified && ($fqnStartsWithPrefix || $fqnMatchesPrefixWithNamespace); - if (!$isFullyQualifiedAndPrefixMatches && !$isAliased && !array_search($fqn, array_values($namespaceImportTable))) { - if (empty($prefix)) { - $fqn = '\\' . $fqn; - } elseif ($fqnMatchesPrefixWithNamespace) { - $fqn = substr($fqn, strlen($namespacePrefix) + 1); + if (!$isFullyQualifiedAndPrefixMatches && !$isAliased) { + if (!array_search($fqn, array_values($namespaceImportTable))) { + if (empty($prefix)) { + $fqn = '\\' . $fqn; + } elseif ($fqnMatchesPrefixWithNamespace) { + $fqn = substr($fqn, strlen($namespacePrefix) + 1); + } else { + continue; + } } else { continue; } - } elseif (!$isFullyQualifiedAndPrefixMatches && !$isAliased) { - continue; } } elseif ($fqnStartsWithPrefix && $class instanceof Node\QualifiedName && $class->isFullyQualifiedName()) { $fqn = '\\' . $fqn;