Skip to content

Commit

Permalink
Actually fixes compatibility with 2020.3 - limits new updates to 2020.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Roboroads committed Dec 6, 2020
1 parent c959887 commit e8939fb
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 19 deletions.
12 changes: 0 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Added

### Changed

### Deprecated

### Removed

### Fixed

### Security
## [1.3.1]
### Added

### Changed
- Updated dependencies
### Deprecated
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
pluginGroup = nl.deschepers.laraveltinker
pluginName_ = Laravel Tinker
pluginVersion = 1.3.1
pluginSinceBuild = 201
pluginSinceBuild = 203
pluginUntilBuild = 203.*
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
# See https://jb.gg/intellij-platform-builds-list for available build versions
pluginVerifierIdeVersions = PS-2020.1, PS-2020.2.3, PS-2020.3, IIU-2020.1.4, IIU-2020.2.3, IIU-2020.3
pluginVerifierIdeVersions = PS-2020.3, IIU-2020.3

platformType = PS
platformVersion = 2020.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ package nl.deschepers.laraveltinker.balloon

import com.intellij.notification.Notification
import com.intellij.notification.NotificationAction
import com.intellij.notification.NotificationDisplayType
import com.intellij.notification.NotificationGroup
import com.intellij.notification.NotificationGroupManager
import com.intellij.notification.NotificationType
import com.intellij.notification.Notifications
import com.intellij.openapi.project.Project
Expand All @@ -14,8 +13,7 @@ open class Balloon(private val project: Project) {
open var content: String = ""

fun show() {
val notificationGroup =
NotificationGroup("Laravel Tinker", NotificationDisplayType.BALLOON, true)
val notificationGroup = NotificationGroupManager.getInstance().getNotificationGroup("Laravel Tinker")
val notification: Notification

if (title != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ import com.intellij.icons.AllIcons.RunConfigurations.TestState.Run
import com.intellij.openapi.editor.markup.GutterIconRenderer.Alignment.RIGHT
import com.intellij.psi.PsiElement
import com.intellij.psi.util.elementType
import nl.deschepers.laraveltinker.LaravelTinkerBundle
import nl.deschepers.laraveltinker.editor.TinkerConsole
import nl.deschepers.laraveltinker.run.PhpArtisanTinker
import java.awt.event.MouseEvent
import java.util.function.Supplier

class TinkerRunLineMarkerProvider : LineMarkerProvider {
override fun getLineMarkerInfo(element: PsiElement): LineMarkerInfo<*>? {
Expand All @@ -27,7 +29,8 @@ class TinkerRunLineMarkerProvider : LineMarkerProvider {
psiElement.containingFile.originalFile.text
).run()
},
RIGHT
RIGHT,
{ LaravelTinkerBundle.message("lt.run") }
)
}
return null
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
factoryClass="nl.deschepers.laraveltinker.toolwindow.TinkerOutputToolWindowFactory"
icon="/icons/laravel-tinker-icon13.svg"
id="Laravel Tinker"/>

<notificationGroup id="Laravel Tinker" displayType="BALLOON" key="lt.notification.group.name"/>
</extensions>
<id>nl.deschepers.laraveltinker</id>

Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/messages/LaravelTinkerBundle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name=Laravel Tinker
lt.run=Run Tinker
lt.running=Running Tinker..
lt.tinker.output=Tinker Output:
lt.started.at=// Laravel Tinker started at {0}
Expand All @@ -13,3 +14,5 @@ lt.error.stopped.waiting.for.process=Stopped waiting for tinker to finish

lt.setting.show_execution_start=Show the start time of the execution in the output
lt.setting.show_execution_end=Show when execution finishes

lt.notification.group.name=Laravel Tinker

0 comments on commit e8939fb

Please sign in to comment.