Skip to content

Commit e30cad7

Browse files
radurentearadurentea
committed
Fix linting
1 parent b22d6c6 commit e30cad7

File tree

2 files changed

+87
-57
lines changed

2 files changed

+87
-57
lines changed

‎src/extension.ts

+69-41
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ import { ExamplesPlanel } from "./examples/ExamplesPanel";
4141
import * as idfConf from "./idfConfiguration";
4242
import { Logger } from "./logger/logger";
4343
import { OutputChannel } from "./logger/outputChannel";
44-
import { showInfoNotificationWithAction, showInfoNotificationWithMultipleActions, showQuickPickWithCustomActions } from "./logger/utils";
44+
import {
45+
showInfoNotificationWithAction,
46+
showInfoNotificationWithMultipleActions,
47+
showQuickPickWithCustomActions,
48+
} from "./logger/utils";
4549
import * as utils from "./utils";
4650
import { PreCheck } from "./utils";
4751
import {
@@ -158,7 +162,11 @@ import { checkDebugAdapterRequirements } from "./espIdf/debugAdapter/checkPyReqs
158162
import { CDTDebugConfigurationProvider } from "./cdtDebugAdapter/debugConfProvider";
159163
import { CDTDebugAdapterDescriptorFactory } from "./cdtDebugAdapter/server";
160164
import { IdfReconfigureTask } from "./espIdf/reconfigure/task";
161-
import { ErrorHintProvider, ErrorHintTreeItem, HintHoverProvider } from "./espIdf/hints/index";
165+
import {
166+
ErrorHintProvider,
167+
ErrorHintTreeItem,
168+
HintHoverProvider,
169+
} from "./espIdf/hints/index";
162170
import { installWebsocketClient } from "./espIdf/monitor/checkWebsocketClient";
163171
import { TroubleshootingPanel } from "./support/troubleshootPanel";
164172
import {
@@ -277,7 +285,7 @@ export async function activate(context: vscode.ExtensionContext) {
277285
);
278286
};
279287
// Store display hints notification (until VS Code is closed)
280-
context.workspaceState.update('idf.showHintsNotification', true);
288+
context.workspaceState.update("idf.showHintsNotification", true);
281289

282290
// init rainmaker cache store
283291
ESP.Rainmaker.store = RainmakerStore.init(context);
@@ -3689,43 +3697,49 @@ export async function activate(context: vscode.ExtensionContext) {
36893697
}
36903698
// Hints Viewer
36913699
const treeDataProvider = new ErrorHintProvider(context);
3692-
3700+
36933701
// Create and register the tree view with collapse all button
36943702
const treeView = vscode.window.createTreeView("idfErrorHints", {
36953703
treeDataProvider: treeDataProvider,
3696-
showCollapseAll: true
3704+
showCollapseAll: true,
36973705
});
3698-
3706+
36993707
// Set a title for the tree view
37003708
treeView.title = "Error Hints";
3701-
3709+
37023710
// Add the tree view to disposables
37033711
context.subscriptions.push(treeView);
3704-
3712+
37053713
// Register commands for clearing error hints
3706-
vscode.commands.registerCommand("espIdf.errorHints.clearAll", () => {
3707-
treeDataProvider.clearErrorHints(true); // Clear both build and OpenOCD errors
3708-
})
3709-
3710-
vscode.commands.registerCommand("espIdf.errorHints.clearBuildErrors", () => {
3711-
treeDataProvider.clearErrorHints(false); // Clear only build errors
3712-
})
3713-
3714-
vscode.commands.registerCommand("espIdf.errorHints.clearOpenOCDErrors", () => {
3714+
vscode.commands.registerCommand("espIdf.errorHints.clearAll", () => {
3715+
treeDataProvider.clearErrorHints(true); // Clear both build and OpenOCD errors
3716+
});
3717+
3718+
vscode.commands.registerCommand("espIdf.errorHints.clearBuildErrors", () => {
3719+
treeDataProvider.clearErrorHints(false); // Clear only build errors
3720+
});
3721+
3722+
vscode.commands.registerCommand(
3723+
"espIdf.errorHints.clearOpenOCDErrors",
3724+
() => {
37153725
treeDataProvider.clearOpenOCDErrorsOnly(); // Clear only OpenOCD errors
3716-
})
3717-
3726+
}
3727+
);
3728+
37183729
// Initialize OpenOCD error monitoring
3719-
const openOCDErrorMonitor = OpenOCDErrorMonitor.init(treeDataProvider, workspaceRoot);
3730+
const openOCDErrorMonitor = OpenOCDErrorMonitor.init(
3731+
treeDataProvider,
3732+
workspaceRoot
3733+
);
37203734
await openOCDErrorMonitor.initialize();
3721-
3735+
37223736
// Register disposal of the monitor
37233737
context.subscriptions.push({
37243738
dispose: () => {
37253739
openOCDErrorMonitor.dispose();
3726-
}
3740+
},
37273741
});
3728-
3742+
37293743
// Register command to manually search for errors
37303744
vscode.commands.registerCommand("espIdf.searchError", async () => {
37313745
const errorMsg = await vscode.window.showInputBox({
@@ -3740,45 +3754,59 @@ export async function activate(context: vscode.ExtensionContext) {
37403754
// Function to process all ESP-IDF diagnostics from the problems panel
37413755
const processEspIdfDiagnostics = async () => {
37423756
// Get all diagnostics from all files that have source "esp-idf"
3743-
const espIdfDiagnostics: Array<{ uri: vscode.Uri; diagnostic: vscode.Diagnostic }> = [];
3744-
3757+
const espIdfDiagnostics: Array<{
3758+
uri: vscode.Uri;
3759+
diagnostic: vscode.Diagnostic;
3760+
}> = [];
3761+
37453762
// Collect all diagnostics from all files that have source "esp-idf"
37463763
vscode.languages.getDiagnostics().forEach(([uri, diagnostics]) => {
37473764
diagnostics
3748-
.filter(d => d.source === "esp-idf" && d.severity === vscode.DiagnosticSeverity.Error)
3749-
.forEach(diagnostic => {
3765+
.filter(
3766+
(d) =>
3767+
d.source === "esp-idf" &&
3768+
d.severity === vscode.DiagnosticSeverity.Error
3769+
)
3770+
.forEach((diagnostic) => {
37503771
espIdfDiagnostics.push({ uri, diagnostic });
37513772
});
37523773
});
3753-
3774+
37543775
// Only clear build errors if no ESP-IDF diagnostics
37553776
if (espIdfDiagnostics.length === 0) {
37563777
treeDataProvider.clearErrorHints(false); // Don't clear OpenOCD errors
37573778
return;
37583779
}
3759-
3780+
37603781
// Process the first error if available
37613782
const errorMsg = espIdfDiagnostics[0].diagnostic.message;
3762-
const foundHint = await treeDataProvider.searchError(errorMsg, workspaceRoot);
3783+
const foundHint = await treeDataProvider.searchError(
3784+
errorMsg,
3785+
workspaceRoot
3786+
);
37633787

3764-
const showHintsNotification = context.workspaceState.get('idf.showHintsNotification')
3788+
const showHintsNotification = context.workspaceState.get(
3789+
"idf.showHintsNotification"
3790+
);
37653791
if (foundHint && showHintsNotification) {
37663792
const actions = [
37673793
{
37683794
label: vscode.l10n.t("💡 Show Hints"),
3769-
action: () => vscode.commands.executeCommand("idfErrorHints.focus")
3795+
action: () => vscode.commands.executeCommand("idfErrorHints.focus"),
37703796
},
37713797
{
37723798
label: vscode.l10n.t("Mute for this session"),
37733799
action: () => {
3774-
context.workspaceState.update('idf.showHintsNotification', false);
3800+
context.workspaceState.update("idf.showHintsNotification", false);
37753801
vscode.window.showInformationMessage(
3776-
vscode.l10n.t("Hint notifications muted for this session. You can still access hints manually in ESP-IDF bottom panel")
3802+
vscode.l10n.t(
3803+
"Hint notifications muted for this session. You can still access hints manually in ESP-IDF bottom panel"
3804+
)
37773805
);
3778-
}
3779-
}
3806+
},
3807+
},
37803808
];
3781-
3809+
37823810
await showInfoNotificationWithMultipleActions(
37833811
vscode.l10n.t(`Possible hint found for the error: {0}`, errorMsg),
37843812
actions
@@ -3787,9 +3815,9 @@ export async function activate(context: vscode.ExtensionContext) {
37873815
};
37883816

37893817
// Attach a listener to the diagnostics collection
3790-
vscode.languages.onDidChangeDiagnostics((_event) => {
3791-
processEspIdfDiagnostics();
3792-
})
3818+
vscode.languages.onDidChangeDiagnostics((_event) => {
3819+
processEspIdfDiagnostics();
3820+
});
37933821

37943822
// Register the HintHoverProvider
37953823
context.subscriptions.push(
@@ -4019,7 +4047,7 @@ function registerTreeProvidersForIDFExplorer(context: vscode.ExtensionContext) {
40194047
commandTreeDataProvider.registerDataProviderForTree("idfCommands"),
40204048
rainMakerTreeDataProvider.registerDataProviderForTree("espRainmaker"),
40214049
eFuseExplorer.registerDataProviderForTree("espEFuseExplorer"),
4022-
partitionTableTreeDataProvider.registerDataProvider("idfPartitionExplorer"),
4050+
partitionTableTreeDataProvider.registerDataProvider("idfPartitionExplorer")
40234051
);
40244052
}
40254053

‎src/logger/utils.ts

+18-16
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,32 @@ export async function showInfoNotificationWithAction(
2424
}
2525

2626
/**
27-
* Shows an information notification with multiple buttons that execute custom actions when clicked.
28-
* @param {string} infoMessage - The information message to display.
29-
* @param {Array<{label: string, action: NotificationAction}>} actions - An array of objects, each containing a button label and an action to perform when clicked.
30-
* @returns {Promise<void>} - A promise that resolves when the notification is shown and handled.
31-
* @example
32-
* showInfoNotificationWithMultipleActions(
33-
* "Solution available",
34-
* [
35-
* { label: "View Solution", action: () => openSolution() },
36-
* { label: "Mute for this session", action: () => disableNotifications() }
37-
* ]
38-
* );
39-
*/
27+
* Shows an information notification with multiple buttons that execute custom actions when clicked.
28+
* @param {string} infoMessage - The information message to display.
29+
* @param {Array<{label: string, action: NotificationAction}>} actions - An array of objects, each containing a button label and an action to perform when clicked.
30+
* @returns {Promise<void>} - A promise that resolves when the notification is shown and handled.
31+
* @example
32+
* showInfoNotificationWithMultipleActions(
33+
* "Solution available",
34+
* [
35+
* { label: "View Solution", action: () => openSolution() },
36+
* { label: "Mute for this session", action: () => disableNotifications() }
37+
* ]
38+
* );
39+
*/
4040
export async function showInfoNotificationWithMultipleActions(
4141
infoMessage: string,
4242
actions: { label: string; action: NotificationAction }[]
4343
): Promise<void> {
4444
const selectedOption = await vscode.window.showInformationMessage(
4545
infoMessage,
46-
...actions.map(action => action.label)
46+
...actions.map((action) => action.label)
4747
);
48-
48+
4949
if (selectedOption) {
50-
const selectedAction = actions.find(action => action.label === selectedOption);
50+
const selectedAction = actions.find(
51+
(action) => action.label === selectedOption
52+
);
5153
if (selectedAction) {
5254
await Promise.resolve(selectedAction.action());
5355
}

0 commit comments

Comments
 (0)