From 46c2227cc35025430551792106df1b99dae9cf49 Mon Sep 17 00:00:00 2001
From: Jeff Williams <jeffrey.l.williams@gmail.com>
Date: Tue, 27 Jan 2015 16:52:43 -0800
Subject: [PATCH] remove branches that appear to be dead code

---
 lib/jsdoc/src/parser.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/jsdoc/src/parser.js b/lib/jsdoc/src/parser.js
index 048a68a4..7d5bdc22 100644
--- a/lib/jsdoc/src/parser.js
+++ b/lib/jsdoc/src/parser.js
@@ -387,17 +387,17 @@ Parser.prototype.resolveThis = function(node) {
         }
         // like: var foo = function(n) { /** blah */ this.bar = n; }
         else if ( doclet.kind === 'member' && jsdoc.src.astnode.isAssignment(node) ) {
-            result = doclet.longname || doclet.name;
+            result = doclet.longname;
         }
         // walk up to the closest class we can find
         else if (doclet.kind === 'class' || doclet.kind === 'module') {
-            result = doclet.longname || doclet.name;
+            result = doclet.longname;
         }
         else if (node.enclosingScope) {
             result = this.resolveThis(node.enclosingScope);
         }
     }
-    else if (node.parent) {
+    else {
         doclet = this.refs[node.parent.nodeId];
 
         // TODO: is this behavior correct? when do we get here?
@@ -405,13 +405,9 @@ Parser.prototype.resolveThis = function(node) {
             result = ''; // global?
         }
         else {
-            result = doclet.longname || doclet.name;
+            result = doclet.longname;
         }
     }
-    // TODO: is this behavior correct? when do we get here?
-    else {
-        result = ''; // global?
-    }
 
     return result;
 };
@@ -432,7 +428,7 @@ Parser.prototype.resolveThis = function(node) {
  */
 Parser.prototype.resolvePropertyParents = function(node) {
     var currentAncestor = node.parent;
-    var nextAncestor = currentAncestor ? currentAncestor.parent : null;
+    var nextAncestor = currentAncestor.parent;
     var doclet;
     var doclets = [];