Skip to content

Commit 198f7b9

Browse files
committed
Remove isAvailable overrides and update dependencies (Gradle, plugin version, and platform).
1 parent 5c4070b commit 198f7b9

7 files changed

Lines changed: 8 additions & 37 deletions

File tree

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ pluginGroup = il.co.sysbind.intellij.moodledev
44
pluginName = moodle-dev
55
pluginRepositoryUrl = https://github.com/SysBind/moodle-dev
66
# SemVer format -> https://semver.org
7-
pluginVersion = 2.0.0
7+
pluginVersion = 2.1.0
88

99
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
1010
pluginSinceBuild = 243
11-
pluginUntilBuild = 251.*
11+
pluginUntilBuild = 252.*
1212

1313
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
1414
platformType = PS
15-
platformVersion = 251.23774.350
15+
platformVersion = 2025.2
1616

1717
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1818
# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
19-
platformPlugins = com.dmarcotte.handlebars:251.23774.318
19+
platformPlugins = com.dmarcotte.handlebars:252.23892.201
2020
# Example: platformBundledPlugins = com.intellij.java
2121
platformBundledPlugins = com.jetbrains.php, JavaScript, org.jetbrains.plugins.less, org.jetbrains.plugins.sass
2222
# Gradle Releases -> https://github.com/gradle/gradle/releases
23-
gradleVersion = 8.13
23+
gradleVersion = 9.0.0
2424

2525
# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
2626
kotlin.stdlib.default.dependency = false

gradle/wrapper/gradle-wrapper.jar

1.71 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/main/kotlin/il/co/sysbind/intellij/moodledev/actions/generation/MoodleJavaScriptFileAction.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ class MoodleJavaScriptFileAction: CreateFileFromTemplateAction(CAPTION, "", Java
2424
private val CAPTION = MoodleBundle.getMessage("action.javascript.caption")
2525
}
2626

27-
override fun isAvailable(dataContext: DataContext?): Boolean {
28-
if (!super.isAvailable(dataContext)) return false
29-
val project = CommonDataKeys.PROJECT.getData(dataContext!!) ?: return false
30-
CommonDataKeys.VIRTUAL_FILE.getData(dataContext) ?: return false
31-
val moodle = project.getService(MoodleProjectSettings::class.java).settings
32-
return moodle.pluginEnabled
33-
}
34-
3527
override fun buildDialog(project: Project, directory: PsiDirectory, builder: CreateFileFromTemplateDialog.Builder) {
3628
builder.setTitle(PhpCreateFileAction.CAPTION)
3729
.addKind(MoodleBundle.getMessage("action.javascript.empty.file"), JavaScriptFileType.icon, MoodleBundle.getMessage("action.javascript.template"))

src/main/kotlin/il/co/sysbind/intellij/moodledev/actions/generation/MoodleMustacheTemplateAction.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,17 @@ import com.intellij.ide.actions.CreateFileFromTemplateDialog
55
import com.intellij.ide.fileTemplates.FileTemplate
66
import com.intellij.ide.fileTemplates.FileTemplateManager
77
import com.intellij.ide.fileTemplates.FileTemplateUtil
8-
import com.intellij.openapi.actionSystem.CommonDataKeys
9-
import com.intellij.openapi.actionSystem.DataContext
108
import com.intellij.openapi.project.DumbAware
119
import com.intellij.openapi.project.Project
1210
import com.intellij.psi.PsiDirectory
1311
import com.intellij.psi.PsiFile
1412
import icons.HandlebarsIcons
15-
import il.co.sysbind.intellij.moodledev.MoodleBundle
16-
import il.co.sysbind.intellij.moodledev.project.MoodleProjectSettings
1713
import il.co.sysbind.intellij.moodledev.util.MoodleCorePathUtil
1814

1915
class MoodleMustacheTemplateAction : CreateFileFromTemplateAction(CAPTION, "", HandlebarsIcons.Handlebars_icon),
2016
DumbAware {
2117
override fun getActionName(directory: PsiDirectory?, newName: String, templateName: String?): String = CAPTION
2218

23-
override fun isAvailable(dataContext: DataContext?): Boolean {
24-
if (!super.isAvailable(dataContext)) return false
25-
val project = CommonDataKeys.PROJECT.getData(dataContext!!) ?: return false
26-
CommonDataKeys.VIRTUAL_FILE.getData(dataContext) ?: return false
27-
val moodle = project.getService(MoodleProjectSettings::class.java).settings
28-
return moodle.pluginEnabled
29-
}
30-
3119
override fun buildDialog(project: Project, directory: PsiDirectory, builder: CreateFileFromTemplateDialog.Builder) {
3220
builder.setTitle(PhpCreateFileAction.CAPTION)
3321
.addKind("Empty file", HandlebarsIcons.Handlebars_icon, "Moodle Mustache Template")

src/main/kotlin/il/co/sysbind/intellij/moodledev/actions/generation/MoodlePHPNewClassAction.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import com.intellij.psi.PsiFile
88
import com.intellij.psi.util.PsiTreeUtil
99
import com.intellij.util.ObjectUtils
1010
import com.intellij.util.containers.ContainerUtil
11+
import com.jetbrains.php.PhpIcons
1112
import com.jetbrains.php.actions.PhpNewBaseAction
1213
import com.jetbrains.php.actions.PhpNewClassDataProvider
1314
import com.jetbrains.php.actions.PhpNewClassDialog
1415
import com.jetbrains.php.actions.newClassDataProvider.ClassCreationType
1516
import com.jetbrains.php.actions.statistics.PhpNewClassUsageLogger
1617
import com.jetbrains.php.codeInsight.PhpCodeInsightUtil
1718
import com.jetbrains.php.completion.insert.PhpReferenceInsertHandler
18-
import com.jetbrains.php.lang.PhpFileType
1919
import com.jetbrains.php.lang.PhpLangUtil
2020
import com.jetbrains.php.lang.inspections.classes.PhpAddMethodStubsQuickFix
2121
import com.jetbrains.php.lang.intentions.PhpImportClassIntention
@@ -32,7 +32,7 @@ import il.co.sysbind.intellij.moodledev.util.MoodleCorePathUtil
3232
import java.util.*
3333
import java.util.function.BiConsumer
3434

35-
class MoodlePHPNewClassAction : PhpNewBaseAction(CAPTION, "", PhpFileType.INSTANCE.icon), DumbAware {
35+
class MoodlePHPNewClassAction : PhpNewBaseAction(CAPTION, "", PhpIcons.PHP_FILE), DumbAware {
3636

3737
val SUPERCLASSES_IMPLEMENTOR: BiConsumer<PsiFile, PhpNewClassDialog> =
3838
BiConsumer { psiFile: PsiFile?, dataProvider: PhpNewClassDialog ->

src/main/kotlin/il/co/sysbind/intellij/moodledev/actions/generation/PhpCreateFileAction.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import com.intellij.ide.actions.CreateFileFromTemplateDialog
55
import com.intellij.ide.fileTemplates.FileTemplate
66
import com.intellij.ide.fileTemplates.FileTemplateManager
77
import com.intellij.ide.fileTemplates.FileTemplateUtil
8-
import com.intellij.openapi.actionSystem.CommonDataKeys
9-
import com.intellij.openapi.actionSystem.DataContext
108
import com.intellij.openapi.project.DumbAware
119
import com.intellij.openapi.project.Project
1210
import com.intellij.psi.PsiDirectory
@@ -19,13 +17,6 @@ import il.co.sysbind.intellij.moodledev.util.MoodleCorePathUtil
1917
class PhpCreateFileAction : CreateFileFromTemplateAction(CAPTION, "", PhpIcons.PHP_FILE), DumbAware {
2018
override fun getActionName(directory: PsiDirectory?, newName: String, templateName: String?): String = CAPTION
2119

22-
override fun isAvailable(dataContext: DataContext?): Boolean {
23-
if (!super.isAvailable(dataContext)) return false
24-
val project = CommonDataKeys.PROJECT.getData(dataContext!!) ?: return false
25-
CommonDataKeys.VIRTUAL_FILE.getData(dataContext) ?: return false
26-
val moodle = project.getService(MoodleProjectSettings::class.java).settings
27-
return moodle.pluginEnabled
28-
}
2920
override fun buildDialog(project: Project, directory: PsiDirectory, builder: CreateFileFromTemplateDialog.Builder) {
3021
builder.setTitle(CAPTION)
3122
.addKind(MoodleBundle.getMessage("action.php.empty.file"), PhpIcons.PHP_FILE, MoodleBundle.getMessage("action.php.template"))

0 commit comments

Comments
 (0)