Merge pull request #864 from Microsoft/quickInfoMerge

Fixed the incorrect merge and tests failing because of it
This commit is contained in:
Sheetal Nandi 2014-10-09 13:30:12 -07:00
commit b7574904ff
5 changed files with 6 additions and 11 deletions

View File

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

View File

@ -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");

View File

@ -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');

View File

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

View File

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