@@ -1963,38 +1963,43 @@ namespace FourSlash {
1963
1963
let items = this . languageService . getNavigationBarItems ( this . activeFile . fileName ) ;
1964
1964
items = this . simplifyNavigationBar ( items ) ;
1965
1965
if ( JSON . stringify ( items ) !== JSON . stringify ( json ) ) {
1966
- this . raiseError ( `verifyNavigationBar failed - expected: ${ JSON . stringify ( json , undefined , 2 ) } , got: ${ JSON . stringify ( items , undefined , 2 ) } ` )
1966
+ this . raiseError ( `verifyNavigationBar failed - expected: ${ JSON . stringify ( json , undefined , 2 ) } , got: ${ JSON . stringify ( items , undefined , 2 ) } ` ) ;
1967
1967
}
1968
1968
}
1969
1969
1970
1970
// Remove any properties that tend to all have the same value so that test data is easier to read.
1971
1971
private simplifyNavigationBar ( items : ts . NavigationBarItem [ ] ) : any {
1972
1972
return items . map ( item => {
1973
1973
item = ts . clone ( item ) ;
1974
- if ( item . kindModifiers === "" )
1974
+ if ( item . kindModifiers === "" ) {
1975
1975
delete item . kindModifiers ;
1976
+ }
1977
+ // We won't check this.
1976
1978
delete item . spans ;
1977
1979
item . childItems = item . childItems . map ( child => {
1978
1980
child = ts . clone ( child ) ;
1981
+ delete child . spans ;
1979
1982
ts . Debug . assert ( child . childItems . length === 0 ) ;
1980
- ts . Debug . assert ( child . indent === 0 ) ;
1981
- ts . Debug . assert ( child . bolded === false ) ;
1982
- ts . Debug . assert ( child . grayed === false ) ;
1983
1983
delete child . childItems ;
1984
+ ts . Debug . assert ( child . indent === 0 ) ;
1984
1985
delete child . indent ;
1986
+ ts . Debug . assert ( child . bolded === false ) ;
1985
1987
delete child . bolded ;
1988
+ ts . Debug . assert ( child . grayed === false ) ;
1986
1989
delete child . grayed ;
1987
- delete child . spans ;
1988
- if ( child . kindModifiers === "" )
1990
+ if ( child . kindModifiers === "" ) {
1989
1991
delete child . kindModifiers ;
1992
+ }
1990
1993
return child ;
1991
1994
} ) ;
1992
- if ( item . bolded === false )
1995
+ if ( item . bolded === false ) {
1993
1996
delete item . bolded ;
1994
- if ( item . grayed === false )
1997
+ }
1998
+ if ( item . grayed === false ) {
1995
1999
delete item . grayed ;
2000
+ }
1996
2001
return item ;
1997
- } )
2002
+ } ) ;
1998
2003
}
1999
2004
2000
2005
public printNavigationItems ( searchValue : string ) {
0 commit comments