File tree Expand file tree Collapse file tree 1 file changed +12
-11
lines changed Expand file tree Collapse file tree 1 file changed +12
-11
lines changed Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ function validatePlatform(os) {
62
62
}
63
63
64
64
function validateThemeItem ( field , key ) {
65
- let validValues = [ '' ,
65
+ const validValues = [ '' ,
66
66
'reset' ,
67
67
'bold' ,
68
68
'dim' ,
@@ -88,16 +88,17 @@ function validateThemeItem(field, key) {
88
88
'bgCyan' ,
89
89
'bgWhite'
90
90
] ;
91
- // TODO: change this to return all errors in a field
92
- for ( let item in field ) {
93
- if ( field . hasOwnProperty ( item ) ) {
94
- let tokens = field [ item ] . replace ( / \s + / g, '' ) . split ( ',' ) ;
95
- for ( let i = 0 ; i < tokens . length ; i ++ ) {
96
- if ( validValues . indexOf ( tokens [ i ] ) < 0 ) {
97
- return 'Invalid theme value : ' + tokens [ i ] + ' in ' + key + ' theme' ;
98
- }
91
+ let errMsg = [ ] ;
92
+ for ( let fieldKey of Object . keys ( field ) ) {
93
+ let tokens = field [ fieldKey ] . replace ( / \s + / g, '' ) . split ( ',' ) ;
94
+ tokens . forEach ( ( token ) => {
95
+ if ( validValues . indexOf ( token ) < 0 ) {
96
+ errMsg . push ( 'Invalid theme value : ' + token + ' in ' + key + ' theme' ) ;
99
97
}
100
- }
98
+ } ) ;
101
99
}
102
- return null ;
100
+ if ( errMsg . length === 0 ) {
101
+ return null ;
102
+ }
103
+ return errMsg . join ( '\n' ) ;
103
104
}
You can’t perform that action at this time.
0 commit comments