File tree Expand file tree Collapse file tree 5 files changed +170
-159
lines changed Expand file tree Collapse file tree 5 files changed +170
-159
lines changed Original file line number Diff line number Diff line change 21
21
"clean:slate" : " jlpm clean:more && jlpm clean:labextension && rimraf node_modules" ,
22
22
"contributors:generate" : " jlpm run all-contributors generate" ,
23
23
"lint" : " eslint . --ext .ts,.tsx --fix" ,
24
- "test" : " jest --no-cache " ,
24
+ "test" : " jest" ,
25
25
"eslint-check" : " eslint . --ext .ts,.tsx" ,
26
26
"prepare" : " jlpm run build" ,
27
27
"watch" : " tsc -w"
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ import { Logger } from '../logger';
9
9
import { hiddenButtonStyle } from '../style/ActionButtonStyle' ;
10
10
import {
11
11
activeListItemClass ,
12
- branchNameClass ,
12
+ nameClass ,
13
13
filterClass ,
14
14
filterClearClass ,
15
15
filterInputClass ,
@@ -257,7 +257,7 @@ export class BranchMenu extends React.Component<
257
257
style = { style }
258
258
>
259
259
< branchIcon . react className = { listItemIconClass } tag = "span" />
260
- < span className = { branchNameClass } > { branch . name } </ span >
260
+ < span className = { nameClass } > { branch . name } </ span >
261
261
{ ! branch . is_remote_branch && ! isActive && (
262
262
< ActionButton
263
263
className = { hiddenButtonStyle }
@@ -329,7 +329,11 @@ export class BranchMenu extends React.Component<
329
329
buttons : [ Dialog . cancelButton ( ) , Dialog . warnButton ( { label : 'Delete' } ) ]
330
330
} ) ;
331
331
if ( acknowledgement . button . accept ) {
332
- await this . props . model . deleteBranch ( branchName ) ;
332
+ try {
333
+ await this . props . model . deleteBranch ( branchName ) ;
334
+ } catch ( error ) {
335
+ console . error ( `Failed to delete branch ${ branchName } ` , error ) ;
336
+ }
333
337
}
334
338
} ;
335
339
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ import * as React from 'react';
6
6
import { FixedSizeList , ListChildComponentProps } from 'react-window' ;
7
7
import { Logger } from '../logger' ;
8
8
import {
9
- branchNameClass ,
9
+ nameClass ,
10
10
filterClass ,
11
11
filterClearClass ,
12
12
filterInputClass ,
@@ -242,7 +242,7 @@ export class TagMenu extends React.Component<ITagMenuProps, ITagMenuState> {
242
242
style = { style }
243
243
>
244
244
< tagIcon . react className = { listItemIconClass } tag = "span" />
245
- < span className = { branchNameClass } > { tag } </ span >
245
+ < span className = { nameClass } > { tag } </ span >
246
246
</ ListItem >
247
247
) ;
248
248
} ;
Original file line number Diff line number Diff line change 1
1
import { style } from 'typestyle' ;
2
2
import { showButtonOnHover } from './ActionButtonStyle' ;
3
3
4
- export const branchNameClass = style ( {
4
+ export const nameClass = style ( {
5
5
flex : '1 1 auto' ,
6
6
textOverflow : 'ellipsis' ,
7
7
overflow : 'hidden' ,
You can’t perform that action at this time.
0 commit comments