Fixed the bad merge and tests failing because of it

Author: sheetalkamat

src/services/services.ts

@@ -3018,11 +3018,6 @@ module ts {
                 return undefined;
             }
 
-            var symbol = typeInfoResolver.getSymbolInfo(node);
-            if (!symbol) {
-                return undefined;
-            }
-
             var symbol = typeInfoResolver.getSymbolInfo(node);
             if (!symbol) {
 

tests/cases/fourslash/quickInfoInWithBlock.ts

@@ -7,10 +7,10 @@
 
 
 goTo.marker('1');
-verify.quickInfoIs("");
+verify.quickInfoIs("any");
 
 goTo.marker('2');
-verify.quickInfoIs("");
+verify.quickInfoIs("any");
 
 goTo.marker('3');
-verify.quickInfoIs("");
+verify.quickInfoIs("any");

tests/cases/fourslash/quickInfoOnMergedInterfacesWithIncrementalEdits.ts

@@ -18,7 +18,7 @@ goTo.marker('1');
 verify.quickInfoIs("(property) B<string>.bar: string", undefined);
 edit.deleteAtCaret(1);
 edit.insert('z');
-verify.quickInfoIs("");
+verify.quickInfoIs("any");
 verify.numberOfErrorsInCurrentFile(1);
 edit.backspace(1);
 edit.insert('a');

tests/cases/fourslash/quickInfoOnThis.ts

@@ -12,4 +12,4 @@
 ////}
 
 goTo.marker();
-verify.quickInfoIs('');
+verify.quickInfoIs('any');

tests/cases/fourslash/symbolNameAtUnparseableFunctionOverload.ts

@@ -10,4 +10,4 @@
 //// 
 
 goTo.marker();
-verify.not.quickInfoExists();
+verify.quickInfoExists();