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

Remove NotificationAction.createSimple to fix compilation in 173

Browse Source
This commit is contained in:
Nikolay Krasko
2018-09-28 00:50:06 +03:00
parent e7bed58ebe
commit 1901331ee5
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/inspectionProfiles/idea_default.xml
Generated
+2
View File
@@ -105,6 +105,8 @@
<Problem reference="org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler#addSpace" reason="Method was replaced with outher methods in 182. Use addSpaceEx instead." /> <Problem reference="org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler#addSpace" reason="Method was replaced with outher methods in 182. Use addSpaceEx instead." />
<Problem reference="com.intellij.psi.codeStyle.CommonCodeStyleSettings#copyFrom" reason="Absent in 173. Use CompatibilityKt.copyFromEx instead." /> <Problem reference="com.intellij.psi.codeStyle.CommonCodeStyleSettings#copyFrom" reason="Absent in 173. Use CompatibilityKt.copyFromEx instead." />
<Problem reference="com.intellij.psi.codeStyle.CommonCodeStyleSettingsManager#copy" reason="Removed since 181. Use CompatibilityKt.copyFromEx instead." /> <Problem reference="com.intellij.psi.codeStyle.CommonCodeStyleSettingsManager#copy" reason="Removed since 181. Use CompatibilityKt.copyFromEx instead." />
<Problem reference="com.intellij.notification.NotificationAction#createSimple" reason="Absent in 173." />
<Problem reference="com.intellij.notification.NotificationAction#create" reason="Absent in 173." />
</list> </list>
</option> </option>
</inspection_tool> </inspection_tool>
idea/src/org/jetbrains/kotlin/idea/configuration/ui/migrationNotification.kt
+9 -5
View File
@@ -38,12 +38,16 @@ internal fun showMigrationNotification(project: Project, migrationInfo: Migratio
null null
) )
.also { notification -> .also { notification ->
notification.addAction(NotificationAction.createSimple("Run migrations") { notification.addAction(object : NotificationAction("Run migrations") {
val projectContext = SimpleDataContext.getProjectContext(project) // Replace with NotificationAction.createSimple after abandoning 173 and as31
val action = ActionManager.getInstance().getAction(CodeMigrationAction.ACTION_ID) // BUNCH: 181
Notification.fire(notification, action, projectContext) override fun actionPerformed(e: AnActionEvent, notification: Notification) {
val projectContext = SimpleDataContext.getProjectContext(project)
val action = ActionManager.getInstance().getAction(CodeMigrationAction.ACTION_ID)
Notification.fire(notification, action, projectContext)
notification.expire() notification.expire()
}
}) })
} }
.notify(project) .notify(project)