Skip to content

Commit e334ae2

Browse files
committed
refactor: simplify file import handling in App component
- Replace manual file input handling with pickFileAsText utility for importing settings from local JSON files. - Enhance error handling for file reading failures. - Streamline code for better readability and maintainability.
1 parent a006469 commit e334ae2

File tree

21 files changed

+184
-45
lines changed

21 files changed

+184
-45
lines changed

src/core/webview/webviewMessageHandler.ts

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -776,28 +776,20 @@ export const webviewMessageHandler = async (
776776
case "importSettingsFromLocal": {
777777
const content = message.text || ""
778778
if (!content) {
779-
vscode.window.showErrorMessage(t("common:errors.message.no_local_settings_content"))
779+
vscode.window.showErrorMessage(t("common:errors.settings_import_failed"))
780780
break
781781
}
782782

783-
try {
784-
await importSettingsWithFeedback(
785-
{
786-
providerSettingsManager: provider.providerSettingsManager,
787-
contextProxy: provider.contextProxy,
788-
customModesManager: provider.customModesManager,
789-
provider: provider,
790-
},
791-
{ fileContents: content },
792-
)
793-
} catch (error) {
794-
console.error("Error importing settings from local file:", error)
795-
vscode.window.showErrorMessage(
796-
t("common:errors.settings_import_failed", {
797-
error: error instanceof Error ? error.message : String(error),
798-
}),
799-
)
800-
}
783+
await importSettingsWithFeedback(
784+
{
785+
providerSettingsManager: provider.providerSettingsManager,
786+
contextProxy: provider.contextProxy,
787+
customModesManager: provider.customModesManager,
788+
provider: provider,
789+
},
790+
{ fileContents: content },
791+
)
792+
801793
break
802794
}
803795
case "exportSettings":

src/i18n/locales/ca/common.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/i18n/locales/de/common.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/i18n/locales/en/common.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@
9595
"cannot_delete_invalid_timestamp": "Cannot delete message: invalid timestamp",
9696
"message_not_found": "Message with timestamp {{messageTs}} not found",
9797
"error_deleting_message": "Error deleting message: {{error}}",
98-
"error_editing_message": "Error editing message: {{error}}",
99-
"no_local_settings_content": "No local settings file content received"
98+
"error_editing_message": "Error editing message: {{error}}"
10099
},
101100
"gemini": {
102101
"generate_stream": "Gemini generate context stream error: {{error}}",

src/i18n/locales/es/common.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/i18n/locales/fr/common.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/i18n/locales/hi/common.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/i18n/locales/id/common.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/i18n/locales/it/common.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/i18n/locales/ja/common.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)