From 8ac306f653564697583f1dcc75747c375fd6f41c Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Mon, 17 Apr 2017 16:37:21 +0200
Subject: [PATCH] Update SymbolInformation.php

---
 src/Protocol/SymbolInformation.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/Protocol/SymbolInformation.php b/src/Protocol/SymbolInformation.php
index 2d09d26..a1ce983 100644
--- a/src/Protocol/SymbolInformation.php
+++ b/src/Protocol/SymbolInformation.php
@@ -50,7 +50,6 @@ class SymbolInformation
     {
         $parent = $node->getAttribute('parentNode');
         $symbol = new self;
-        $setDefaultName = true;
 
         if (
             $node instanceof Node\Expr\FuncCall
@@ -63,7 +62,6 @@ class SymbolInformation
             // define('TEST_DEFINE_CONSTANT', false);
             $symbol->kind = SymbolKind::CONSTANT;
             $symbol->name = (string)$node->args[0]->value->value;
-            $setDefaultName = false;
         } else if ($node instanceof Node\Stmt\Class_ || $node instanceof Node\Stmt\Trait_) {
             $symbol->kind = SymbolKind::CLASS_;
         } else if ($node instanceof Node\Stmt\Interface_) {
@@ -92,18 +90,19 @@ class SymbolInformation
         } else {
             return null;
         }
-        if ($node instanceof Node\Name) {
-            $symbol->name = (string)$node;
-        } else if ($node instanceof Node\Expr\Assign || $node instanceof Node\Expr\AssignOp) {
-            $symbol->name = $node->var->name;
-        } else if ($node instanceof Node\Expr\ClosureUse) {
-            $symbol->name = $node->var;
-        } else if (isset($node->name)) {
-            if ($setDefaultName) {
+        
+        if (!isset($symbol->name)) {   
+            if ($node instanceof Node\Name) {
+                $symbol->name = (string)$node;
+            } else if ($node instanceof Node\Expr\Assign || $node instanceof Node\Expr\AssignOp) {
+                $symbol->name = $node->var->name;
+            } else if ($node instanceof Node\Expr\ClosureUse) {
+                $symbol->name = $node->var;
+            } else if (isset($node->name)) {
                 $symbol->name = (string)$node->name;
+            } else {
+                return null;
             }
-        } else {
-            return null;
         }
 
         $symbol->location = Location::fromNode($node);