Skip to content

Commit e7d9f2f

Browse files
committed
[vscode] Clean-up solution convert messages in output channel
1 parent 9c4ddab commit e7d9f2f

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/solutions/cmsis-toolbox.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,7 @@ export class CmsisToolboxManagerImpl implements CmsisToolboxManager {
262262
// call rpc method
263263
this.runCmsisToolEmitter.fire([true]);
264264
const result = await this.rpcHandler[method as keyof typeof this.rpcHandler](args as never);
265-
msg = `${(result as rpc.SuccessResult).success ? '☑️' : '🟥'} RPC: ${method}` +
266-
`${argsArray.length > 0 ? ` { ${argsArray.join(', ')} }` : ''}`;
265+
msg = `${(result as rpc.SuccessResult).success ? '☑️' : '🟥'} RPC: ${method}`;
267266
console.log(msg);
268267
onOutput(msg);
269268
if (method === 'Shutdown' && (result as rpc.SuccessResult).success) {

src/solutions/solution-converter.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ describe('SolutionConverter', () => {
210210
const outputChannel = outputChannelProvider.mockGetCreatedChannelByName(manifest.CMSIS_SOLUTION_OUTPUT_CHANNEL);
211211

212212
expect(outputChannel!.mockAppendedStrings).toEqual([
213-
expect.stringContaining('⚙️ Converting solution...'),
213+
expect.stringContaining('⚙️ Converting solution Active'),
214214
expect.stringContaining('☑️ RPC: ListMissingPacks'),
215215
expect.stringContaining('☑️ RPC: ConvertSolution'),
216216
expect.stringContaining('☑️ cbuild setup database'),
@@ -230,7 +230,7 @@ describe('SolutionConverter', () => {
230230
const outputChannel = outputChannelProvider.mockGetCreatedChannelByName(manifest.CMSIS_SOLUTION_OUTPUT_CHANNEL);
231231

232232
expect(outputChannel!.mockAppendedStrings).toEqual([
233-
expect.stringContaining('⚙️ Converting solution...'),
233+
expect.stringContaining('⚙️ Converting solution Active'),
234234
expect.stringContaining('🟥 RPC: ListMissingPacks'),
235235
expect.stringContaining('🟥 RPC: ConvertSolution'),
236236
expect.stringContaining('☑️ RPC: GetLogMessages'),

src/solutions/solution-converter.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ export class SolutionConverterImpl implements SolutionConverter {
124124
return;
125125
}
126126

127-
outputChannel.appendLine('⚙️ Converting solution...');
127+
const solutionName = path.basename(activeSolution ?? '', '.csolution' + path.extname(activeSolution ?? ''));
128+
outputChannel.appendLine(`⚙️ Converting solution ${solutionName} ${activeTarget}`);
128129
if (this.isDownloadPacksEnabled()) {
129130
// rpc method: ListMissingPacks
130131
const result = await this.cmsisToolboxManager.runCsolutionRpc(

0 commit comments

Comments
 (0)