@@ -413,11 +413,11 @@ module FourSlash {
413
413
}
414
414
415
415
private raiseError ( message : string ) {
416
- message = this . assertionMessage ( message ) ;
416
+ message = this . messageAtLastKnownMarker ( message ) ;
417
417
throw new Error ( message ) ;
418
418
}
419
419
420
- private assertionMessage ( message : string ) {
420
+ private messageAtLastKnownMarker ( message : string ) {
421
421
return "Marker: " + currentTestState . lastKnownMarker + "\n" + message ;
422
422
}
423
423
@@ -778,29 +778,29 @@ module FourSlash {
778
778
779
779
if ( negative ) {
780
780
if ( expectedTypeName !== undefined ) {
781
- assert . notEqual ( actualQuickInfoMemberName , expectedTypeName , this . assertionMessage ( "quick info member name" ) ) ;
781
+ assert . notEqual ( actualQuickInfoMemberName , expectedTypeName , this . messageAtLastKnownMarker ( "quick info member name" ) ) ;
782
782
}
783
783
if ( docComment != undefined ) {
784
- assert . notEqual ( actualQuickInfoDocComment , docComment , this . assertionMessage ( "quick info doc comment" ) ) ;
784
+ assert . notEqual ( actualQuickInfoDocComment , docComment , this . messageAtLastKnownMarker ( "quick info doc comment" ) ) ;
785
785
}
786
786
if ( symbolName !== undefined ) {
787
- assert . notEqual ( actualQuickInfoSymbolName , symbolName , this . assertionMessage ( "quick info symbol name" ) ) ;
787
+ assert . notEqual ( actualQuickInfoSymbolName , symbolName , this . messageAtLastKnownMarker ( "quick info symbol name" ) ) ;
788
788
}
789
789
if ( kind !== undefined ) {
790
- assert . notEqual ( actualQuickInfoKind , kind , this . assertionMessage ( "quick info kind" ) ) ;
790
+ assert . notEqual ( actualQuickInfoKind , kind , this . messageAtLastKnownMarker ( "quick info kind" ) ) ;
791
791
}
792
792
} else {
793
793
if ( expectedTypeName !== undefined ) {
794
- assert . equal ( actualQuickInfoMemberName , expectedTypeName , this . assertionMessage ( "quick info member" ) ) ;
794
+ assert . equal ( actualQuickInfoMemberName , expectedTypeName , this . messageAtLastKnownMarker ( "quick info member" ) ) ;
795
795
}
796
796
if ( docComment != undefined ) {
797
- assert . equal ( actualQuickInfoDocComment , docComment , this . assertionMessage ( "quick info doc" ) ) ;
797
+ assert . equal ( actualQuickInfoDocComment , docComment , this . messageAtLastKnownMarker ( "quick info doc" ) ) ;
798
798
}
799
799
if ( symbolName !== undefined ) {
800
- assert . equal ( actualQuickInfoSymbolName , symbolName , this . assertionMessage ( "quick info symbol name" ) ) ;
800
+ assert . equal ( actualQuickInfoSymbolName , symbolName , this . messageAtLastKnownMarker ( "quick info symbol name" ) ) ;
801
801
}
802
802
if ( kind !== undefined ) {
803
- assert . equal ( actualQuickInfoKind , kind , this . assertionMessage ( "quick info kind" ) ) ;
803
+ assert . equal ( actualQuickInfoKind , kind , this . messageAtLastKnownMarker ( "quick info kind" ) ) ;
804
804
}
805
805
}
806
806
}
@@ -1455,11 +1455,11 @@ module FourSlash {
1455
1455
var actualDefinitionName = definitions && definitions . length ? definitions [ 0 ] . name : "" ;
1456
1456
var actualDefinitionContainerName = definitions && definitions . length ? definitions [ 0 ] . containerName : "" ;
1457
1457
if ( negative ) {
1458
- assert . notEqual ( actualDefinitionName , expectedName , this . assertionMessage ( "Definition Info Name" ) ) ;
1459
- assert . notEqual ( actualDefinitionName , expectedName , this . assertionMessage ( "Definition Info Container Name" ) ) ;
1458
+ assert . notEqual ( actualDefinitionName , expectedName , this . messageAtLastKnownMarker ( "Definition Info Name" ) ) ;
1459
+ assert . notEqual ( actualDefinitionName , expectedName , this . messageAtLastKnownMarker ( "Definition Info Container Name" ) ) ;
1460
1460
} else {
1461
- assert . equal ( actualDefinitionName , expectedName , this . assertionMessage ( "Definition Info Name" ) ) ;
1462
- assert . equal ( actualDefinitionName , expectedName , this . assertionMessage ( "Definition Info Container Name" ) ) ;
1461
+ assert . equal ( actualDefinitionName , expectedName , this . messageAtLastKnownMarker ( "Definition Info Name" ) ) ;
1462
+ assert . equal ( actualDefinitionName , expectedName , this . messageAtLastKnownMarker ( "Definition Info Container Name" ) ) ;
1463
1463
}
1464
1464
}
1465
1465
0 commit comments