azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better notification logic and explicit code style apply (KT-23400)

Browse Source
This commit is contained in:
Nikolay Krasko
2018-08-09 16:24:41 +03:00
parent 2924bd80d9
commit 563b2f13a3
2 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KtCodeStyleSettings.kt
+7 -2
View File
@@ -13,13 +13,18 @@ import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
data class KtCodeStyleSettings(
val custom: KotlinCodeStyleSettings,
val common: KotlinCommonCodeStyleSettings
val common: KotlinCommonCodeStyleSettings,
val all: CodeStyleSettings
)
fun KtCodeStyleSettings.canRestore(): Boolean {
return custom.canRestore() || common.canRestore()
}
fun KtCodeStyleSettings.hasDefaultLoadScheme(): Boolean {
return custom.CODE_STYLE_DEFAULTS == null || common.CODE_STYLE_DEFAULTS == null
}
fun KtCodeStyleSettings.restore() {
custom.restore()
common.restore()
@@ -32,7 +37,7 @@ fun ktCodeStyleSettings(project: Project): KtCodeStyleSettings? {
val ktCommonSettings = settings.getCommonSettings(KotlinLanguage.INSTANCE) as KotlinCommonCodeStyleSettings
val ktCustomSettings = settings.getCustomSettings(KotlinCodeStyleSettings::class.java)
return KtCodeStyleSettings(ktCustomSettings, ktCommonSettings)
return KtCodeStyleSettings(ktCustomSettings, ktCommonSettings, settings)
}
val CodeStyleSettings.kotlinCommonSettings: KotlinCommonCodeStyleSettings
idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/NewCodeStyleNotification.kt
+45 -15
View File
@@ -12,37 +12,44 @@ import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.runWriteAction
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.idea.formatter.canRestore
import org.jetbrains.kotlin.idea.formatter.ktCodeStyleSettings
import org.jetbrains.kotlin.idea.formatter.restore
import com.intellij.psi.codeStyle.CodeStyleSettingsManager
import org.jetbrains.kotlin.idea.formatter.*
import org.jetbrains.kotlin.idea.util.isDefaultOfficialCodeStyle
private const val KOTLIN_UPDATE_CODE_STYLE_GROUP_ID = "Update Kotlin code style"
private const val KOTLIN_UPDATE_CODE_STYLE_PROPERTY_NAME = "update.kotlin.code.style.notified"
fun notifyKotlinStyleUpdateIfNeeded(project: Project) {
if (PropertiesComponent.getInstance(project).getBoolean(KOTLIN_UPDATE_CODE_STYLE_PROPERTY_NAME, false)) {
if (!isDefaultOfficialCodeStyle) return
@Suppress("DEPRECATION") // Suggested fix is absent in 173. BUNCH: 181
val isProjectSettings = CodeStyleSettingsManager.getInstance(project).USE_PER_PROJECT_SETTINGS
val settingsComponent: PropertiesComponent = if (isProjectSettings) {
PropertiesComponent.getInstance(project)
} else {
PropertiesComponent.getInstance()
}
if (settingsComponent.getBoolean(KOTLIN_UPDATE_CODE_STYLE_PROPERTY_NAME, false)) {
return
}
if (!isDefaultOfficialCodeStyle) return
val notification = KotlinCodeStyleChangedNotification.create(project, isProjectSettings) ?: return
notification.isImportant = true
NotificationsConfiguration.getNotificationsConfiguration()
.register(KOTLIN_UPDATE_CODE_STYLE_GROUP_ID, NotificationDisplayType.STICKY_BALLOON, true)
val notification = KotlinCodeStyleChangedNotification(project)
notification.isImportant = true
if (ApplicationManager.getApplication().isUnitTestMode) {
return
}
PropertiesComponent.getInstance(project).setValue(KOTLIN_UPDATE_CODE_STYLE_PROPERTY_NAME, true, false)
settingsComponent.setValue(KOTLIN_UPDATE_CODE_STYLE_PROPERTY_NAME, true, false)
notification.notify(project)
}
private class KotlinCodeStyleChangedNotification(val project: Project) : Notification(
private class KotlinCodeStyleChangedNotification(val project: Project, isProjectSettings: Boolean) : Notification(
KOTLIN_UPDATE_CODE_STYLE_GROUP_ID,
"Kotlin Code Style",
"""
@@ -55,10 +62,31 @@ private class KotlinCodeStyleChangedNotification(val project: Project) : Notific
) {
init {
val ktFormattingSettings = ktCodeStyleSettings(project)
if (isProjectSettings) {
addAction(object : NotificationAction("Apply new code style") {
override fun actionPerformed(e: AnActionEvent, notification: Notification) {
notification.expire()
val ktSettings = ktCodeStyleSettings(project) ?: return
runWriteAction {
KotlinStyleGuideCodeStyle.apply(ktSettings.all)
}
}
})
}
if (ktFormattingSettings != null && ktFormattingSettings.canRestore()) {
addAction(object : NotificationAction("Restore old settings") {
override fun actionPerformed(e: AnActionEvent, notification: Notification) {
restore(project)
notification.expire()
val ktSettings = ktCodeStyleSettings(project) ?: return
runWriteAction {
ktSettings.restore()
}
}
})
}
@@ -67,12 +95,14 @@ private class KotlinCodeStyleChangedNotification(val project: Project) : Notific
companion object {
val LOG = Logger.getInstance("KotlinCodeStyleChangedNotification")
private fun restore(project: Project) {
val ktSettings = ktCodeStyleSettings(project) ?: return
fun create(project: Project, isProjectSettings: Boolean): KotlinCodeStyleChangedNotification? {
val ktFormattingSettings = ktCodeStyleSettings(project) ?: return null
runWriteAction {
ktSettings.restore()
if (isProjectSettings && !ktFormattingSettings.hasDefaultLoadScheme()) {
return null
}
return KotlinCodeStyleChangedNotification(project, isProjectSettings)
}
}
}