version 1.1.17 for PhpStorm 2024.2 (#58)

Author: Hidanio

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
       pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }}
     steps:
 
-      # Check out current repository
+      # Check out the current repository
       - name: Fetch Sources
         uses: actions/checkout@v4
 
@@ -58,8 +58,6 @@ jobs:
           echo "$CHANGELOG" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
-          ./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier
-
       # Build plugin
       - name: Build plugin
         run: ./gradlew buildPlugin
@@ -77,7 +75,7 @@ jobs:
           - macos-latest
     steps:
 
-      # Check out current repository
+      # Check out the current repository
       - name: Fetch Sources
         uses: actions/checkout@v4
 
@@ -113,7 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      # Check out current repository
+      # Check out the current repository
       - name: Fetch Sources
         uses: actions/checkout@v4
 
@@ -132,7 +130,7 @@ jobs:
 
       # Run Verify Plugin task and IntelliJ Plugin Verifier tool
       - name: Run Plugin Verification tasks
-        run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
+        run: ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
 
       # Collect Plugin Verifier Result
       - name: Collect Plugin Verifier Result

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 .gradle
 .idea
+.intellijPlatform
 .qodana
 build
 src/test/fixtures/gen/

.run/Run Plugin.run.xml

@@ -21,4 +21,4 @@
     <DebugAllEnabled>false</DebugAllEnabled>
     <method v="2" />
   </configuration>
-</component>
+</component>

.run/Run Verifications.run.xml

@@ -11,7 +11,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="runPluginVerifier" />
+          <option value="verifyPlugin" />
         </list>
       </option>
       <option name="vmOptions" value="" />

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## 1.1.7 — 16.09.2024
+
+- Adapt code for PhpStorm 2024.2
+
 ## 1.1.6 — 30.08.2024
 
 - Settings menu and turn off option for modulite icons

build.gradle.kts

@@ -1,60 +1,61 @@
 import org.jetbrains.changelog.Changelog
-
-fun properties(key: String) = providers.gradleProperty(key)
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
 plugins {
     id("java") // Java support
     alias(libs.plugins.kotlin) // Kotlin support
-    alias(libs.plugins.gradleIntelliJPlugin) // Gradle IntelliJ Plugin
+    alias(libs.plugins.intelliJPlatform) // IntelliJ Platform Gradle Plugin
     alias(libs.plugins.changelog) // Gradle Changelog Plugin
 }
 
-group = properties("pluginGroup").get()
-version = properties("pluginVersion").get()
+group = providers.gradleProperty("pluginGroup").get()
+version = providers.gradleProperty("pluginVersion").get()
+
+// Set the JVM language level used to build the project.
+kotlin {
+    jvmToolchain(17)
+}
 
 // Configure project's dependencies
 repositories {
     mavenCentral()
-}
 
-// Set the JVM language level used to build the project.
-kotlin {
-    jvmToolchain(17)
+    // IntelliJ Platform Gradle Plugin Repositories Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-repositories-extension.html
+    intellijPlatform {
+        defaultRepositories()
+    }
 }
 
 // Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog
 dependencies {
-}
+    testImplementation("org.opentest4j:opentest4j:1.3.0") // TODO: remove in the next update
+    testImplementation(libs.junit)
 
-// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
-intellij {
-    pluginName = properties("pluginName")
-    version = properties("platformVersion")
-    type = properties("platformType")
+    // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
+    intellijPlatform {
+        create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
 
-    // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-    plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }
-}
+        // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
+        bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
 
-// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
-changelog {
-    groups.empty()
-    repositoryUrl = properties("pluginRepositoryUrl")
-}
+        // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
+        plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
 
-tasks {
-    wrapper {
-        gradleVersion = properties("gradleVersion").get()
+        instrumentationTools()
+        pluginVerifier()
+        zipSigner()
+        testFramework(TestFrameworkType.Platform)
     }
+}
 
-    patchPluginXml {
-        version = properties("pluginVersion")
-        sinceBuild = properties("pluginSinceBuild")
-        untilBuild = properties("pluginUntilBuild")
+// Configure IntelliJ Platform Gradle Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html
+intellijPlatform {
+    pluginConfiguration {
+        version = providers.gradleProperty("pluginVersion")
 
         val changelog = project.changelog // local variable for configuration cache compatibility
         // Get the latest available change notes from the changelog file
-        changeNotes = properties("pluginVersion").map { pluginVersion ->
+        changeNotes = providers.gradleProperty("pluginVersion").map { pluginVersion ->
             with(changelog) {
                 renderItem(
                     (getOrNull(pluginVersion) ?: getUnreleased())
@@ -64,28 +65,40 @@ tasks {
                 )
             }
         }
-    }
-
-    runIde {
-        maxHeapSize = "8g"
-    }
 
-    buildSearchableOptions {
-        enabled = false
+        ideaVersion {
+            sinceBuild = providers.gradleProperty("pluginSinceBuild")
+            untilBuild = providers.gradleProperty("pluginUntilBuild")
+        }
     }
 
     sourceSets {
         test {
             resources {
-                setSrcDirs(project.files("src/test/fixtures"))
+                setSrcDirs(listOf("src/test/fixtures"))
             }
         }
     }
 
+    pluginVerification {
+        ides {
+            recommended()
+        }
+    }
+}
+
+// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
+changelog {
+    groups.empty()
+    repositoryUrl = providers.gradleProperty("pluginRepositoryUrl")
+}
+
+tasks {
     test {
         delete("src/test/fixtures/gen")
+    }
 
-        setExcludes(listOf("com/vk/modulite/infrastructure/**", "com/vk/modulite/dsl/**"))
-        isScanForTestClasses = false
+    wrapper {
+        gradleVersion = providers.gradleProperty("gradleVersion").get()
     }
 }

gradle.properties

@@ -5,25 +5,26 @@ pluginName = modulite
 pluginRepositoryUrl = https://github.com/VKCOM/modulite
 
 # SemVer format -> https://semver.org
-pluginVersion = 1.1.6
+pluginVersion = 1.1.7
 
-# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-# for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 241
-pluginUntilBuild = 241.*
+# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
+pluginSinceBuild = 242
+pluginUntilBuild = 242.*
 
-# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
+# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = IU
-platformVersion = 2024.1
+platformVersion = 2024.2
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
-# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
+# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
 # PHP Plugin - https://plugins.jetbrains.com/plugin/6610-php/versions
 # YAML Plugin - https://plugins.jetbrains.com/plugin/13126-yaml/versions
-platformPlugins = com.jetbrains.php:241.14494.240, org.jetbrains.plugins.yaml:241.14494.150
+platformPlugins = com.jetbrains.php:242.20224.427, org.jetbrains.plugins.yaml:242.20224.237
+# Example: platformBundledPlugins = com.intellij.java
+platformBundledPlugins = com.intellij.java
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 8.6
+gradleVersion = 8.9
 
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency = false

gradle/libs.versions.toml

@@ -1,14 +1,16 @@
 [versions]
 # libraries
+junit = "4.13.2"
 
 # plugins
-kotlin = "1.9.23"
-changelog = "2.2.0"
-gradleIntelliJPlugin = "1.17.2"
+changelog = "2.2.1"
+intelliJPlatform = "2.0.1"
+kotlin = "1.9.25"
 
 [libraries]
+junit = { group = "junit", name = "junit", version.ref = "junit" }
 
 [plugins]
-kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
-gradleIntelliJPlugin = { id = "org.jetbrains.intellij", version.ref = "gradleIntelliJPlugin" }
+intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatform" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

gradlew.bat

@@ -12,7 +12,7 @@ import com.vk.modulite.utils.unquote
 import org.jetbrains.yaml.psi.YAMLQuotedText
 import org.jetbrains.yaml.psi.YamlPsiElementVisitor
 
-class UnnecessaryFullyQualifiedNameInspection : ConfigInspectionBase() {
+class ModuliteUnnecessaryFullyQualifiedNameInspection : ConfigInspectionBase() {
     class QualifierQuickFix(private val prefix: String) : LocalQuickFix {
         override fun getFamilyName() = "Remove unnecessary qualifier"
 

src/main/kotlin/com/vk/modulite/inspections/config/UnnecessaryFullyQualifiedNameInspection.kt src/main/kotlin/com/vk/modulite/inspections/config/ModuliteUnnecessaryFullyQualifiedNameInspection.kt

@@ -13,7 +13,7 @@ import com.vk.modulite.services.ModuliteDeps
 import com.vk.modulite.utils.childOfType
 import org.jetbrains.yaml.psi.YAMLFile
 
-open class ConfigListTestBase : BasePlatformTestCase() {
+abstract class ConfigListTestBase : BasePlatformTestCase() {
     protected fun doExportTest(symbol: String, before: List<String>, after: List<String>) =
         doListTest("export", symbol, before, after)
 

src/test/kotlin/com/vk/modulite/infrastructure/ConfigListTestBase.kt

@@ -4,7 +4,7 @@ import com.intellij.testFramework.utils.inlays.InlayHintsProviderTestCase
 import com.vk.modulite.highlighting.hints.PhpInlayTypeHintsProvider
 import java.io.File
 
-open class InlayHintsProviderTestBase : InlayHintsProviderTestCase() {
+abstract class InlayHintsProviderTestBase : InlayHintsProviderTestCase() {
     protected fun runHintTest(testFile: String) {
         val testDataFolder = File(testDataPath, "hints")
         assertTrue(testDataFolder.exists())

src/test/kotlin/com/vk/modulite/infrastructure/InlayHintsProviderTestBase.kt

@@ -4,7 +4,7 @@ import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import com.vk.modulite.dsl.IntegrationTestContext
 import com.vk.modulite.dsl.integrationTestBase
 
-open class IntegrationTestBase : BasePlatformTestCase() {
+abstract class IntegrationTestBase : BasePlatformTestCase() {
     protected fun integrationTest(folder: String = "", init: IntegrationTestContext.() -> Unit) {
         integrationTestBase {
             fixture(myFixture)

src/test/kotlin/com/vk/modulite/infrastructure/IntegrationTestBase.kt

@@ -52,7 +52,7 @@ class YamlInspectionsTest : ModuliteInspectionTestBase() {
 
     fun `test unnecessary fully qualified name`() {
         myFixture.enableInspections(InconsistentNestingInspection())
-        myFixture.enableInspections(UnnecessaryFullyQualifiedNameInspection())
+        myFixture.enableInspections(ModuliteUnnecessaryFullyQualifiedNameInspection())
         runFixture("inspections/UnnecessaryFullyQualifiedName")
     }