chylex/IntelliJ-Rainbow-Brackets
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-Rainbow-Brackets.git synced 2025-05-10 09:34:05 +02:00
Code

Remove deprecated API usage(still need re-compile after build 2021.2 release) & cherry pick change log from branch 2020.2

Browse Source
This commit is contained in:
张志豪 2021-06-12 16:33:17 +08:00
parent c50b43896b
commit 7c35e9ccd5
5 changed files with 16 additions and 9 deletions
gradle.properties
src/main
kotlin/com/github/izhangzhihao/rainbow/brackets
Notify.kt
settings
RainbowSettings.kt
util
AnonymousFeedback.kt
resources/META-INF
plugin.xml

2
gradle.properties
View File

@ -6,7 +6,7 @@ javaVersion=11
kotlinVersion=1.4.21
kotlinLanguageVersion=1.4
kotlinTargetVersion=1.4
version=6.17
version=6.19
publishChannels=Stable
kotlin.stdlib.default.dependency=false
pluginVerifierIdeVersions=WS-2020.3, IIC-2021.1

6
src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/Notify.kt
View File

@ -3,7 +3,7 @@ package com.github.izhangzhihao.rainbow.brackets
import com.intellij.notification.*
import com.intellij.notification.impl.NotificationsManagerImpl
import com.intellij.openapi.Disposable
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.popup.Balloon
import com.intellij.openapi.wm.WindowManager
@ -15,14 +15,14 @@ class ApplicationServicePlaceholder : Disposable {
override fun dispose() = Unit
companion object {
val INSTANCE: ApplicationServicePlaceholder = ServiceManager.getService(ApplicationServicePlaceholder::class.java)
val INSTANCE: ApplicationServicePlaceholder = ApplicationManager.getApplication().getService(ApplicationServicePlaceholder::class.java)
}
}
fun createNotification(title: String, content: String, type: NotificationType,
listener: NotificationListener): Notification {
return NotificationGroupManager.getInstance().getNotificationGroup("Rainbow Brackets Notification Group")
.createNotification(title, content, type, listener)
.createNotification(title, content, type).setListener(listener)
}
fun showFullNotification(project: Project, notification: Notification) {

4
src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/settings/RainbowSettings.kt
View File

@ -1,7 +1,7 @@
package com.github.izhangzhihao.rainbow.brackets.settings
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.components.PersistentStateComponent
import com.intellij.openapi.components.ServiceManager.getService
import com.intellij.openapi.components.State
import com.intellij.openapi.components.Storage
import com.intellij.util.xmlb.XmlSerializerUtil.copyBean
@ -56,6 +56,6 @@ class RainbowSettings : PersistentStateComponent<RainbowSettings> {
companion object {
val instance: RainbowSettings
get() = getService(RainbowSettings::class.java)
get() = ApplicationManager.getApplication().getService(RainbowSettings::class.java)
}
}

4
src/main/kotlin/com/github/izhangzhihao/rainbow/brackets/util/AnonymousFeedback.kt
View File

@ -188,9 +188,9 @@ class GitHubErrorReporter : ErrorReportSubmitter() {
consumer.consume(reportInfo)
val GROUP = NotificationGroupManager.getInstance().getNotificationGroup("Error Report")
if (reportInfo.status == SubmissionStatus.FAILED) GROUP.createNotification(DiagnosticBundle.message("error.report.title"),
reportInfo.linkText, NotificationType.ERROR, null).setImportant(false).notify(project)
reportInfo.linkText, NotificationType.ERROR).setImportant(false).notify(project)
else GROUP.createNotification(DiagnosticBundle.message("error.report.title"), reportInfo.linkText,
NotificationType.INFORMATION, NotificationListener.URL_OPENING_LISTENER).setImportant(false).notify(project)
NotificationType.INFORMATION).setListener(NotificationListener.URL_OPENING_LISTENER).setImportant(false).notify(project)
}
}
}

9
src/main/resources/META-INF/plugin.xml
View File

@ -57,6 +57,13 @@
]]></description>
<change-notes><![CDATA[
<p>6.18</p>
<ul>
<li>Fix <a href="https://github.com/izhangzhihao/intellij-rainbow-brackets/issues/2037">#2037: Wrong coloring in generic `<` after comparison operator `<`.</a></li>
<li>Error report removed.</li>
</ul>
<br/>
<p>6.17</p>
<ul>
<li>Feature <a href="https://github.com/izhangzhihao/intellij-rainbow-brackets/pull/1068">#1068: @keeganwitt Add language exclusions to settings (closes #1046) (#1068) </a></li>
@ -716,7 +723,7 @@
<highlightingPassFactory implementation="com.github.izhangzhihao.rainbow.brackets.indents.RainbowIndentsPassFactory"/>
<applicationService serviceImplementation="com.github.izhangzhihao.rainbow.brackets.ApplicationServicePlaceholder" id="ApplicationServicePlaceholder"/>
<editorNotificationProvider implementation="com.github.izhangzhihao.rainbow.brackets.RainbowifyBanner"/>
<notificationGroup id="Rainbow Brackets Notification Group" displayType="STICKY_BALLOON" key="rainbow.brackets.notification.group"/>
<notificationGroup id="Rainbow Brackets Notification Group" displayType="STICKY_BALLOON"/>
</extensions>
<applicationListeners>