File tree 1 file changed +19
-6
lines changed 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');
13
13
const fs = require ( 'fs' ) ;
14
14
15
15
function formatter ( message , useColors ) {
16
+ const hasGetters = typeof message . getFile === 'function' ;
16
17
const colors = new chalk . constructor ( { enabled : useColors } ) ;
17
18
const messageColor = message . isWarningSeverity ( ) ? colors . yellow : colors . red ;
18
19
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
+
23
34
let frame = '' ;
24
35
25
36
if ( source ) {
@@ -33,9 +44,11 @@ function formatter(message, useColors) {
33
44
. join ( os . EOL ) ;
34
45
}
35
46
47
+ const severity = hasGetters ? message . getSeverity ( ) : message . severity ;
48
+
36
49
return [
37
- messageColor . bold ( `Type ${ message . getSeverity ( ) . toLowerCase ( ) } : ` ) +
38
- message . getContent ( ) +
50
+ messageColor . bold ( `Type ${ severity . toLowerCase ( ) } : ` ) +
51
+ ( hasGetters ? message . getContent ( ) : message . content ) +
39
52
' ' +
40
53
messageColor . underline ( `TS${ message . code } ` ) ,
41
54
'' ,
You can’t perform that action at this time.
0 commit comments