Skip to content

Commit b757490

Browse files
committed
Merge pull request #864 from Microsoft/quickInfoMerge
Fixed the incorrect merge and tests failing because of it
2 parents 8b3904f + 87a92b3 commit b757490

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

src/services/services.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3018,11 +3018,6 @@ module ts {
30183018
return undefined;
30193019
}
30203020

3021-
var symbol = typeInfoResolver.getSymbolInfo(node);
3022-
if (!symbol) {
3023-
return undefined;
3024-
}
3025-
30263021
var symbol = typeInfoResolver.getSymbolInfo(node);
30273022
if (!symbol) {
30283023

tests/cases/fourslash/quickInfoInWithBlock.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88

99
goTo.marker('1');
10-
verify.quickInfoIs("");
10+
verify.quickInfoIs("any");
1111

1212
goTo.marker('2');
13-
verify.quickInfoIs("");
13+
verify.quickInfoIs("any");
1414

1515
goTo.marker('3');
16-
verify.quickInfoIs("");
16+
verify.quickInfoIs("any");

tests/cases/fourslash/quickInfoOnMergedInterfacesWithIncrementalEdits.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ goTo.marker('1');
1818
verify.quickInfoIs("(property) B<string>.bar: string", undefined);
1919
edit.deleteAtCaret(1);
2020
edit.insert('z');
21-
verify.quickInfoIs("");
21+
verify.quickInfoIs("any");
2222
verify.numberOfErrorsInCurrentFile(1);
2323
edit.backspace(1);
2424
edit.insert('a');

tests/cases/fourslash/quickInfoOnThis.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
////}
1313

1414
goTo.marker();
15-
verify.quickInfoIs('');
15+
verify.quickInfoIs('any');

tests/cases/fourslash/symbolNameAtUnparseableFunctionOverload.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
////
1111

1212
goTo.marker();
13-
verify.not.quickInfoExists();
13+
verify.quickInfoExists();

0 commit comments

Comments
 (0)