Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: rephrase VCS confirmation popup #153

Merged
merged 2 commits into from
Nov 5, 2024
Merged

chore: rephrase VCS confirmation popup #153

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d445ffa
rephrase VCS confirmation popup
MarcinVaadin Nov 5, 2024
25d8582
rephrase VCS confirmation popup
MarcinVaadin Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/main/kotlin/com/vaadin/plugin/listeners/ConfigurationCheckVaadinProjectListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.vaadin.plugin.listeners

import com.intellij.debugger.JavaDebuggerBundle
import com.intellij.debugger.settings.DebuggerSettings
import com.intellij.ide.IdeCoreBundle
import com.intellij.ide.actionsOnSave.ActionsOnSaveConfigurable
import com.intellij.ide.util.PropertiesComponent
import com.intellij.ide.util.RunOnceUtil
Expand Down Expand Up @@ -34,10 +33,9 @@ class ConfigurationCheckVaadinProjectListener : VaadinProjectListener {
val MESSAGE_RELOAD_CLASSES = JavaDebuggerBundle.message("label.debugger.hotswap.configurable.reload.classes")
val MESSAGE_RELOAD_ALWAYS = JavaDebuggerBundle.message("label.debugger.hotswap.configurable.always")
val MESSAGE_VCS = VcsBundle.message("version.control.main.configurable.name")
val MESSAGE_WHEN_FILES_CREATED = VcsBundle.message("settings.border.when.files.are.created")
val MESSAGE_ADD_SILENTLY = VcsBundle.message("radio.after.creation.add.silently")
val MESSAGE_DO_NOT_ADD = VcsBundle.message("radio.after.creation.do.not.add")
val MESSAGE_DONT_ASK_AGAIN = IdeCoreBundle.message("dialog.options.do.not.ask")
val MESSAGE_ASK = VcsBundle.message("radio.after.creation.show.options")
}

private var triggered = false
Expand Down Expand Up @@ -82,9 +80,8 @@ class ConfigurationCheckVaadinProjectListener : VaadinProjectListener {
if (value == VcsShowConfirmationOption.Value.SHOW_CONFIRMATION) {
notify(
project,
"Your $MESSAGE_VCS settings requires confirmation after creating each new file. " +
"It will cause popups appear while working with Vaadin Copilot. " +
"To improve experience please set \"$MESSAGE_WHEN_FILES_CREATED\" to \"$MESSAGE_ADD_SILENTLY\" or \"$MESSAGE_DO_NOT_ADD\"",
"Change your $MESSAGE_VCS setting to \"$MESSAGE_DO_NOT_ADD\" or \"$MESSAGE_ADD_SILENTLY\". " +
"The current \"$MESSAGE_ASK\" setting may trigger blocking dialogs in the IDE while using Vaadin Copilot.",
VCS_CONFIRMATION_CONFIGURABLE,
)
}
Expand Down Expand Up @@ -112,14 +109,14 @@ class ConfigurationCheckVaadinProjectListener : VaadinProjectListener {
}

private fun createGoToConfigurationAction(project: Project, configurable: String): AnAction {
return NotificationAction.create("Show in settings...") { _, notification ->
return NotificationAction.create("Go to settings...") { _, notification ->
notification.hideBalloon()
ShowSettingsUtil.getInstance().showSettingsDialog(project, configurable)
}
}

private fun createDontAskAgainAction(project: Project, id: String): NotificationAction {
return NotificationAction.create(MESSAGE_DONT_ASK_AGAIN) { _, notification ->
return NotificationAction.create("Don't show again") { _, notification ->
run {
PropertiesComponent.getInstance(project).setValue(id, false, true)
notification.expire()
Expand Down