Skip to content
This repository was archived by the owner on Dec 23, 2021. It is now read-only.

Commit 48af30c

Browse files
committed
Fix merge conflicts for dev
2 parents f1f1072 + c0505c7 commit 48af30c

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

src/constants.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ export const CONSTANTS = {
6969
"error.installationError",
7070
"Installation Error"
7171
),
72+
INSTALLATION_ERROR: localize(
73+
"error.installationError",
74+
"Installation Error"
75+
),
7276
INVALID_FILE_EXTENSION_DEBUG: localize(
7377
"error.invalidFileExtensionDebug",
7478
"The file you tried to run isn't a Python file."

src/extension.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,22 @@ export async function activate(context: vscode.ExtensionContext) {
921921
}
922922
);
923923

924+
const showReleaseNote = vscode.commands.registerCommand(
925+
"deviceSimulatorExpress.",
926+
(port, showWarning = true) => {
927+
if (serialMonitor) {
928+
telemetryAI.runWithLatencyMeasure(() => {
929+
serialMonitor.closeSerialMonitor(port, showWarning);
930+
}, TelemetryEventName.COMMAND_SERIAL_MONITOR_CLOSE);
931+
} else {
932+
vscode.window.showErrorMessage(
933+
CONSTANTS.ERROR.NO_FOLDER_OPENED
934+
);
935+
console.info("Serial monitor is not defined.");
936+
}
937+
}
938+
);
939+
924940
UsbDetector.getInstance().initialize(context.extensionPath);
925941
UsbDetector.getInstance().startListening();
926942

0 commit comments

Comments
 (0)