File tree Expand file tree Collapse file tree 3 files changed +5
-10
lines changed Expand file tree Collapse file tree 3 files changed +5
-10
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ const _syntaxValidation = (cfg: string) => {
21
21
return new vm . Script ( cfg , { filename : '.hyper.js' } ) ;
22
22
} catch ( _err ) {
23
23
const err = _err as { name : string } ;
24
- notify ( `Error loading config: ${ err . name } ` , ` ${ err } ` , { error : err } ) ;
24
+ notify ( `Error loading config: ${ err . name } ` , JSON . stringify ( err ) , { error : err } ) ;
25
25
}
26
26
} ;
27
27
@@ -55,8 +55,8 @@ const _init = (userCfg: rawConfig, defaultCfg: rawConfig): parsedConfig => {
55
55
// Merging platform specific keymaps with user defined keymaps
56
56
keymaps : mapKeys ( { ...defaultCfg . keymaps , ...userCfg ?. keymaps } ) ,
57
57
// Ignore undefined values in plugin and localPlugins array Issue #1862
58
- plugins : ( userCfg ?. plugins && userCfg . plugins . filter ( Boolean ) ) || [ ] ,
59
- localPlugins : ( userCfg ?. localPlugins && userCfg . localPlugins . filter ( Boolean ) ) || [ ]
58
+ plugins : userCfg ?. plugins ?. filter ( Boolean ) || [ ] ,
59
+ localPlugins : userCfg ?. localPlugins ?. filter ( Boolean ) || [ ]
60
60
} ;
61
61
} ;
62
62
Original file line number Diff line number Diff line change @@ -461,13 +461,7 @@ const reducer: IUiReducer = (state = initial, action) => {
461
461
}
462
462
}
463
463
464
- if (
465
- typeof state . cols !== 'undefined' &&
466
- state . cols !== null &&
467
- typeof state . rows !== 'undefined' &&
468
- state . rows !== null &&
469
- ( state . rows !== state_ . rows || state . cols !== state_ . cols )
470
- ) {
464
+ if ( state . cols !== null && state . rows !== null && ( state . rows !== state_ . rows || state . cols !== state_ . cols ) ) {
471
465
state_ = state_ . merge ( { notifications : { resize : true } } , { deep : true } ) ;
472
466
}
473
467
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ export default class Client {
28
28
this . emitter . emit ( 'ready' ) ;
29
29
} , 0 ) ;
30
30
} else {
31
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
31
32
this . ipc . on ( 'init' , ( ev : IpcRendererEvent , uid : string , profileName : string ) => {
32
33
// we cache so that if the object
33
34
// gets re-instantiated we don't
You can’t perform that action at this time.
0 commit comments