Skip to content

Commit e8939fb

Browse files
committed
Actually fixes compatibility with 2020.3 - limits new updates to 2020.3
1 parent c959887 commit e8939fb

File tree

6 files changed

+13
-19
lines changed

6 files changed

+13
-19
lines changed

CHANGELOG.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88
## [Unreleased]
99
### Added
1010

11-
### Changed
12-
13-
### Deprecated
14-
15-
### Removed
16-
17-
### Fixed
18-
19-
### Security
20-
## [1.3.1]
21-
### Added
22-
2311
### Changed
2412
- Updated dependencies
2513
### Deprecated

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
pluginGroup = nl.deschepers.laraveltinker
55
pluginName_ = Laravel Tinker
66
pluginVersion = 1.3.1
7-
pluginSinceBuild = 201
7+
pluginSinceBuild = 203
88
pluginUntilBuild = 203.*
99
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
1010
# See https://jb.gg/intellij-platform-builds-list for available build versions
11-
pluginVerifierIdeVersions = PS-2020.1, PS-2020.2.3, PS-2020.3, IIU-2020.1.4, IIU-2020.2.3, IIU-2020.3
11+
pluginVerifierIdeVersions = PS-2020.3, IIU-2020.3
1212

1313
platformType = PS
1414
platformVersion = 2020.3

src/main/kotlin/nl/deschepers/laraveltinker/balloon/Balloon.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package nl.deschepers.laraveltinker.balloon
22

33
import com.intellij.notification.Notification
44
import com.intellij.notification.NotificationAction
5-
import com.intellij.notification.NotificationDisplayType
6-
import com.intellij.notification.NotificationGroup
5+
import com.intellij.notification.NotificationGroupManager
76
import com.intellij.notification.NotificationType
87
import com.intellij.notification.Notifications
98
import com.intellij.openapi.project.Project
@@ -14,8 +13,7 @@ open class Balloon(private val project: Project) {
1413
open var content: String = ""
1514

1615
fun show() {
17-
val notificationGroup =
18-
NotificationGroup("Laravel Tinker", NotificationDisplayType.BALLOON, true)
16+
val notificationGroup = NotificationGroupManager.getInstance().getNotificationGroup("Laravel Tinker")
1917
val notification: Notification
2018

2119
if (title != null) {

src/main/kotlin/nl/deschepers/laraveltinker/linemarkerprovider/TinkerRunLineMarkerProvider.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ import com.intellij.icons.AllIcons.RunConfigurations.TestState.Run
66
import com.intellij.openapi.editor.markup.GutterIconRenderer.Alignment.RIGHT
77
import com.intellij.psi.PsiElement
88
import com.intellij.psi.util.elementType
9+
import nl.deschepers.laraveltinker.LaravelTinkerBundle
910
import nl.deschepers.laraveltinker.editor.TinkerConsole
1011
import nl.deschepers.laraveltinker.run.PhpArtisanTinker
1112
import java.awt.event.MouseEvent
13+
import java.util.function.Supplier
1214

1315
class TinkerRunLineMarkerProvider : LineMarkerProvider {
1416
override fun getLineMarkerInfo(element: PsiElement): LineMarkerInfo<*>? {
@@ -27,7 +29,8 @@ class TinkerRunLineMarkerProvider : LineMarkerProvider {
2729
psiElement.containingFile.originalFile.text
2830
).run()
2931
},
30-
RIGHT
32+
RIGHT,
33+
{ LaravelTinkerBundle.message("lt.run") }
3134
)
3235
}
3336
return null

src/main/resources/META-INF/plugin.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
factoryClass="nl.deschepers.laraveltinker.toolwindow.TinkerOutputToolWindowFactory"
4444
icon="/icons/laravel-tinker-icon13.svg"
4545
id="Laravel Tinker"/>
46+
47+
<notificationGroup id="Laravel Tinker" displayType="BALLOON" key="lt.notification.group.name"/>
4648
</extensions>
4749
<id>nl.deschepers.laraveltinker</id>
4850

src/main/resources/messages/LaravelTinkerBundle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name=Laravel Tinker
2+
lt.run=Run Tinker
23
lt.running=Running Tinker..
34
lt.tinker.output=Tinker Output:
45
lt.started.at=// Laravel Tinker started at {0}
@@ -13,3 +14,5 @@ lt.error.stopped.waiting.for.process=Stopped waiting for tinker to finish
1314

1415
lt.setting.show_execution_start=Show the start time of the execution in the output
1516
lt.setting.show_execution_end=Show when execution finishes
17+
18+
lt.notification.group.name=Laravel Tinker

0 commit comments

Comments
 (0)