File tree Expand file tree Collapse file tree 1 file changed +19
-6
lines changed Expand file tree Collapse file tree 1 file changed +19
-6
lines changed Original file line number Diff line number Diff line change @@ -13,13 +13,24 @@ const chalk = require('chalk');
1313const fs = require ( 'fs' ) ;
1414
1515function formatter ( message , useColors ) {
16+ const hasGetters = typeof message . getFile === 'function' ;
1617 const colors = new chalk . constructor ( { enabled : useColors } ) ;
1718 const messageColor = message . isWarningSeverity ( ) ? colors . yellow : colors . red ;
1819
19- const source =
20- message . getFile ( ) &&
21- fs . existsSync ( message . getFile ( ) ) &&
22- fs . readFileSync ( message . getFile ( ) , 'utf-8' ) ;
20+ let source ;
21+
22+ if ( hasGetters ) {
23+ source =
24+ message . getFile ( ) &&
25+ fs . existsSync ( message . getFile ( ) ) &&
26+ fs . readFileSync ( message . getFile ( ) , 'utf-8' ) ;
27+ } else {
28+ source =
29+ message . file &&
30+ fs . existsSync ( message . file ) &&
31+ fs . readFileSync ( message . file , 'utf-8' ) ;
32+ }
33+
2334 let frame = '' ;
2435
2536 if ( source ) {
@@ -33,9 +44,11 @@ function formatter(message, useColors) {
3344 . join ( os . EOL ) ;
3445 }
3546
47+ const severity = hasGetters ? message . getSeverity ( ) : message . severity ;
48+
3649 return [
37- messageColor . bold ( `Type ${ message . getSeverity ( ) . toLowerCase ( ) } : ` ) +
38- message . getContent ( ) +
50+ messageColor . bold ( `Type ${ severity . toLowerCase ( ) } : ` ) +
51+ ( hasGetters ? message . getContent ( ) : message . content ) +
3952 ' ' +
4053 messageColor . underline ( `TS${ message . code } ` ) ,
4154 '' ,
You can’t perform that action at this time.
0 commit comments