Merge branch '5.4.0-develop' into fix/full-text-search

Author: VitaliyBoyko

CHANGELOG.md

@@ -4,8 +4,26 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
 
+## 5.4.0
+
+## 5.3.1
+
+### Fixed
+
+- Custom theme couldn't be detected [#2348](https://github.com/magento/magento2-phpstorm-plugin/pull/2348)
+
 ## 5.3.0
 
+### Added
+
+- Mage-os support [#2081](https://github.com/magento/magento2-phpstorm-plugin/pull/2081)
+
+### Fixed
+
+- Workaround for "thread context was already set" exception [#2082](https://github.com/magento/magento2-phpstorm-plugin/pull/2082)
+- NewObserverDialog form typo [#2087](https://github.com/magento/magento2-phpstorm-plugin/pull/2087)
+- ActionUpdateThread.OLD_EDT deprecation on DumbAwareActions [#2088](https://github.com/magento/magento2-phpstorm-plugin/pull/2088)
+
 ## 5.2.0
 
 ### Fixed

README.md

@@ -42,7 +42,7 @@
 
 1. Check out this repository
 1. Open a folder with the project in the IntelliJ Ultimate using the `open` action button.
-1. Make sure that you on the latest develop branch (e.g `5.3.0-develop`)
+1. Make sure that you on the latest develop branch (e.g `5.4.0-develop`)
 1. Right-click on the `build.gradle` file, choose "Import Gradle project" (if this is not exist look for "Build module '<root folder name>'") (you need to have Gradle plugin installed)
 1. Check if the right SDK version is used for the project.
    - Current Java version for the project is **java 11**, so you should additionally download **SDK 11** and choose it in the module settings: `Right click by the project root > Open Module Settings > Project Settings > Project > Project SDK`

build.gradle

@@ -2,58 +2,52 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
 plugins {
-    id 'org.jetbrains.intellij' version '1.17.3'
+    id "org.jetbrains.intellij.platform" version "2.1.0"
     id 'checkstyle'
     id 'pmd'
     id 'org.jetbrains.changelog' version '2.2.0'
 }
 
 repositories {
     mavenCentral()
+
+    intellijPlatform {
+        defaultRepositories()
+        marketplace()
+    }
 }
 
 group 'com.magento.idea'
-version '5.3.0'
+version '5.4.0'
 
-apply plugin: 'org.jetbrains.intellij'
+apply plugin: 'org.jetbrains.intellij.platform'
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'groovy'
 apply plugin: 'org.jetbrains.changelog'
 
-def phpPluginVersion = System.getProperty("phpPluginVersion", "241.14494.158")
-def ideaVersion = System.getProperty("ideaVersion", "2024.1")
+def phpPluginVersion = System.getProperty("phpPluginVersion", "242.20224.427")
+def ideaVersion = System.getProperty("ideaVersion", "2024.2")
 def javaVersion = 17
 
 java {
     sourceCompatibility = javaVersion
     targetCompatibility = javaVersion
 }
 
-intellij {
+intellijPlatform {
     version = ideaVersion
-    type = 'IU'
-    pluginName = 'com.magento.idea.magento2plugin'
-    plugins = [
-            "com.jetbrains.php:$phpPluginVersion",
-            'yaml',
-            'java-i18n',
-            'properties',
-            'com.intellij.css',
-            'JavaScript',
-            'com.intellij.lang.jsgraphql:241.14494.150',
-            'platform-images',
-            'copyright'
-    ]
-    updateSinceUntilBuild = false
-    sameSinceUntilBuild = false
-    downloadSources = !Boolean.valueOf(System.getenv('CI'))
-    sandboxDir = "${project.rootDir}/.idea-sandbox"
-
-    patchPluginXml {
-        changeNotes = provider { changelog.getLatest().toHTML() }
+    projectName = 'com.magento.idea.magento2plugin'
+
+    pluginConfiguration {
+        id = 'com.magento.idea.magento2plugin'
+        name = 'Magento PhpStorm'
+        version = '5.4.0'
+        description = 'This is a PhpStorm IDE plugin for a better Magento 2 development workflow.'
+        changeNotes = provider { changelog.getLatest().toHTML() } as Provider<? extends String>
     }
 }
 
@@ -114,6 +108,17 @@ dependencies {
     testRuntimeOnly('org.junit.vintage:junit-vintage-engine:5.9.0')
     testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.0")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.00")
+
+    intellijPlatform {
+        intellijIdeaUltimate '2024.2.3'
+        plugin("com.jetbrains.php", phpPluginVersion)
+        plugin("com.intellij.lang.jsgraphql", "242.20224.155")
+        bundledPlugin "JavaScript"
+        instrumentationTools()
+        bundledPlugin 'com.intellij.java'
+
+        testFramework TestFrameworkType.Platform.INSTANCE
+    }
 }
 
 test {

resources/META-INF/plugin.xml

@@ -7,7 +7,7 @@
 <idea-plugin require-restart="true">
     <id>com.magento.idea.magento2plugin</id>
     <name>Magento PhpStorm</name>
-    <version>5.3.0</version>
+    <version>5.4.0</version>
     <vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
 
     <description><![CDATA[
@@ -24,7 +24,7 @@
     </change-notes>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-    <idea-version since-build="241.14494.158"/>
+    <idea-version since-build="242.20224.300"/>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->

src/com/magento/idea/magento2plugin/util/RegExUtil.java

@@ -64,7 +64,7 @@ public static class Magento {
                 = "[A-Z][a-zA-Z0-9]+_[A-Z][a-zA-Z0-9]+";
 
         public static final String THEME_NAME
-                = "[a-z]+/[A-Z][a-zA-Z0-9_]+/[a-z][a-zA-Z0-9_]+";
+                = "[a-z]+/[a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+";
 
         public static final String MFTF_CURLY_BRACES
                 = ".*\\{\\{[^\\}]+\\}\\}.*";