Skip to content

Commit 3799a92

Browse files
committed
fix
1 parent aa4d1d9 commit 3799a92

File tree

5 files changed

+44
-1
lines changed

5 files changed

+44
-1
lines changed

package-lock.json

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"@playwright/test": "1.31.2",
5656
"@rollup/pluginutils": "5.0.2",
5757
"@stoplight/spectral-cli": "6.6.0",
58+
"@vitejs/plugin-vue": "4.1.0",
5859
"eslint": "8.36.0",
5960
"eslint-plugin-import": "2.27.5",
6061
"eslint-plugin-jquery": "1.5.1",

vitest.config.js

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {defineConfig} from 'vitest/dist/config.js';
22
import {readFile} from 'node:fs/promises';
33
import {dataToEsm} from '@rollup/pluginutils';
44
import {extname} from 'node:path';
5+
import vue from '@vitejs/plugin-vue';
56

67
function stringPlugin() {
78
return {
@@ -28,5 +29,6 @@ export default defineConfig({
2829
},
2930
plugins: [
3031
stringPlugin(),
32+
vue(),
3133
],
3234
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import {expect, test} from 'vitest';
2+
3+
import {processConsoleLine} from './RepoActionView.vue';
4+
5+
test('processConsoleLine', () => {
6+
expect(processConsoleLine('abc')).toEqual('abc');
7+
expect(processConsoleLine('\r')).toEqual('');
8+
expect(processConsoleLine('\rx\rabc')).toEqual('abc');
9+
expect(processConsoleLine('\rabc\rx\r')).toEqual('xbc');
10+
});

web_src/js/components/RepoActionView.vue

+17-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ const sfc = {
214214
215215
const logMessage = document.createElement('div');
216216
logMessage.className = 'log-msg';
217-
logMessage.innerHTML = this.ansiToHTML.toHtml(line.message);
217+
logMessage.innerHTML = this.ansiToHTML.toHtml(processConsoleLine(line.message));
218218
div.appendChild(logMessage);
219219
220220
return div;
@@ -307,6 +307,22 @@ export function initRepositoryActionView() {
307307
view.mount(el);
308308
}
309309
310+
export function processConsoleLine(line) {
311+
if (!line.includes('\r')) return line;
312+
313+
// handle "\rReading...1%\rReading...5%\rReading...100%", only show the final message
314+
// TODO: control chars like "\033[" ?
315+
const parts = line.split('\r');
316+
let result = '';
317+
for (const part of parts) {
318+
if (part.length >= result.length) {
319+
result = part;
320+
} else {
321+
result = part + result.substring(part.length);
322+
}
323+
}
324+
return result;
325+
}
310326
</script>
311327
312328
<style scoped>

0 commit comments

Comments
 (0)