File tree Expand file tree Collapse file tree 2 files changed +7
-0
lines changed Expand file tree Collapse file tree 2 files changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -4,6 +4,8 @@ import {processConsoleLine} from './RepoActionView.vue';
44
55test ( 'processConsoleLine' , ( ) => {
66 expect ( processConsoleLine ( 'abc' ) ) . toEqual ( 'abc' ) ;
7+ expect ( processConsoleLine ( 'abc\n' ) ) . toEqual ( 'abc' ) ;
8+ expect ( processConsoleLine ( 'abc\r\n' ) ) . toEqual ( 'abc' ) ;
79 expect ( processConsoleLine ( '\r' ) ) . toEqual ( '' ) ;
810 expect ( processConsoleLine ( '\rx\rabc' ) ) . toEqual ( 'abc' ) ;
911 expect ( processConsoleLine ( '\rabc\rx\r' ) ) . toEqual ( 'xbc' ) ;
Original file line number Diff line number Diff line change @@ -308,6 +308,11 @@ export function initRepositoryActionView() {
308308}
309309
310310export function processConsoleLine (line ) {
311+ if (line .endsWith (' \r\n ' )) {
312+ line = line .substring (0 , line .length - 2 );
313+ } else if (line .endsWith (' \n ' )) {
314+ line = line .substring (0 , line .length - 1 );
315+ }
311316 if (! line .includes (' \r ' )) return line;
312317
313318 // handle "\rReading...1%\rReading...5%\rReading...100%", only show the final message
You can’t perform that action at this time.
0 commit comments