Skip to content

Commit 99bf5f7

Browse files
authored
Merge branch 'main' into fix-103
2 parents 597cbb3 + 9f02633 commit 99bf5f7

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.vscodeignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ jestSetupFile.js
3333
.env
3434
update_copyright_years.*
3535
api/**
36+
e2e-report/**
37+
e2e-screenshots/**
38+
test-results/**
39+
.qlty/**

src/status-bar.test.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ describe('StatusBar', () => {
9292
targetType: 'target'
9393
}]);
9494
const cmsisToolboxManager = cmsisToolboxManagerFactory();
95-
cmsisToolboxManager.getSetupMessages = jest.fn().mockReturnValue(['message1', 'message2']);
9695

9796
const statusBar = new StatusBar(solutionManager, cmsisToolboxManager, themeProvider);
9897
await statusBar.activate(extensionContext);
@@ -110,10 +109,9 @@ describe('StatusBar', () => {
110109

111110
// end cmsis tool
112111
cmsisToolboxManager.mockTriggerOnRunCmsisTool(false, false);
113-
expect(cmsisToolboxManager.getSetupMessages).toHaveBeenCalledWith('project.build+target');
114112
expect(statusBarItem.show).toHaveBeenCalledTimes(4);
115113
expect(statusBarItem.text).toBe('$(target) target@set');
116-
expect(statusBarItem.tooltip.valueOf()).toEqual('**solution/test**\n - project.build\n - message1\n - message2\n');
114+
expect(statusBarItem.tooltip.valueOf()).toEqual('**solution/test**\n - project.build\n');
117115

118116
// cbuild setup completed and files loaded successfully
119117
solutionManager.onLoadedBuildFilesEmitter.fire(['success', false]);

src/status-bar.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,8 @@ export class StatusBar {
106106
}
107107

108108
protected contextToolTip(context: ContextDescriptor): string {
109-
const messages = this.cmsisToolboxManager.getSetupMessages(context.displayName)?.map(m => ` - ${m}`) ?? [];
110109
const build = context.buildType ? `.${context.buildType}` : '';
111-
return ` - ${context.projectName}${build}\n${messages.join('\n')}\n`;
110+
return ` - ${context.projectName}${build}\n`;
112111
}
113112

114113
protected updateIconStatus(statusBarItem: vscode.StatusBarItem, start: boolean, packs?: boolean): void {
@@ -123,7 +122,6 @@ export class StatusBar {
123122
}
124123

125124
protected retrieveCbuildSetupStatus(severity: Severity, detection: boolean): void {
126-
this.cmsisToolboxManager.collectSetupMessages(this.solutionManager.getCsolution()?.cbuildIdxYmlRoot);
127125
this.cbuildSetupStatus = detection ? ECbuildSetupStatus.Detection :
128126
severity == 'error' ? ECbuildSetupStatus.Error :
129127
severity == 'warning' ? ECbuildSetupStatus.Warning : ECbuildSetupStatus.Success;

0 commit comments

Comments
 (0)