From 08d9939995666fa56521cfe3ca242f65ee25b158 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Mon, 2 Jun 2025 00:03:04 +0300 Subject: [PATCH 01/33] version 1.2.15 for PhpStorm 2025.1 --- .github/workflows/build.yml | 26 ++++++++++++++++------- .run/Run Plugin.run.xml | 2 +- build.gradle.kts | 20 +++++++++++++---- gradle.properties | 11 +++++----- gradle/libs.versions.toml | 8 +++++-- gradle/wrapper/gradle-wrapper.jar | Bin 43583 -> 43705 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 5 ++--- 8 files changed, 50 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23514298..0139ad65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,16 +25,12 @@ jobs: - name: Fetch Sources uses: actions/checkout@v4 - # Validate wrapper - - name: Gradle Wrapper Validation - uses: gradle/actions/wrapper-validation@v3 - # Set up Java environment for the next steps - name: Setup Java uses: actions/setup-java@v4 with: distribution: zulu - java-version: 17 + java-version: 21 # Setup Gradle - name: Setup Gradle @@ -60,7 +56,7 @@ jobs: - name: Build plugin run: ./gradlew buildPlugin - # Run tests + # Run tests and upload a code coverage report test: name: Test (${{ matrix.os }}) needs: [ build ] @@ -83,7 +79,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 17 + java-version: 21 # Setup Gradle - name: Setup Gradle @@ -108,6 +104,13 @@ jobs: runs-on: ubuntu-latest steps: + # Free GitHub Actions Environment Disk Space + - name: Maximize Build Space + uses: jlumbroso/free-disk-space@main + with: + tool-cache: false + large-packages: false + # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 @@ -117,12 +120,19 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 17 + java-version: 21 # Setup Gradle - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 + # Cache Plugin Verifier IDEs + - name: Setup Plugin Verifier IDEs Cache + uses: actions/cache@v4 + with: + path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides + key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }} + # Run Verify Plugin task and IntelliJ Plugin Verifier tool - name: Run Plugin Verification tasks run: ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }} diff --git a/.run/Run Plugin.run.xml b/.run/Run Plugin.run.xml index c4ec3d67..00a760e5 100644 --- a/.run/Run Plugin.run.xml +++ b/.run/Run Plugin.run.xml @@ -22,4 +22,4 @@ false - \ No newline at end of file + diff --git a/build.gradle.kts b/build.gradle.kts index 3e435eb3..fbec6d76 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,5 @@ import org.jetbrains.changelog.Changelog +import org.jetbrains.changelog.markdownToHTML import org.jetbrains.intellij.platform.gradle.TestFrameworkType plugins { @@ -6,6 +7,7 @@ plugins { alias(libs.plugins.kotlin) // Kotlin support alias(libs.plugins.intelliJPlatform) // IntelliJ Platform Gradle Plugin alias(libs.plugins.changelog) // Gradle Changelog Plugin + alias(libs.plugins.kover) // Gradle Kover Plugin } group = providers.gradleProperty("pluginGroup").get() @@ -13,7 +15,7 @@ version = providers.gradleProperty("pluginVersion").get() // Set the JVM language level used to build the project. kotlin { - jvmToolchain(17) + jvmToolchain(21) } // Configure project's dependencies @@ -29,6 +31,7 @@ repositories { // Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog dependencies { testImplementation(libs.junit) + testImplementation(libs.opentest4j) // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html intellijPlatform { @@ -40,9 +43,6 @@ dependencies { // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace. plugins(providers.gradleProperty("platformPlugins").map { it.split(',') }) - instrumentationTools() - pluginVerifier() - zipSigner() testFramework(TestFrameworkType.Platform) } } @@ -50,6 +50,7 @@ dependencies { // Configure IntelliJ Platform Gradle Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html intellijPlatform { pluginConfiguration { + name = providers.gradleProperty("pluginName") version = providers.gradleProperty("pluginVersion") val changelog = project.changelog // local variable for configuration cache compatibility @@ -86,6 +87,17 @@ changelog { repositoryUrl = providers.gradleProperty("pluginRepositoryUrl") } +// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration +kover { + reports { + total { + xml { + onCheck = true + } + } + } +} + tasks { wrapper { gradleVersion = providers.gradleProperty("gradleVersion").get() diff --git a/gradle.properties b/gradle.properties index 7c0e96ac..972cf101 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,21 +7,22 @@ pluginRepositoryUrl = https://github.com/VKCOM/kphpstorm pluginVersion = 1.2.15 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -pluginSinceBuild = 243 -pluginUntilBuild = 243.* +pluginSinceBuild = 251 +pluginUntilBuild = 251.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IU -platformVersion = 2024.3 +platformVersion = 2025.1 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP -platformPlugins = com.jetbrains.php:243.21565.211 +# PHP Plugin - https://plugins.jetbrains.com/plugin/6610-php/versions +platformPlugins = com.jetbrains.php:251.23774.318 # Example: platformBundledPlugins = com.intellij.java platformBundledPlugins = com.intellij.java # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.10.2 +gradleVersion = 8.13 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency = false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 75b9f011..4b459526 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,16 +1,20 @@ [versions] # libraries junit = "4.13.2" +opentest4j = "1.3.0" # plugins changelog = "2.2.1" -intelliJPlatform = "2.0.1" # TODO: update this in next update: https://youtrack.jetbrains.com/issue/MP-7019 -kotlin = "1.9.25" +intelliJPlatform = "2.5.0" +kotlin = "2.1.20" +kover = "0.9.1" [libraries] junit = { group = "junit", name = "junit", version.ref = "junit" } +opentest4j = { group = "org.opentest4j", name = "opentest4j", version.ref = "opentest4j" } [plugins] changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatform" } kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9530d66f5e68d973ea569d8e19de379189..9bbc975c742b298b441bfb90dbc124400a3751b9 100644 GIT binary patch delta 34744 zcmXuJV_+R@)3u$(Y~1X)v28cDZQE*`9qyPrXx!Mg8{4+s*nWFo&-eX5|IMs5>pW(< z=OJ4cAZzeZfy=9lI!r-0aXh8xKdlGq)X)o#ON+mC6t7t0WtgR!HN%?__cvdWdtQC< zrFQ;?l@%CxY55`8y(t7?1P_O7(6pv~(~l!kHB;z2evtUsGHzEDL+y4*no%g#AsI~i zJ%SFMv{j__Yaxnn2NtDK+!1XZX`CB}DGMIT{#8(iAk*`?VagyHx&|p8npkmz=-n!f z3D+^yIjP`D&Lfz500rpq#dJE`vM|-N7=`uN0z86BpiMcCOCS^;6CUG4o1I)W{q6Gv z1vZB6+|7An``GNoG7D!xJGJd_Qv(M-kdVdsIJ?CrXFEH^@Ts83}QX}1%P6KQFNz^-=) z<|qo#qmR!Nonr$p*Uu1Jo2c~KLTrvc*Yw%L+`IL}y|kd+t{NCrXaP=7C00CO?=pgp z!fyr#XFfFXO6z2TP5P1W{H_`$PKzUiGtJd!U52%yAJf}~tgXF`1#}@y`cZl9y{J-A zyUA&-X)+^N?W=2Fm_ce2w$C6>YWp7MgXa{7=kwwy9guBx26=MnPpuSt zB4}vo3{qxa+*{^oHxe7;JMNMp>F`iNv>0!MsFtnb+5eEZ$WI z0M9}rA&cgQ^Q8t_ojofiHaKuhvIB{B9I}3`Dsy3vW8ibigX}Kc912|UZ1uhH?RuHU=i&ePe2w%65)nBkHr7Bx5WwMZj%1B53sUEj0bxI( zEbS%WOUw)3-B0`-m0!{mk7Q%={B#7C^Si>C04@P|qm7$Oxn3ki)G_oNQBTh6CN6d_kt@UKx1Ezdo5)J0Gdf@TcW|{ zdz1V?a>zldA7_5*Pjn6kDj|sbUqt-7X z5+oajeC}*6oi~vxZ#Ac&85cYcC$5OKUnYPv$Y~>H@)mnTtALo*>>5&=0QMr5{5?S; zCDF=RI@94n(!~sa`4Y{JLxgcvRqMM&T!}rRd~Kl#_X4Z&85;})o4W*g>?TaAVXSWB zeY#!8qz^hmC6FERsjTnC)1Xu1UPd7_LfuNvuVqF8(}Jfar=T-K9iChEuZi-FH(P%u zzLrjpq|?}8?g1Vnw^&{eqw~QY0f*9c71&*<5#9f5JlhJmG~IuV*8~nEBLr`KrvOvs zkOLdlZ58K?u>1{vAU0CtT>Il<I{Q8#A!lO7#73V&iN13;oV?Hl?N5xDK63)Rp3%5reb&3n5OQ|9H zDpYEI%JQXcrs^o*SCFY~iYf-VM<`7Tl@+kQS3tfR-fyH_JDaz5SYEMU-bTCLQ=JVG ze?ZPcj95Tci|bVvSZk3^enqQ?pIcZn24V=YT{cf-L|P&{-%%^ql$)^Vu~)Ida=h$bZAMQEi$MM|&b zY8;D;aEba_`W^=VdKfttW)h_zjRA&0A^T*tF*%+}TZQCOvFqKUu=xf1Bx@T?&~S(J zopXniA?s%}Q4p9~F(Ty{8wt$l4oHeT(#U6sAu4>Q+~a;}I>0>??v*wfke}0TwPaeE zj3gWtfNlD{jRgy7;S9PS?su5pnobi%Zoe0LVpw%`<)V=yT~Ht_UUXIna4YUa;p=-T4df6^;bz%;@|$F zK;s9#K@9hqZCST!66N0uPB+FT*kq22%ovtJ%<9ArE%hcX^!(Lz;3?kCZ@Ak*MThjTOKU&t+uJdN*6t$;DDmh zFStdHO>r)8L@qO}K@H~7Z);#f6WU{@Icn7Tc^|IZ`;K^ek9eCWdync`kWCt2s%D-k zE$wyPCui$@gJJ9Q`CtixbMF(GiCCbm`ut(~ce-G|Ji|PZ3~DHlG`Asn;skVhnu0r_ zgGbdmfl|er`87x@uYmd8A+!-3V95GE4&_^9N@hp4SC4 zeFU+Z3Ou&G! zlvZy|iHIIX3X2-Yb7YJ#{SYE9lCoixO+}(|u+H@Z6Rz-l1eZ7{I;vk+Y7kP7ev>hG zv|(I<4?N{EXMSvRgUhbQhDoP1&A;SEUGGep8*!@4u)fNbl3%cts<&=m5<5pi7M-HQ zPS#svbXWu2n&m*K6jL#@xm3VSMJxnxve5J6w1qGv`2>5<6F!uzGVHP1A(_xI7CWlX zm6*wpT@dmQ&pAlm`r~T;)>m5HK^H^cM`pCSoh{;-CE43rMkg<;HnZaCHfMq1LoN0S z%%7|$y~&k6wpiY@rsdCY9ZDh%9W6Pf=2^p=;iv-Ah^ACxwK3VmI}SMNneTa9n%biL z#GoojRHxa}R2zOo!G@<8M-B6vNp?)@_>#mYku#pe{O~t?~}1 zE8`)=BstIRk5W*xZw@2=89@ds?eQ~mxzkrA`y<$oR8bmaUw=rE%lFmzHY&aY8?<-N zp1|bb$(XrOMmiYy{pH#)D1GOmv5aj_?waU~*h~s{VZ&H_PhoXYz`C8Pss{ymY_hPG zt{NY&nPMH#FRvwR+T0(Xo2#T6;=oFmRgA9b-HVY72d|~YF+6v$F%sY0 zS#^LF7sTj>Itvyi!~){Hit*~3imOG*Xh51qLz+!W~`vUBVeZZ5&k34SD%Ha%5#aclSzMfoGWjiq9#rl}j zOf*8NY>VN(`W!DxaBgjBzj3oUAVlLY{R}tiZZ0o>K$vwr?+eggZ!q74m2t?lkvm9z zAmL2=W$jQJL>SSrbIOibe734A(K^B8`M@uao!`E$p+9D!rBea8Oxb|p5r3o4##G8K zMr0I9y&`21{@m=Bi+4tTJ-xy(DB_mG$kYv+qw&VBM(A9^wP9;Yo*6{#5tMpfa;m2FC+%l@ zk_cKXg-d&YUIj3(x{)aNwYGYjSHiOQK2K#yWt$vQomhbnF;Qhkxl`+;i{&+t{PrY` zp5r28&|UvmUK|&Jlv>oX4>XE87Zns?fiE6c;VP7BixT*6n}Zsbv$wd{gXyrE&Sd zhRlv!-{%~xv6yNvx@3^@JEa$={&giRpqZG>`{93 zEjM}YI1i6JSx$DJa&NWcl0M;igxX;est*nz=W16zMfJ0#+s{>Eo>bxmCi)m*43hU1 z;FL43I}nWszjSS%*F1UYt^)4?D6&pDEt1(atK(DKY1pAkNMG`a>_ec;KiT z^xMBBZ9i=;!_hNGlYp^uR0FW^lcBrs_c3ZvhcctW4*T^-DD^OU{{hK8yHahyGyCK& zL0>f0XW|wvi4f`bNTfO+P*Ao^L@8~ezagtl%l z{(2uo71sT3rKTQ-L#Y5Rsy#x)Eo+HQranZmk;r_Hf7WWkRq&QmP{?}do0X=;3U_UYspffJl7v*Y&GnW;M7$C-5ZlL*MU|q*6`Lvx$g^ z6>MRgOZ>~=OyR3>WL0pgh2_ znG)RNd_;ufNwgQ9L6U@`!5=xjzpK_UfYftHOJ)|hrycrpgn-sCKdQ{BY&OEV3`roT|=4I#PT@q`6Lx=Lem2M&k4ghOSjXPH5<%cDd>`!rE} z5;hyRQ|6o>*}@SFEzb7b%5iY}9vOMRGpIQqt%%m)iSpQ@iSAU+A{CmB^&-04fQlV9 z14~oE=?j{b{xE*X^1H)eezKTE27;-=UfNvQZ0kZ+m76{6xqAyTrEB&Oe`Mx{4N;}5 zXp%ojp}JYx6PE}Z`IBO3qWsZEfVPa4EEz0vnsFNkQ!kG8tcec&)k$+s&XmPErROoNxeTh9fATBk)w1g|9*~&S!%r0u6+FTn}dK-qa7cfK~tkJlV zMi{BX!>lQsZhSQUWAf(M6+McPrv>)j<*T&hC!*?qq{@ABJWX z@!~2Y1rhy*Z|x`DZUBuyayz}Kv5Pzrh}1wiHT{9|fh`Wl%ao=lRSwEFl*wy6BZ%vo zrt9Ocbicd1q$a{F6`4#ZQ6vJa@`}IGz+xUr*=6TF^GR?`u{1to&gqJpwf$LN0?G&! zsLNiG+}M+c{*j-Q4I zO!=lj&~{29Os}hgEv`iJ1tU)dx}=ob>DHSHKX|FVu2Y#pO|SsigHRgg4?!FX2>b3W z`m}xI<#_02adGka0TuAIg89kS?>*lKyI)T)Pa)|12XfH;k9}#=dzH6TiciCNO->e9m>!W)l&4B zd74@>_LL9OuJ&v5e0)l7ME@xW)9K@*LUd1RY}Vs_${3YC%+LfSR^H+I=(7Szh2nKB z_8bMoty|M+k9A|hGURVePvMf0XY9NYOiC@h^MLs-X@(8PV4zI7A155!RnZrBE9R1> zuI4E`=JTxyJ#d`!(9_s?T2jxEM*E`){wGI`DBFIz%ouW`Y0cKDfXAGN{};aMpLRvZ zu`PZ-3(+Tsh?UKAr)TQQ;2Jz(kv8{R#!c9Tyeev55@5@Ng*c4-ZQ6vC?o#5>6{;?gVfAIr-+^g>3b$}13U^~?gce6s6k-4ulnzWlFpq}*)2 zd0!wP{2>3U+zYiPaNr+-6O`J;M2Cb`H5hjDXw(1oKK!?dN#Y~ygl{H2|9$( zVg7`gf9*O%Db^Bm6_d808Q!r%K;IUSa(r^hW`w)~)m<)kJ(>{IbCs-LkKJ5Qk~Ujv z|5`OBU>lb7(1IAMvx%~sj+&>%6+_-Pj&OOMzMrkXW}gMmCPOw5zddR}{r9blK&1(w z^6?`m=qMI=B*p~LklFLvlX{LflRXecS#lV$LVwi$+9F8zyE29LgL> zW6R-6z&3x-zL({$nMnbhu|plRO8S_EavN?EKrr+c&Tt;Mk)NC0e|cvyXk%VKb5VIc z;|DN^5)t^}tr&-2q)SbwrF>=k$moYK;yA{Q1!I940KmPvg_Ogb81w$_)i3FgFWG+MS?k=BpkVGk-bRhBF;xJ}wnGN{)?gbry^3=P1@$k^#z9*@tmmB+TZ|L@3#3Z+x z8hJE({GEeEWj#+MnUSN^~c!=G+yW^j=cfN_0!}%(J-f1`G}w^}xi!T8BJDOCri{mGBU? zsKXxeN*=L#<-p_aj6cHtYWMJ+;F`HLeW5cpmeVAhFfy+Y=0rIqqyJ-NRIu-aE*Mvr zVnC-RDR`d1nnQu|^S79I>%9=bPNx1JLOJnB**Y`2WCq zctq<)Cq2^Z%=$*&;QxX30;642;y+=mlMLec6{KA208FQ~_S&tiFQW zp2{C3nyrmgkh+HRmG+$_y19m~0z~b`Mo+m6)Qq82p5)Z6ePn&B=!*twk7Rz%zzm-R z>Qj!PE3XMBY)N-xO(=VpO6=Cky5kpl}fQztM7QzvG#a}5$>2$f5w|}b8=3E)cNQw<%e1xAEwaRHu zhHCGB4Uzs6x3A=7uUBC0({&iNH{!7JgQHVa+ zKfQItwD}sd;587x?M_hzpR|TKtTH^4{`G7*87o_wJrFlmrEjk=jvA z6xBPKYjFB9{0Sj0rBL-z9BuBY_3c||UjVgv2kqw2m<@4#>zfx&8Uhq8u+)q68y+P~ zLT;>P#tv|UD62Nvl`H+UVUXPoFG3>Wt-!sX*=4{XxV|GSC+alg10pP~VaA>^}sRr1I4~ zffa2?H+84k=_w8oc8CQ4Ak-bhjCJIsbX{NQ1Xsi*Ad{!x=^8D6kYup?i~Kr;o`d=$ z*xal=(NL$A?w8d;U8P=`Q;4mh?g@>aqpU}kg5rnx7TExzfX4E=ozb0kFcyc?>p6P# z5=t~3MDR*d{BLI~7ZZG&APgBa4B&r^(9lJO!tGxM7=ng?Py&aN;erj&h``@-V8OA> z=sQ4diM!6K=su^WMbU@R%Tj@%jT5prt8I39 zd3t`Tcw$2G!3;f!#<>>SQ<>g6}Q{xB|sx_%QKm2`NxN|Zl%?Ck6Lu_EMC?*eRxdgS!3zYU#OnO~0&UFei zmP3k9!70^O24j5;G-fH6%T}X{EdO(%*+7ThlNGAh;l?$&{eZ-l`j281o@47x+6Z*DC`R2CkPo{1Behvlt!4${0Q?fBx)iIw$Ky zI#xvxKs1U`uMgeZg5fD>s5AYH*n=+UaRzS?ogn6WwBPK3Gib5@Jj!sZN^tm>M&*r@ zjbBoF7uXJU2MW~JK3%Xa3R}3zsP7qHEqbnC%eKsJ51+% zVAT-eRHwD)0YlfK2&rN549*};CJ8I;dj8rD^PR(>#n?Jccsqx&wF#We;Auv9Vm%-} z3HjpBGp$t5^S$XhJmYAP0q_qM@^#D}NM1FmCCyo;F|wv3_ci@$MA<3An0Aa|>_M&S z%qGjO@w{NI$VKyDF@w5W*6XK~5S`S$@ABWh@uaFIBq~VqOl99dhS}?}3N#JizIfYYt`ZKK0i_e#E;P0)VXh-V!w+qX%^-I0^ok>HAm5)tbBZlYov@XkUL zU}l}NDq{%pc=rmBC>Xi>Y5j9N2WrO58FxmLTZ=$@Fn3>(8~6sbkJ;;Uw!F8zXNoF@ zpW;OS^aL|+aN@xwRNj^&9iX;XxRUuPo`ti>k3Hi3cugt`C(EwuQ&d2lyfO` ze!0fi{eHhU1yN+o%J22|{prPvPOs1S?1eUuGUkR zmzMlCXZtW)ABWasAn53}?BqtPMJ*g>L1i6{$HmoEb@h(kILnMp(2!H!rG?MNH`1V0 zotb`;u#Yz0BZrT1ffVTCV!?{L^z8q11_21ptR0ITbOcaZ!mlWhC_AZb>?2IDV|b_y z9lVt3)0d@W=lNp1ArE;h_;DDQX^_;WtsSIO<;Ly&(#O~Xw$R0~W|xdQk*Y(b2=vLV zt8HX8=;#;$=y}!;Qku2HJbGEzF`2_~&i$&ogHUe5vhx}FLR}K_Mp)J{n*Va2<|pk$ z4tI(7v3A%Z7Z0|ZWw#7%$U#*mv+`Ujlh^N(t63xFt_%*WoJ^oq!U0j+Bx`<>q!J&0sWy4&{@#*BOr-s ztZ68f;l0UT3wf@RRC}_ufMr6rQ69Woa@1sZ50Ww|{yfp8!7rMOh_POTE;|zamq+4OObJ-VeTK|D|h?mfR$^lA{E7pk8DRDz*j&r<&fR>GaG*d zYaJ*q5#n251XIpR6F1o-w>LZ)Cb6Ma^6tCfcOItn1o;$#H?^jqOd(PA)B3HaTlJK zw!~?nh-v-_WBi5*B=IuTZOX2sa{1I!#%VMd5eGe1VcL6 zQ!aDft}>TjlwzEJ9Kr6MWh1MoNNWr$5_?z9BJ=>^_M59+CGj=}Ln)NrZ;Fja%!0oU zAg07?Nw&^fIc9udtYSulVBb-USUpElN!VfpJc>kPV`>B3S$7`SO$B21eH8mymldT} zxRNhSd-uFb&1$^B)%$-O(C$#Ug&+KvM;E9xA=CE*?PIa5wDF_ibV2lMo(Zygl8QK5 zPgH1R(6)1XT9GZ6^ol$p>4UH@5-KV66NF$AH-qOb>-b~+*7)DYsUe&Is0yTx=pn8N zs&2Z4fZ1Wk=dz>AXIfd%>ad=rb-Womi{nVVTfd26+mCx`6ukuQ?gjAROtw&Tuo&w$|&=rEzNzwpuy0 zsqq)r5`=Mst4=HCtEV^^8%+Dv2x+_}4v7qEXSjKf%dOhGh~(FDkBW<~+z&*#4T>r@ z>i7T5TGc96MfD%hr~nK9!%r{Ns9=7fui)N%GN8MvuIrox)(0nNg2{McUIC6nq>dD+ zNvX69vvf=Pw1@x}^K{@%UCL734;&AVta#($&l2E|*VUaKW@h`X*L*;1Kl4tajl}GQ z$K>;*$3y1(<^32Cg8ugi^ZII=I&ina>q@GC&~gQ#Z88(nOj;*j z1{hyEq|R_0v7LZNKB|3jqZPqZOuUG(SuM^Z>0@mzsKqVbRrkTz#TRZ0sTQ|%XiYcE zEE5{9jEB+2Sdga|veYSFZEzOuepHGusAO#pg&R(%Ob@V0Lw;AfQJ{aLUJxnbe`q(m zadg^fXYiWr+mm2akb*J?y`w(!KAL8OfFD!mVWiWrgScgp9^yoh3lNNUxd?YyvgUL z>+!2VXP7Fzq zYQ?(9-r*?N*cJCK&)pbYzuv%R{b;TB_wC1V3nO#12V0ucgp);>!N=;G=l;({KZF>) zNAo=0m|3Zu*PNLa-2v=3r5>-hVI_xYdz0m*f-zUW_=eDqiM3j4MPnS~eIRNdw466? z)yxHI@6d7gL2Qj<_@72W{GDyINBy%X6X&_cF1(##v^}87YGZ87HgfH$&epf>Jlia4 zw53K1M6=Px@YCVTUk!%_MjyBeaWy7c40i47-3B{voi|&|7aXza!(OB~E)U;f>5Wd3&@#UP~gkM*qmK=aeZ zkP}gn%JmKK34}KdEu)4E2~qN)EnAhj>)4dbq&RbLu$BD&kJSoIvr$3A#S%P~l$l1A z!96hNdtFXsta!b+enJ@G;6rv-Rd=IQ_llL#tSGk-mpQi(mhop;lObiTQIARXw~&d> zVuCSG$T&zi?#&PT-fP)`*-d@gc;+tOPDaUA*6>RIrf67& zpZ<1ie#4rJ3HEu>v7sF={4;oXv?_MwEI-^o-Lr@rW%%cd0TR2q`p=rkMOKYzOs&^$ z=xW*e)6p-B(0Ek7w8+!@Cks9>$_#zi44MLyL9X?{sDlihX%V;$%a;wd&RL*XGcb$` zvU}#qxz8wAT)*NQ+lXO>AI`^r7B&IQ3J&{cVNn0aWa)(!fQtV+mm~`vsH24+xI|q{ z4ce$OB1hrqGLn;H#=~Rx%T#b|hN`d6SXt=;Jd=DNX3LO9R8xLX@6p3>SnZO7M+96a z1s=zJKd%qy0#GWLeFgc~?fsCw^$6lG;B*54&@n#>q$#nRSr?2GA4YaSSl5~B2k}R_ zfJE-$C~{O_6Rh6BJbWFuoaeXEI!Q-YSA9EvSG_sjB~-*hf_PM~mJ6BL+IcaF)8$+; z*4A4W&+_Mn6~tF|M8Sz57BxO=W9ZJrNPtdhME>$sS6)etinxj{YkK){@Q${`Vc~dX zLT4UYjwuC>dH8AAjQb{Ji>eMvJ5rH-4a(K{4EyLrCDtta)u#>`V_AvyS?Y(;FRT8L ze`JXZP4s~Quq$m=6NI@}`( z`>o3kbSApxcHP;1Mds3&41!_0r619~@AQr9TW*Swk`Q1JNmIk%nKm(ZbZMHEi z4n%vC0MuAKNz2njKLk~w|6u!|y7FN!SXk5=7>^^p-R4w7R;~G!v<{>H3%SC-?>8jAP&ka=owuQ$sKwU4e8EVyc6V2IpBR56HthbwJ*XdwnwrW4 zcR7oGg7kCmj(q{#ka1d85mRVIo0`1v3+B--4RXv$hGb545y#j7bmu0*>BLnTRZ+mp z29%AP8Id+57Q(6`ep^<tq}GO1dvJ*8~jxjiH0quR*Poy%N3@c8rhlO6YR@LBk%l zux{&bK~LvKYq%d;Tzl|VS=?rkBUD-j$YY-xX)z`zUfH^&($ZYco(Xc1tr|9rwx}=- zk`E2Wwkh*HIVsWej-nJ6HNH)7rWDlB0@`{QG*0)&P+~Ng{m^kG#J*^p`drM(`dnd& z9$U+FH=rXh2py-N$l_0)@|JY;X1hVL`@}qxNi@Zy5hI)@(af%=1cl~L3{fxZWys9G-hLv z*%jvhoba^ePB8YL)`%d%=t6Yh*c5p1S7`+BPjOD*#q4~gv#bn0wOaf_K0SiGC{jp8 zAc_Vk31hKTSUiEU7XNk7`D}S-RUrYb<7%)k+tV0zZ7(}vQN@0C5EI<=$$qW}m7f7I zk>dMLd+kSjN4{OaxBJ^_h?FayJ`Yr)3eC$jdk1@jEzVT=a?{BSjp?&?qPX=xO!ttw zN_s#<#Ve(0i_|cRa=MC2=8MonmoT5)UtF&Wr9-b2ng>>zv{8$*UcIBIXSZ3)x727q zy{r>bdOh?E;ZI(^io=P3`o*tLdsjkjM!rGae!v5QH<3-OBW(XcRhvM!(b)Yas?oK? z$5)Y*YS^_d9H-ZP^_iVooK6EE1(akYvmNkXQGH1`kXg()p94|_F8B@_ABt*7QTmYk z47RyNSjX8nMW&@VZIQ`1WB%-*W4oN#|M}EKDCC_@HQ9!BenOQ{0{i#>IaQkyU-HOT z#8ueeQdKezCP`+p0{|o?!axX6WB@{OJTR;qfs(;uKp@Kjq4Dr)^>R9T+^$ohEYKB= zQx_P+t?e3z}3#W ztf10?br2MbSVn%*3!j2QFu;=K)-ueTmgyYq;%9HjJL_W=dV$#21FIjyv}d3@oIy+c z?IcrTw17F6oYGMQA=66yCh`48DJb}^Q?8r3Lei%QJ!qpxnt5`aP%aJL9ltY7#;qzq)qdoGzpYx=gz7Lz$JJZ4?^Nr`!1MK@k z47M)#_%Bezu?xD<{tFcQ{{@OiDQRGst}MJJdOtp%(wvCymmU}NKvIK%z%RysueJ$h zMe(J;-iblcWW>90Ptma{$`%AUZi8_y>pQy*1GpoiiS>`GK9%)TGXC!$FDO5REO0l^ z&lv``tj^Y#F@DP6&qSkCYO-b8O*XVx^8O@0D}Wv-tbz7`pYOlCS4pVmi!~|4dv-5i^8laoUpk zxH@-rdRED~DyWrZO2290e;bISH8z$=kcmp_ct)+edl012<`vnqx}D^FD$twK8)RpVW@yMvk8CRc&d*ku^a#%~2|u>f%{up2Q6x9Mdt&e&@t?_bEXURy{+@>{ zJjDZB-f~7aGc%-QXc7g4fF1tUfP-hsa@qS*#N2_g3675xMqbzyQnC~pK_jH^3k}w%a6jCW!C?MU zo{9eUxt*=#6(neNmoNf#hiRNdGBu|Q(@9s7|H`J*IMWuCEyE4;3IJtKS-n7f+C1=O z89gY4%6N}DeX%EYz8B!^9f5Sf8V2S}yTJ>r+}=RsLXtADv|&$w!dxTz4oSIuz=8S> ze%G>2|5coCh@K)cA(h6O>kRSfAQt>H_fE#}H@p)v`Tw>aulOfNhyS)7=rI4b9Co$DH=Jd$I?iu%Tq!e%aPW7DXN#iTjDG0TqkpLrhBBzR8`k zD7XbvwV1f*5U7kBxrIxHO}NcgSmCK*P*zt<4FpS5V5@~j2g+wGN-WtIbV``U0-3X< z(0T||f@~2Ebo3UuxzrdG=FuH~6+|7!VsYU$0Z;OEL^Mr^S^zSSbYwE3A~U-vOJDyUDUStXfD%K9;#`BD_z>Zb zYj83mc+8KTgEK6`Y;^Q6ku|@W3|m*M55gt8^^WdrxGslExn_2O8$_a0M&&_Be0KPA zDd|?nYAOvUkTJUXZ7l2Ml&#rK04@AJabu&@g=pIr~b;eo^(8BT(?FunH$AF3j*ZiHB%C({8I)tTa3VRkn) z=9uW|9))}J#GUqRh<&w4yL15QpK%2bM)-YYq2tcqZmh#_)@tYAn7$!Z+6(FhAPs2p z^%a8A6xo5O-hgk)a=r7#iC9Sn=%vgrQsl}WCq)N+4q*=_VT+ac3I+*3lJQ&#epf@`!?G!7S(!aZGWqpGk8(*`ig}*V&iyhzH;xtxA$y_N z>)-lw)z%-mcQ3s#`hcb*fp;U`yikM&{Z0^!k1?*j(d(dK9Vw#6o;HRAhEj6!& zxJ$%z@#hubu+iCATwZBgyl$DO;-%^6*lhP|m`wV*S9e%1oP-d7}LFzNb-nbg&b zLeV~*+>vogxCnjjqMaj6y1jn;s7GQLf{ZSY20O#1YGg;yjg-{KM81iL;0{|;LN@@* z6ST#KrKAJTzEMTb{1d?&eNzE47+;ZFtJ8pB_U~EkOk=`-6MB) zTaU^zm3`7P2kZ;D_=u#Q2t;SHzo8P1xqM5!?7^WSE#u5XoolRV{Q}doTaC)1S08Zy7GJ?pd&8Jjw z`*_`ev(<+Ra2R&CQf7cb97~c^x3voFRhQSEV_1pF(I!QUWEkUh<2Uq?3Cz9FxIKeB|n?CuVkX7tAhr<4Ej#%Cq?uB5e^<(Tu{>54T z!(6b8DmhS=>>S)e9h|J%5}ljxfXIRDVa(%*0*xTQ{+ zUjroY*#_U^>b1Teuc$T-egClH97?IE<0#OhF0Y9ByTKPxej00P`|jMJVCqxQ>44F0 z6StS1JT#Ng(}>CWNb0uNM*qkV5JF(s$Hm`S`+O2LRS#bpUMgwU)x`e2u1#H8woa1YGZIsxydK5$JP$cfI67I1 zBE?jjeY6QO_arp9gg1v9k)(iTssRJl7=WdW!5$tkQ-3&w4c|W=|Bh|HOKy{C>%J3@ zZ|8r+H6nd{{iLE~*`b<}mmrmA{8WRDdlJ%rL%W#To}q01jQ%5ZNy@MC_fzCo_!q8x zb46H1v;|CrZ;mdn-6=g>sqK$5H<)H5rH0*n+c!YnE5YQcu{wHPyVztNP`)K`bv3XO ziFeTQst%KJAd9G3SLmUQ|V9fRRc;+ zPd%sGo1p@XsJh&z8?psQ1@NnY|!@p3%Mm9gi!S*yNThSTSi>xCoEGLx%T*dPC_ zK3J4iwp-OZ&1%b#}32cNRbgvhDTdd7->2vcnO3Mt%o zR22P|KlOg^Lw}@|mzlgUh+KF7hZA-R_k=AFARuTl!02E$Fun#45CtF|+z(y&M--)~ zkX(>sZe#6y_I>oP0}9KH=o`);bPVMO1Tg8k$trp`n2F7Ga^3Z^)#GsOamw&Zg{k!R z#))|f#dP=GU6 zM#KYRBI_eOICiiDR%oBa@n|ggpZJs>v7kQ|)(*x)4xxl6;d76Fl^)QGde*sDZnRit zpWm`UgACR9MH}@~KMp!Y^x#))Vw2>dEk%BKQY#ne{MWqyu__rdoOP0@hS7`G*TR#L zKP;$iLuM2_a){&S^B&D>F@2K;u0F-emkql27M7pe;`+bWflrlI6l9i)&m!9 zKWFwavy<&Bo0Kl4Wl3ARX|f3|khWV=npfMjo3u0yW&5B^b|=Zw-JP&I+cv0p1uCG| z3tkm1a=nURe4rq`*qB%GQMYwPaSWuNfK$rL>_?LeS`IYFZsza~WVW>x%gOxnvRx z*+DI|8n1eKAd%MfOd>si)x&xwi?gu4uHlk~b)mR^xaN%tF_YS3`PXTOwZ^2D9%$Urcby(HWpXn)Q`l!( z7~B_`-0v|36B}x;VwyL(+LqL^S(#KO-+*rJ%orw!fW>yhrco2DwP|GaST2(=ha0EE zZ19qo=BQLbbD5T&9aev)`AlY7yEtL0B7+0ZSiPda4nN~5m_3M9g@G++9U}U;kH`MO+ zQay!Ks-p(j%H||tGzyxHJ2i6Z)>qJ43K#WK*pcaSCRz9rhJS8)X|qkVTTAI)+G?-CUhe%3*J+vM3T=l2Gz?`71c#Z>vkG;A zuZ%vF)I?Bave3%9GUt}zq?{3V&`zQGE16cF8xc#K9>L^p+u?0-go3_WdI?oXJm@Ps6m_FK9%;;epp{iCXIh1z3D?~<4AhPkZ^c-4Z}mO zp@Sa4T#L5>h5BGOn|LS(TA@KB1^r67<@Qp!Vz2yF573JoDBug@iPQ=tr2+7*HcE3(5`Q%{A2 zp%psJG}nJ3lQR>^#z-QI>~|DG_2_261`HHDVmM&*2h2e|uG(OXl?228C|G32{9e%Onc=sVwIVZ=g2{K5s0>v2}V&CZi1_2LA=x)v|&YrWGaH zEe3L=lw}aSiEdWu&2-C5U0O~MpQ2Hj-U8)KQrLg0Wd|XyOt&Gc+g8oC4%@84Q6i;~ zUD^(7ILW`xAcSq1{tW_H3V};43Qpy=%}6HgWDX*C(mPbTgZ`b#A1n`J`|P_^ zx}DxFYEfhc*9DOGsB|m6m#OKsf?;{9-fv{=aPG1$)qI2n`vZ(R8tkySy+d9K1lag&7%F>R(e|_M^wtOmO}n{57Qw z_vv`gm^%s{UN#wnolnujDm_G>W|Bf7g-(AmgR@NtZ2eh!Qb2zWnb$~{NW1qO zOTcT2Y7?BIUmW`dIxST86w{i29$%&}BAXT16@Jl@frJ+a&w-axF1}39sPrZJ3aEbt zugKOG^x537N}*?=(nLD0AKlRpFN5+rz4Uc@PUz|z!k0T|Q|Gq?$bX?pHPS7GG|tpo z&U5}*Zofm%3vR!Q0%370n6-F)0oiLg>VhceaHsY}R>WW2OFytn+z*ke3mBmT0^!HS z{?Ov5rHI*)$%ugasY*W+rL!Vtq)mS`qS@{Gu$O)=8mc?!f0)jjE=p@Ik&KJ_`%4rb z1i-IUdQr3{Zqa|IQA0yz#h--?B>gS@PLTLt6F=3=v*e6s_6w`a%Y2=WmZ&nvqvZtioX0@ykkZ- zm~1cDi>knLm|k~oI5N*eLWoQ&$b|xXCok~ue6B1u&ZPh{SE*bray2(AeBLZMQN#*k zfT&{(5Tr1M2FFltdRtjY)3bk;{gPbHOBtiZ9gNYUs+?A3#)#p@AuY)y3dz(8Dk?cL zCoks}DlcP97juU)dKR8D(GN~9{-WS|ImophC>G;}QVazzTZ6^z91{5<+mRYFhrQeg z|Kn=LOySHXZqU8F1`dXWOJ?NViPE%&FB1@$8!ntuI?)geXh|#JJC1+G^n$h4F)g-P z4WJMPQn{p=fQtw0)}uk;u*&O2z+G5?iW_=1kTy(!AJzj}de{a9WHY+*SqJ7`={VTi)3NK|)*W3PUT#5a$D6oyqH%5zjdO$5 zICHx_V;1Z)4A(rT6aasvZ{{r`HnxK7^fMLS1{;H{o<8j5hz*F@WkKQmDI*Q%Kf$Mo!EpQ)=HV^lsj9KSz->ROVIrXAI0!Q?WUosf8t6CR*rl382^sU3q@($L~E zC(AoyIjS&2(el|I$ za*8oAtqGQs+O~huhBCOFw(^b&bol)FWsp15Sra3v%&#wXz*!kSi!sV>mhe(I=_Zxmz&E1>i6=yB*_X4M#ktdNg7_G}MVRGQ z7^zX=+mQ}1xtg7JN9E(QI&?4}=tP2#z2<7N%zf9rxzynL~!MgNpRvXaU69c*^X2(c?$=h&o~Fvv z06*{JdsM!gF$KALcW(}@Q&Alo`@3h!H3j^@5rFMp8l6-q!cb?1iS$oZfU+}A2< z)&2ZoL34kkSnbf=4>qd%guV7zM1p=amds@nhpkK7mRJlb?9zYI&?4ftd8+RvAYdk~CGE?#q!Bv= zbv1U(iVppMjz8~#Q+|Qzg4qLZ`D&RlZDh_GOr@SyE+h)n%I=lThPD;HsPfbNCEF{k zD;(61l99D=ufxyqS5%Vut1xOqGImJeufdwBLvf7pUVhHb`8`+K+G9 z>llAJ&Yz^XE0;ErC#SR#-@%O3X5^A_t2Kyaba-4~$hvC_#EaAd{YEAr)E*E92q=tk zV;;C}>B}0)oT=NEeZjg^LHx}p zic<&Fy$hApNZFROZbBJ@g_Jp>@Gn*Vg{XhVs!-LSmQL#^6Bh-iT+7Dn)vRT+0ti(1 zYyOQu{Vmgyvx3Tuxk5HG!x2a+(#>q7#Xji%f&ZxT@A*$m8~z`DDl?{&1=gKHThhqt zSBmSpx#kQc$Dh6W76k!dHlhS6V2(R4jj!#3(W?oQfEJB+-dxZOV?gj++sK_7-?qEM1^V z=Sxex)M5X+P{^{c^h3!k*jCU>7pYQ}gsEf>>V^n1+ji40tL#-AxLjHx42bchIx9Z< zz`>51CG4Iboc%m0DAfvd3@b}vv4%oRoYZpZ*dW?+yTcduQlxreAz&6V(Tac9Xw3_` zNotT9g&r{F_{!Xb%hDPJqn`CWqDwai4M@7F4CQ?@C{H~rqxXwD(MFpB4!uljQmH~( zTXJJj3MEVHkt7r8!^R;bp!H=&%-OG&ONKIOgLJtng(VD0u9%2LuXKe7h$?9lQ^#cL zOo}gOx^+ixt2Izmb6{J`u0VexU0j}8Is+?LWLGvQ66Pg0ax4n^G+xW-rwp&fIZ0}l zI?y~wn^6o3{jj*VSEQ}tBVn1#sVTQB(l&Gf(sriC0DKR8#{);Sgb5%k`%l#BfM#W| zfN5C8APnl5w%nrNi{BWrDgudYAZLGEQKTzz^rV(Bst!UI7|8?nB_w}@?_pYX_G?9i zgK?yo0}({MC^6DiO!bB88kijN>+BCQ8v!rg{Y zz$`Hf$tB*WdxSPHMMkJ{&p0(l zyXx|^X_VUQBdh9)?_2P1TViiYqy+91$zg%3%OjzWyY=X^f7I)2-34bDVCEhECAi z^YqS9x@(kD(Bto;VDKfgIo z-)s_q)d2mr4O;DTUTgjOe4f51kd6T9`xa6_AUP*N{jz%!Z0E!Dqq}JlfPZ2EyGN*E zoPHJ^rT;z^0vaI03Z(WcdHTh1suHxs?;>yWLj~GlkAQ#jSWq|nUE}m()bBZ1`Rh^o zO`d+Ar$33kry+En{&JjrML}&gUj3pUFE58(t|p~g@k3p&-uvoFzpGktUMnQ6RxDA& zibYl_A!{@9au^_fB@6;1XHLORS}C(Hi&J8=@>Kw66&QJD@w>_I1XJuBW3_vn?f~bb zTv3_J^W1+E?921QNo!MQiLHISD9?+dP0BsAK+yB?l009uXXMOteoGX;?5I|RG_v#B zf~l?TPy3zGkT`N>WlZRa=k7Vdbz-66IQ979fX!i7Wen@lu-oEcweu$76ZXrc&JWRf z!tLRg2JqNG{;`-H@L` zKHfgY-Lve@vsPT7B0@716|Z$Z-Z{!WV;qGHV!`h!S>b)rZpc`9J))^79ey;7@-=zZ zjys+j=U6maKhDddqZ}XQffIbFYn)R657nRGEG#j`M-Gni4deWVXcr=HoNok4SKTPT zIW&LDw*WrceS&Wj^l1|q_VHWu{Pt**e2;MKxqf%Gt#e^JAKy{jQz4T)LUa6XN40EO zCKLskF@9&B?+PnEe(xB+KN|M<@$&ZP{jM;DemSl!tAG2{Iisge|}6`>*BENm!G2E!s_XsaUit2`a&pfn!ggt)wG<~No zFFD~p(1PRvhIRZaPhi})MXmEm6+(X?Aw+GxB}7gAxHKo)H7d=m&r6ljuG2KX{&D9A zNUe9Q=^7yych#S!-Q!YKbbka8)p==Am-8`N5_Qz~j7dxLQeaeCHYTma$)Fy}ORKS4 z5sf%}(j`4U=~Aq(!-|ZRRXvQijeGJ^%cq3itmW;FI)JsU8k4pNmCazDyH9@=bqwS9 zq)y8?KhH}MpVTd^>?u+Cs!&l|6KH<*pikOqr$wK%YZ7(>z%vWLb^+m&cCQ+h_MDo+ zaXmPW7CD|K$-d&cg$&GVPEi#)hPjGYx|SBxatca)&Ig?*6~uiQKE)tF7l+ci4JvbZ>vQo}1mB?m;{w?j6>1xBD9F+2p#Y zP3U>vfnMicQVHdhK1yDCfacJHG?$*GdGs93XO$LkB~?nFAfNOoRY`xRs9JiG7CM&D zd5!=ra;zY~qn6HhG|^&58(rYoNlP4qwA7KN3mvymz;PR0%5d!IoDF1vxVxNS5wG&fEt`JYIGi>i=Fq;YUc>8aXv_wIKNAm zI$xs8oUc$5M((w)<+NMQ6{7X7iz)2tqz$eebh#@<&91|=(KSq0xZX>fTn|!v{~LlTjaOXR{3kxDZfD5rHpl>gbmAU z@|wOa$t%grx`7}nA|ePPsN0Y)k&2=Mc4?uE@gW0-f>S_2bO;VnKt&W3k$KKdvZh@& z*WWKa@7#~`b#Kuyw9kqd zj%CMuQ9ESPc-)MbM#7}YUL)ZP_L{+siDWcU?e8%n3A4VsFYJpNeLjn2bT>CI3NCJ< zwecm{{XNM@ga#75hHnwEW-M&QOfzo9!Zfi7EH$DX3S}9p>0NY#8jZt#!W_KUc?R>k@Ky-w6=+Da+_s0GJldl zF|P?(31@{B7bweeajQGYky;y%9NZK$oyN7RTWNn&2`?k9Jytjwmk||M(3Z!M&NOYw zT}t~sPOp`iw~(CAw<+U2uUl%xEN7WOyk@N3`M9ikM-q9|HZC|6CJ8jAUA zst!H<<<&6(6Zvbpj!BrzUo!>VHN3A3vo$EF5-6b1Q~ajXENB~lhUA@|>x6=N0u#cf zv&w(qgG`^+5=HoNur`2lvR~b&P zjumO|P8X;=d`c+z1YJlY7&H@Dz-Rts$X0IYE9kSIlqGZ7utSx^+ z2hOEC-eXviWZXQ9;$Va+WlHlU%y|f~w(|)o@(5J0o|3MQ2O@+B<@r*H4*65)(r^JT zq+<*b06XMGclsEElst5dEfFJ;AQfYhRt}O0CVKdGh4Tk3-(^-{kukZb*3oM$ZffpG zMs;jtk2ZjAsn%mND4R~OS73JDbj^Q440{oS&4<@VUYMInc0xxy?FE@$J_^n)b|gY+ zOj;8Pk^)6$w9nbnMms3RSr6q(9wP_)v01|=P}UbkXoS_1#FCl?>&9cjCHOS!yEJqiGd`83Nj00{X6dHFN84%)I^*MZ=*Ihw5FxD0YSJHV{j!9v(DT#k7##q~$ z87Dig!k3EiMO;k|9XhYz8cGVPukGe$N5@yNtQgngIs(U-9QZ2c^1uxg$A}#co1|!Z zzB|+=CrR6lxT%N&|8??u1*Z?CRaGbp6;&#}$uQEzu(M6Tdss;dZl=hPN*%ZG@^9f* zig-F9Wi2cjmjWEC+i?dU`nP`xymRwO$9K3IY`|SvRL^9Jg6|TlJNEL9me$rRD1MJ| z>27?VB1%1i)w5-V-5-nCMyMszfCx0@xjILKpFhA4*}fl9HYZ~jTYYU@{12DS2OXo0 z_u+ot_~UfZNaN>@w4Es$Ye>i&qhgqtxJf9xi6El-@UNPeQ>aXcYVxOUA--x3v1 z3e=7+%#m@}QuMTjN3n--=-{@rNtyYdYS@LJ(G?*np*HILbUeo)+l8N#+F-;^(8w>i z8Q6til8Y^NG7_qa*-n2|4}(k<-HF~R0v*cP7bxlTWNJ1s6#Rz!N zCYesAbm(}4qp%-;B%AF-LyS5Q6@Q|V&Y2ar$uWn(?UstqXy;5$ZOCC_?L$F z@o#dk--?Co{)CGEP^73Kb_^>`G8sAN)M@iNKQLBj>QAcHjIw0!1 zl6{UYd;|bA+CcC#3IGYysWLa4!KA}CsEV#c)JpJcF~NX9mrX2WwItXv+s%I2>x#v) zy%5xDSB`&bU!9COR@6LwbI|OQ&5mf&L^GGZnOXEOLshxOs;Y;ikp^M(l-^>J(o0NIdbt5`(fTq>p%?cG z;%aHXhv=-@!20#xf*q)++kt8IJ5cG{ff?Sy9hfzQIroA8N>Git>3xOUNhe8nUspSV z`GL0DK}<_w!3gRCwOvD~m+Zn6jxTMde<_?egr$S1OySh6XsS!0Wh)wJPX+xd11YQ= zMq7X2tU;U;Xx|ObfO}%y{pchi>ryaM2zAy50_$ltt(ew6h#CF@+U74D#H@hdQ=dX_ z=OChf#oerWnu~l=x>~Mog;wwL7Nl^Iw=e}~8;XZ%co+bp)3O z{Mryc`*3ryyIC*S%Zu;8Y_D3bFAn%8NTYv?y_%Q4zR-DvE(Q*~>ec+JSA76q7D#_w zFR&HI@z>V`9-)xr*ME%7~<$Ykd?U8uZ~EqUe&AlGDqP{uUvna zvy#q%0y2VKf%UxO(ZC2ECkuzLyY#6cJTru6Q`qZQQ+VF1`jr8+bHIwcJg}=iko8FE zDt(bW8pbOr>?{5KLASE=YFFv&(&IM|P6@wK(5#jhxh@Pe7u_QKd{x@L_-HM=1`rX8`BDds3pf+|$)DBqpXrDP>JcOxubC$Dy60;8(mfG^6yXE(+N*UWMW? zA~?H-#B7S@URtmlHC|7dnB!Lqc0vjGi`-tNgQ8uO67%USUuhq}WcpRIpksgNqrx{V z>QkbTfi6_2l0TUk5SXdbPt}D^kwXm^fm04 z^i66Xn0`pLmnhX(P0|TezLiFcQ{E0~v*cmmAR2|PETl7Ls>OakCexUmie^yDw3ccuqd5(wV_6?YM+ zegsV{M=^n{F2a}~qL}DfhDok9nC!X$C9WV!U15~DF2xl0YLvS#K!rPqsqS7(b8m## zZA(3F3H0v&0Z>Z^2u=i$A;aa9-FaPq+e!m55QhI)wY9F+db;s$6+CraswhRp8$lEl zK|$~`-A=dB?15xkFT_5GZ{dXqUibh$lsH=z5gEwL{Q2fjNZvnQ-vDf4Uf{9czi8aM zO&Q!$+;Vr_pzYS&Ac<0?Wu}tYi;@J__n)1+zBq-Wa3ZrY|-n%;+_{BHn|APLH8qfZ}ZXXee!oA>_rzc+m4JD1L)i(VEV-##+;VR(`_BX|7?J@w}DMF>dQQU2}9yj%!XlJ+7xu zIfcB_n#gK7M~}5mjK%ZXMBLy#M!UMUrMK^dti7wUK3mA;FyM@9@onhp=9ppXx^0+a z7(K1q4$i{(u8tiYyW$!Bbn6oV5`vTwt6-<~`;D9~Xq{z`b&lCuCZ~6vv9*bR3El1- zFdbLR<^1FowCbdGTI=6 z$L96-7^dOw5%h5Q7W&>&!&;Mn2Q_!R$8q%hXb#KUj|lRF+m8fk1+7xZPmO|he;<1L zsac`b)EJ~7EpH$ntqD?q8u;tBAStwrzt+K>nq0Mc>(;G;#%f-$?9kmw=}g1wDm#OQM0@K7K=BR+dhUV`*uus`*ND&2x<wG1HL5>74*j@^8Jn_YA_uTKbCF<(bN-6P0vID7dbLE1xY%jjOZPtc z2-(JHfiJCYX>+!y8B2Fm({k0cWxASSs+u_ov64=P?sTYo&rYDDXH?fxvxb>b^|M;q z%}uJ?X5}V30@O1vluQ2hQy*NBwd}kGo8BE>42WYjZn#(~NPFpjeuet!0YO{7M+Et4 zK+vY}8zNGM)1X58C@IM67?0@^Gy_2zq62KcgNW)S%~!UX1LIg~{{L&cVH^pxv&RS8 z7h5Dqhv+b?!UT{rMg#O##tHOouVIW{%W|QnHnAUyjkuZ(R@l7FPsbEG&X{YTZxd6? zGc~wOFg0-e2%mI+LeRc9Mi3vb*?iSmEU7hC;l7%nHAo*ucCtc$edXLFXlD(Sys;Aj z`;iBG;@fw21qcpYFGU6D0@j_)KD&L`tcGuKP_k_u+uZ@Sh<3$bA}GmGrYql z`YBOYe}rLeq-7bVTG?6wpk_57A#-P&*=D9tDbG+8N86Ovlm%$~Fhhg1!#<%uJPW4P+L>rOa{&N2gbFd3Fh-nnA8 zlL@IrHd6K33HFYag|7^pP;EZ&_CU5|tx*P)T5w<3xsYB7C+*ZJvZ7o_)pdFg0Mq37s%lo=)Pp+u-bBo85|bFx@z znXN$P1N#N~1jF)^LHc?61qH?2r$7+}^DzU=b4Sh0ILA`+DkZGwe8`w6RaaLOy2{+; z*G-qRoS@LWVrj2g$m_QBE_9ft8J2%>-hNdge!7N;!t-RmW$Sx$dLFwX06)v6%V+3+ zI_SpK&${J_g&{nfAAf~@mBoJzd1aB-d!go}pMC=xBXEb1?t=6Z2khtQWf04f1vH2D zAzR~Tj#erum;iqZ)uy9mW#IE(g6{gBs0m8`Hho^9SLk>6WYl=|`BSI?aM#~0G0T@g zhZQIE7P486_X7pDDlh!Lpxdh5G=KJg4;1hc2-bl zI9c0tmCMY}Qn=5b(4Vqv{|sKKb)cXA9B?~>}U6*`p`RQ9+ELmfJLHahw z(?8R{AQudS8<=zg^lz2qD}8im+_uhWqYUr=fMT#sIo${8zZfe2N&j7)tPfNL^8Z2} z6)v8;x|<$fDzHr5?L0g@AOmYTwm%3~HQmw+c~!W5LEVM>2|z;BF)jd7U&jQ>xPb5h zeEn5a91wogI=6UL`b7g^&v-q5Y#V}Z4=>PWem5wViJ&4Bv3xeU=0-BSSJgLq4+X0GzB+;^$X5GmqzaR*xhkIN?DGhN6_q3Am7=yuN- zb_|MEpaRpI;Cvp9%i(}%s}RtlP5ojEwsLfL7&QhevV-Nsj0eq<1@D5yAlgMl5n&O9 zX|Vqp%RY4oNyRFF7sWu6%!Dt0yWz|+d4`L7CrbsM*o^`YllRPf2_m#~2I3w7AEh+I zzBIIu%uA#2wR>--P{=o&yasGhV$95c?|JRlO>qdUDA33j5IN=@U7M#9+aa>fFb^X45 z?2QBBpdyCETfk(qrO_G9QH{AF(1{Qg6c9(jWVU>`9kPNV#kqZxKsnG@ z%?+|N3y9-DUAf>)sBX#CYB(Ss;o`eS>0TYtk8(ugt>(!)?E#S%6uC82XIZqAYlIHH zMHZAe8xkWHvSk$;54;FuF~4*RSLzf()!C1J`J>iHkKBN2e70b?Xqa3NOvAB(w2*)%usxAitdXR zXsosCjl0P-*iH$V%MrP>2!E3ZHl@yU_+CN1fffNwny;LnWvPf(q;(3vd z)}hwfgz-(OR5H?(nx==K>;(!(<@t9;uhDT<@L}{HO(kEVmC@_oXQ(0S**-;H@pAPM zql=DME;|u{PV`eSkr1cw8-cy+VdH~Tho_^5PQzI5hn0Vy#^@BR|0?|QZJ6^W2bop9*@$1i0N4&+iqmgc&o1yom5?K6W zxbL!%ch!H^B7N{Ew#U$ikDm9zAzzB|J{M9$Mf%ALP$`-!(j_?i*`%M1k~*I7dLkp< z=!h>iQXd~_`k9coWTEF$u+PukkXqb;1zKnw?ZnMCAU$*2j^CZL_F4f6AMEu3*y|O1 zH*on~MrSW(JZQTj(qC~jzsPRd?74SC6t~&Ho{fJ*H*AMvXXx@p@_Al3UkBY^gXE8Bdj+ z^csKuPu+aSU<4<E+ z*bM#6<ud+wQMn*g0ivOoLF2sMG zMX|YA+;yTTVpqi0qIi@1?JkN$!q*sv^Y<6UyZ3E5ufmiwQi z%d*cc_c?mG&n@>~qR-1dx7`0aeM9!S<^Jm^0J+aC`obd`xi4Gp$3(a6bIbj-cuMM7 zii;+o|1H4kBUC4nix*$<2{av@xW8pXsPUVs;6 zJVT3+(1xAt?9Q3@Iqyu)%%8u%egjy8DR6vr^rrerZ%S*Q{Fc6`FJH6}@8{p6nQo%F$e3uUKnOSQ}Q)_}#>H zIS{p_QQ;x^w&N3pj&F1Hkiv+)I9^?SyjnF{bf|wGg%C(Lf+V!)h2xUId=T2E9mcN1L$QF^ z5g2*u_)h#xV5qoL+7?I^OWPS_a6JtT*$mPcAHy(mJmUtoz)Z1zp0^RJebf|pVGWIs zQB0nO8D@fneP+6d6PT}AA2UVLt7UKlb7PprygKtn-5>!^V1XRwIrG!}4+mn=`W zBk<_rS~lAZls_hOj;GnnAs;L$9u zaRbuj_dhXN_<^afP)`ndO!qW}o+exVj;Uj$zv1Tc32vVWmrHP`CoJ`Zxvp@$E4=rv z{Dp%8tK5(97c5fP{T{ZAA#Omvi%lqOVetgT%V6phEDiQ6oM7cL#+QIm<(v8kP)i30 z>q=X}6rk(Ww~ zN);x^iv)>V)F>R%WhPu8Gn7lW${nB1g?2dLWg6t73{<@%o=iq^d`ejx{msu;S`%=Y z2!BRo(WJ^CT4hqAYqXBuA|4G-hEb5yvQw2Bx7zVRpD;RR2ccOu@PhR3faoc zzJIZ5StRhvJT*c`VV6u>2x;0SlCBHsQ7n>YhA$6iQU$Rd`#A*0pf5UAX^2~Qi`Ky%f6RGsoueIc_WKEcM!=sZzkijF|}LFs~GM=v-1aFc3dl?tifz zSiqvXmL+l|5-?ahOL%3?PG<>&D{-(~{sG3$mZG!I^`lqCHWOSn}?5JWosiW?}R7Hz45Z6M; z|I3ZkC#9f+gJwObwvJ7+lKPKs9)HS$N-3eNAWZc~d`TP=sY$X_md=Li)LwW?#|kR6 zy$#RzQ>|l?27Kf`O2bZM(f5 zT<@B@DC9-<3~{+a6@$%* zbtze+^?#(ya}=}LbSblhT0Q6Rm4>3=gi)o*G!B_6$tq*ItV%e0&U6FU!uj0%!h9}S zX6NEZ9}oimg4WPW?76Hk0#QwuQj$)~3QJw+v|eX=>YZgbHMJs34ZXEzFL($9Pw6>L zDO8nGd&N^$GQH4GKq$+GsmsL%*AWQpwp1!JQ-AyUofV|o;~RKj0^!|%nF=P~ai{JL zHLCol`|FQ7a$D7+PR6Mx&`hnhg>;JWrBjTd0T_>aUBJK||PoA}xw zjpy>>3&$74TY?_p_n~D4+YZ_`VA~C};yEAv@pMP)u1z-biGn_klvcL6s zU`UFOa5WKV3&fLwP#~_QGqNI?vZjX9e_Ddmyv`La8Jre}B_kXk=J63Dn>GS%Nl7ty zD3D2o(^4iZ3mZc%E$ibOHj%F0n#U)zib4~{uoPZTL$0P|m2+KIQ#3oub%T7-d~5T@ z=GJh6j|NV-!5BPIEvv`*E?MCW0ZmUuQo58-cw|hMG8wK%_B(RtIFDydO?RP^e__!P zX;g|RlA4P24jtif(}ij>mC-fQG-YluEa|d!vZky=`ljZ$Ff1r&IZhWinz9xVW74RO zYid$XF*J6~9#4m@lhthw1!$|R%I2dC^$n%=%E!^TkD;QWai13pu*d@!Y6y9c-dw2l zpbj-&crkx2s<6ZhH|C13WnOqNe@}d^VDJ{l;le5kl8?)VY1pm@y|@qed$1aQ;y}@) zL?Jvc0$AuFD-SZv*SVC~K`>q0t1Aq34UJs|`lF_(@D?xDV66bu6ClOSK1t`Q>F~QK z56Cm(MI(a3aT7ypQO-6;vTAZ&m6Uwuwr6=LD-tLFL&h0P zIO1GPDmNp0`#UM72-bPfjP(o)4PIiAp{Ai!ThwhM9u`&DL*e7r45@}qS>??T@1^nnVwqpqQ|k{%dq*L zC>flElRbiyesX2Z>T19VbuXQiV{#@+&4oMF+fTiOA{>-6PSIjcOoKFS6iq+l;13qz z9r6xO;T=vS2R}50ccv2#o=Q|h+CAJH)AW%6InA}KX&=!}FH#s5e>yTlWkaW!*oqO6 z8SU{JVB)Hl0v zvZTX1MRnmt>R(Ase@{zh`Mq(VYx=EF{=B@5S3GzLuQCMxe}@eW>)Mz!MD4@r)31AQ z0&md9FQ^oyd75EqanI>gGg*_2aw+Y?TZJByZ%K~Lw>>z6cc`nDyCqzBkH{8`(LOG~ zi!9q#KEQ__ypNCak(H{r@CidzT+zgq{Y+dopW-YvxkPDIf8F?;VQslqQT}{=AzZ6F zxnZyS=YB7*X}^!B6yLBv)PF1Vi?pQN^vOp4KT@~m?Cor>*}GrNCrA8Eop<;|;99Y} zKl%=)R=@D=O1lzz203Idf@c;Io*aod|N(Ldvd&;<#t}{mYn$t?;DCw($YAa`5v;U*>3p2K6PL7 zys(f}dR3lZQ!YEl$O}x4oh@DO@qatRvqM}Vm)_j>J-94ELt=Krd$CtZ8|QKA>}ys5b|I0wKk~(gw@WTg-gz-E z-n{phQ@gf~i|(7xw!Vj%cOG@#m!2tdzIT#XUxY_=#kr=;#50FJdPiKX;<6g%q5bcD(S^wB;}3Jp@7< zZ8SLqRYg^%-#s)lqC8l`qOsgr%x+u3JE@b!)d9qQ{Pr~%n=KFw@&Ec@m*Rq_0JbiJ-FiiY_(H~OychZCO!23^?kxr zsb6t9-n)(!fBU=h#GNC%a*MbEeJ^QR$1+>KO}iv^@kf((?fv)jjy!#k$T;iB`fx9s zvzxcKJl2e6tM1)!{qv34mp6vCtlhS;y6DDUlXXfveK%ZiQ8{u;>;0mt%BNQ^#D=u4 zTW8me!45Xh8a%S}8iHk*; zc34jqTp|rTRNYt_aaJ*KIuAv!@??P}v9jPJZ-M46271&EMPA8~VY0rX2RK?0r?4_G z=%c8Lbe^oZLUeMavnp62{G3T(ETUTH>k3u~IlNU5tQh%hJ`)sE-+Mq6Yk?H9f)CP} zY_Lp}$-xIK5$7WgHUV@9%T1u`HvwI*i(Pa>H^(8RR7~s8;^31S^uMk^xyMjTmQSU{F9Y?c8LA z6*jEkA*0EOD@2*(y1`E9U7;!i9~1$43N=S==mjf!yh29?-XUURV9-M`*{~m^2y+-k vO&Z*)1cp)oP!FoJdnQj@>B$Ny9`3IcWx78NY!UY=EiM6G;6aIVL4^VU&1=uc delta 34727 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�{ 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 a%EQ2*fnt2> /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. From c344fbd4b02c2375702368dc3268a6d70e7451fb Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Thu, 26 Jun 2025 17:55:58 +0300 Subject: [PATCH 02/33] first version --- .../kphptags/parser/KphpDocTagSimpleParser.kt | 4 +-- .../kphptags/psi/KphpDocElementTypes.kt | 4 ++- .../psi/KphpDocTagSimpleElementType.kt | 36 ------------------- .../kphptags/psi/KphpDocTagSimplePsiImpl.kt | 2 +- .../kphptags/psi/KphpDocTagStubImpl.kt | 11 +++--- .../KphpDocTagSimpleElementTypeStubFactory.kt | 26 ++++++++++++++ ...hpDocTagSimpleElementTypeStubSerializer.kt | 32 +++++++++++++++++ src/main/resources/META-INF/plugin.xml | 6 ++++ 8 files changed, 76 insertions(+), 45 deletions(-) delete mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimpleElementType.kt create mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt create mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagSimpleParser.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagSimpleParser.kt index 7d79960c..32424e02 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagSimpleParser.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagSimpleParser.kt @@ -2,10 +2,10 @@ package com.vk.kphpstorm.kphptags.parser import com.jetbrains.php.lang.documentation.phpdoc.parser.tags.PhpDocTagParser import com.jetbrains.php.lang.parser.PhpPsiBuilder -import com.vk.kphpstorm.kphptags.psi.KphpDocTagSimpleElementType +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes class KphpDocTagSimpleParser : PhpDocTagParser() { - override fun getElementType() = KphpDocTagSimpleElementType + override fun getElementType() = KphpDocElementTypes.kphpDocTagSimple override fun parseContents(builder: PhpPsiBuilder) = true } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt index 37ca0576..41706719 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt @@ -1,5 +1,7 @@ package com.vk.kphpstorm.kphptags.psi +import com.intellij.psi.tree.IElementType +import com.jetbrains.php.lang.PhpLanguage import com.vk.kphpstorm.KphpStormParserDefinition @@ -21,7 +23,7 @@ object KphpDocElementTypes { * * do not store anything in stubs, so their contents is unaccessible from other files * Such doc tags are 'simple' */ - val kphpDocTagSimple = KphpDocTagSimpleElementType + val kphpDocTagSimple = IElementType("@kphp-simple", PhpLanguage.INSTANCE) //KphpDocTagSimpleElementType /** * '@kphp-warn-performance ...' and '@kphp-analyze-performance ...' diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimpleElementType.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimpleElementType.kt deleted file mode 100644 index 1b195298..00000000 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimpleElementType.kt +++ /dev/null @@ -1,36 +0,0 @@ -package com.vk.kphpstorm.kphptags.psi - -import com.intellij.psi.stubs.StubElement -import com.intellij.psi.stubs.StubInputStream -import com.intellij.psi.stubs.StubOutputStream -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub -import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag -import com.jetbrains.php.lang.psi.stubs.PhpStubElementType - -/** - * '@kphp-...' tags that do not store anything to stubs and do not parse its argument as custom psi tree - * are called 'simple'. - * Storing nothing in stubs means that their contents/text MUST be accessed only within THE SAME FILE. - * This is ok for annotators etc, but not ok for something influencing declarations for example. - * @see KphpDocElementTypes.kphpDocTagSimple - */ -object KphpDocTagSimpleElementType : PhpStubElementType("@kphp-...") { - override fun createPsi(stub: PhpDocTagStub): PhpDocTag { - return KphpDocTagSimplePsiImpl(stub, stub.stubType) - } - - override fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { - return KphpDocTagStubImpl(parentStub, this, psi.name, null) - } - - override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { - dataStream.writeName(stub.name) - dataStream.writeName(stub.value) - } - - override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<*>?): PhpDocTagStub { - val name = dataStream.readName()?.toString() ?: throw NullPointerException() - val stubValue = dataStream.readName()?.toString() - return KphpDocTagStubImpl(parentStub, this, name, stubValue) - } -} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimplePsiImpl.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimplePsiImpl.kt index 3a14b801..9bc172ad 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimplePsiImpl.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimplePsiImpl.kt @@ -11,5 +11,5 @@ import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub */ class KphpDocTagSimplePsiImpl : PhpDocTagImpl, KphpDocTagImpl { constructor(node: ASTNode) : super(node) - constructor(stub: PhpDocTagStub, nodeType: IStubElementType<*, *>) : super(stub, nodeType) + constructor(stub: PhpDocTagStub, nodeType: IStubElementType<*, *>) : super(stub, nodeType) // TODO: exp: change IStubElementType -> IElementType } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagStubImpl.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagStubImpl.kt index 16d3b093..63823f82 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagStubImpl.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagStubImpl.kt @@ -3,6 +3,7 @@ package com.vk.kphpstorm.kphptags.psi import com.intellij.psi.stubs.IStubElementType import com.intellij.psi.stubs.StubBase import com.intellij.psi.stubs.StubElement +import com.intellij.psi.tree.IElementType import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag import com.jetbrains.php.lang.psi.resolve.types.PhpType @@ -15,13 +16,13 @@ import com.jetbrains.php.lang.psi.resolve.types.PhpType * TODO: make a research to check are we really need stubs? */ class KphpDocTagStubImpl( - parent: StubElement<*>?, - elementType: IStubElementType<*, *>, - private val name: String, - private val value: String? + parent: StubElement<*>?, + elementType: IElementType, + private val name: String, + private val value: String? ) : StubBase(parent, elementType), PhpDocTagStub { - override fun getType() = PhpType() + fun getType() = PhpType() override fun getName() = name override fun getValue() = value diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt new file mode 100644 index 00000000..58e1ade5 --- /dev/null +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt @@ -0,0 +1,26 @@ +package com.vk.kphpstorm.kphptags.psi.factory + +import com.intellij.lang.ASTNode +import com.intellij.psi.PsiElement +import com.intellij.psi.stubs.StubElement +import com.intellij.psi.stubs.StubElementFactory +import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub +import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes +import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagSimpleElementTypeStubSerializer + +object KphpDocTagSimpleElementTypeStubFactory + : StubElementFactory { + + override fun shouldCreateStub(node: ASTNode): Boolean = + node.elementType == KphpDocElementTypes.kphpDocTagSimple + + override fun createStub( + psi: PhpDocTag, + parentStub: StubElement? + ): PhpDocTagStub = + KphpDocTagSimpleElementTypeStubSerializer().createStub(psi, parentStub) + + override fun createPsi(stub: PhpDocTagStub): PhpDocTag = + KphpDocTagSimpleElementTypeStubSerializer().createPsi(stub) +} \ No newline at end of file diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt new file mode 100644 index 00000000..526b2c54 --- /dev/null +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt @@ -0,0 +1,32 @@ +package com.vk.kphpstorm.kphptags.psi.serializers + +import com.intellij.psi.stubs.StubElement +import com.intellij.psi.stubs.StubInputStream +import com.intellij.psi.stubs.StubOutputStream +import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub +import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer +import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes +import com.vk.kphpstorm.kphptags.psi.KphpDocTagSimplePsiImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl + +class KphpDocTagSimpleElementTypeStubSerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagSimple){ + fun createPsi(stub: PhpDocTagStub): PhpDocTag { + return KphpDocTagSimplePsiImpl(stub, stub.stubType) + } + + fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { + return KphpDocTagStubImpl(parentStub, type, psi.name, null) + } + + override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { + dataStream.writeName(stub.name) + dataStream.writeName(stub.value) + } + + override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<*>?): PhpDocTagStub { + val name = dataStream.readName()?.toString() ?: throw NullPointerException() + val stubValue = dataStream.readName()?.toString() + return KphpDocTagStubImpl(parentStub, type, name, stubValue) + } +} \ No newline at end of file diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index a8184dca..1b40da3b 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -93,7 +93,11 @@ implementationClass="com.vk.kphpstorm.completion.KphpStormCompletionContributor"/> + + + + From e5f2ebd2a6541841f7bec15a990f23d9cec9582d Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Thu, 26 Jun 2025 18:12:48 +0300 Subject: [PATCH 03/33] kphp json tag replace --- .../kphptags/parser/KphpDocTagJsonParser.kt | 4 +-- .../kphptags/psi/KphpDocElementTypes.kt | 2 +- .../kphptags/psi/KphpDocTagJsonElementType.kt | 29 ----------------- .../KphpDocTagJsonElementTypeStubFactory.kt | 22 +++++++++++++ ...TagJsonElementTypeStubFactorySerializer.kt | 32 +++++++++++++++++++ src/main/resources/META-INF/plugin.xml | 5 +++ 6 files changed, 62 insertions(+), 32 deletions(-) delete mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagJsonElementType.kt create mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagJsonElementTypeStubFactory.kt create mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubFactorySerializer.kt diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagJsonParser.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagJsonParser.kt index 80d0d113..0d31c115 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagJsonParser.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagJsonParser.kt @@ -5,12 +5,12 @@ import com.jetbrains.php.lang.documentation.phpdoc.parser.tags.PhpDocTagParser import com.jetbrains.php.lang.parser.PhpParserErrors import com.jetbrains.php.lang.parser.PhpPsiBuilder import com.vk.kphpstorm.exphptype.psi.TokensToExPhpTypePsiParsing +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes import com.vk.kphpstorm.kphptags.psi.KphpDocJsonAttributePsiImpl import com.vk.kphpstorm.kphptags.psi.KphpDocJsonForEncoderPsiImpl -import com.vk.kphpstorm.kphptags.psi.KphpDocTagJsonElementType class KphpDocTagJsonParser : PhpDocTagParser() { - override fun getElementType() = KphpDocTagJsonElementType + override fun getElementType() = KphpDocElementTypes.kphpDocTagJson override fun parseContents(builder: PhpPsiBuilder): Boolean { val paramsTagParser = PhpDocParamTagParser() diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt index 41706719..11a989e9 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt @@ -35,7 +35,7 @@ object KphpDocElementTypes { * '@kphp-json [for EncoderName] attribute[= optional value]' * They don't store stubs, but have a psi parser */ - val kphpDocTagJson = KphpDocTagJsonElementType + val kphpDocTagJson = IElementType("@kphp-json", PhpLanguage.INSTANCE) /** * '@kphp-template-class T1, T2' diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagJsonElementType.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagJsonElementType.kt deleted file mode 100644 index 038db635..00000000 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagJsonElementType.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.vk.kphpstorm.kphptags.psi - -import com.intellij.psi.stubs.StubElement -import com.intellij.psi.stubs.StubInputStream -import com.intellij.psi.stubs.StubOutputStream -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub -import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag -import com.jetbrains.php.lang.psi.stubs.PhpStubElementType - -object KphpDocTagJsonElementType : PhpStubElementType("@kphp-json") { - override fun createPsi(stub: PhpDocTagStub): PhpDocTag { - return KphpDocTagJsonPsiImpl(stub, stub.stubType) - } - - override fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { - return KphpDocTagStubImpl(parentStub, this, psi.name, null) - } - - override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { - dataStream.writeName(stub.name) - dataStream.writeName(stub.value) - } - - override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<*>?): PhpDocTagStub { - val name = dataStream.readName()?.toString() ?: throw NullPointerException() - val stubValue = dataStream.readName()?.toString() - return KphpDocTagStubImpl(parentStub, this, name, stubValue) - } -} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagJsonElementTypeStubFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagJsonElementTypeStubFactory.kt new file mode 100644 index 00000000..4fec4f5d --- /dev/null +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagJsonElementTypeStubFactory.kt @@ -0,0 +1,22 @@ +package com.vk.kphpstorm.kphptags.psi.factory + +import com.intellij.lang.ASTNode +import com.intellij.psi.stubs.StubElement +import com.intellij.psi.stubs.StubElementFactory +import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub +import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes +import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagJsonElementTypeStubFactorySerializer + +object KphpDocTagJsonElementTypeStubFactory : StubElementFactory { + override fun shouldCreateStub(node: ASTNode): Boolean = + node.elementType == KphpDocElementTypes.kphpDocTagJson + + override fun createPsi(stub: PhpDocTagStub): PhpDocTag { + return KphpDocTagJsonElementTypeStubFactorySerializer().createPsi(stub) + } + + override fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { + return KphpDocTagJsonElementTypeStubFactorySerializer().createStub(psi, parentStub) + } +} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubFactorySerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubFactorySerializer.kt new file mode 100644 index 00000000..5e6807ae --- /dev/null +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubFactorySerializer.kt @@ -0,0 +1,32 @@ +package com.vk.kphpstorm.kphptags.psi.serializers + +import com.intellij.psi.stubs.StubElement +import com.intellij.psi.stubs.StubInputStream +import com.intellij.psi.stubs.StubOutputStream +import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub +import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer +import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes +import com.vk.kphpstorm.kphptags.psi.KphpDocTagSimplePsiImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl + +class KphpDocTagJsonElementTypeStubFactorySerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagJson) { + override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { + dataStream.writeName(stub.name) + dataStream.writeName(stub.value) + } + + override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<*>?): PhpDocTagStub { + val name = dataStream.readName()?.toString() ?: throw NullPointerException() + val stubValue = dataStream.readName()?.toString() + return KphpDocTagStubImpl(parentStub, type, name, stubValue) + } + + fun createPsi(stub: PhpDocTagStub): PhpDocTag { + return KphpDocTagSimplePsiImpl(stub, stub.stubType) + } + + fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { + return KphpDocTagStubImpl(parentStub, type, psi.name, null) + } +} \ No newline at end of file diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 1b40da3b..b0170bbf 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -97,6 +97,9 @@ + + @@ -116,6 +119,8 @@ + From 7a9f3b1866eecc6d7738dd7a58bd537a9ff63fe1 Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Thu, 26 Jun 2025 18:29:34 +0300 Subject: [PATCH 04/33] kphp tag warn replaced + fix for json tag --- .../parser/KphpDocTagWarnPerformanceParser.kt | 4 ++-- .../kphptags/psi/KphpDocElementTypes.kt | 2 +- ...DocTagWarnPerformanceElementTypeFactory.kt | 24 +++++++++++++++++++ ...TagJsonElementTypeStubFactorySerializer.kt | 4 ++-- ...agWarnPerformanceElementTypeSerializer.kt} | 18 +++++++------- src/main/resources/META-INF/plugin.xml | 4 ++++ 6 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagWarnPerformanceElementTypeFactory.kt rename src/main/kotlin/com/vk/kphpstorm/kphptags/psi/{KphpDocTagWarnPerformanceElementType.kt => serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt} (58%) diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagWarnPerformanceParser.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagWarnPerformanceParser.kt index 72c16414..8f088304 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagWarnPerformanceParser.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagWarnPerformanceParser.kt @@ -4,11 +4,11 @@ import com.jetbrains.php.lang.documentation.phpdoc.lexer.PhpDocTokenTypes import com.jetbrains.php.lang.documentation.phpdoc.parser.tags.PhpDocTagParser import com.jetbrains.php.lang.parser.PhpParserErrors import com.jetbrains.php.lang.parser.PhpPsiBuilder -import com.vk.kphpstorm.kphptags.psi.KphpDocTagWarnPerformanceElementType +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes import com.vk.kphpstorm.kphptags.psi.KphpDocWarnPerformanceItemPsiImpl class KphpDocTagWarnPerformanceParser : PhpDocTagParser() { - override fun getElementType() = KphpDocTagWarnPerformanceElementType + override fun getElementType() = KphpDocElementTypes.kphpDocTagWarnPerformance override fun parseContents(builder: PhpPsiBuilder): Boolean { do { diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt index 11a989e9..a838ca6b 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt @@ -29,7 +29,7 @@ object KphpDocElementTypes { * '@kphp-warn-performance ...' and '@kphp-analyze-performance ...' * They don't store stubs, but have a psi parser */ - val kphpDocTagWarnPerformance = KphpDocTagWarnPerformanceElementType + val kphpDocTagWarnPerformance = IElementType("@kphp-warn-performance", PhpLanguage.INSTANCE) /** * '@kphp-json [for EncoderName] attribute[= optional value]' diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagWarnPerformanceElementTypeFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagWarnPerformanceElementTypeFactory.kt new file mode 100644 index 00000000..046915be --- /dev/null +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagWarnPerformanceElementTypeFactory.kt @@ -0,0 +1,24 @@ +package com.vk.kphpstorm.kphptags.psi.factory + +import com.intellij.lang.ASTNode +import com.intellij.psi.PsiElement +import com.intellij.psi.stubs.StubElement +import com.intellij.psi.stubs.StubElementFactory +import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub +import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes +import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagWarnPerformanceElementTypeSerializer + +object KphpDocTagWarnPerformanceElementTypeFactory : StubElementFactory { + override fun shouldCreateStub(node: ASTNode): Boolean = + node.elementType == KphpDocElementTypes.kphpDocTagWarnPerformance + + + override fun createStub(psi: PhpDocTag, parentStub: StubElement?): PhpDocTagStub{ + return KphpDocTagWarnPerformanceElementTypeSerializer().createStub(psi, parentStub) + } + + override fun createPsi(stub: PhpDocTagStub): PhpDocTag? { + return KphpDocTagWarnPerformanceElementTypeSerializer().createPsi(stub) + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubFactorySerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubFactorySerializer.kt index 5e6807ae..0164ac5d 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubFactorySerializer.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubFactorySerializer.kt @@ -7,7 +7,7 @@ import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.KphpDocTagSimplePsiImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocTagJsonPsiImpl import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl class KphpDocTagJsonElementTypeStubFactorySerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagJson) { @@ -23,7 +23,7 @@ class KphpDocTagJsonElementTypeStubFactorySerializer : PhpDocTagStubSerializer(K } fun createPsi(stub: PhpDocTagStub): PhpDocTag { - return KphpDocTagSimplePsiImpl(stub, stub.stubType) + return KphpDocTagJsonPsiImpl(stub, stub.stubType) } fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagWarnPerformanceElementType.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt similarity index 58% rename from src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagWarnPerformanceElementType.kt rename to src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt index 67a291f4..fa33ef9f 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagWarnPerformanceElementType.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt @@ -1,19 +1,20 @@ -package com.vk.kphpstorm.kphptags.psi +package com.vk.kphpstorm.kphptags.psi.serializers import com.intellij.psi.stubs.StubElement import com.intellij.psi.stubs.StubInputStream import com.intellij.psi.stubs.StubOutputStream import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub +import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag -import com.jetbrains.php.lang.psi.stubs.PhpStubElementType +import com.vk.kphpstorm.kphptags.psi.* -object KphpDocTagWarnPerformanceElementType : PhpStubElementType("@kphp-warn-performance") { - override fun createPsi(stub: PhpDocTagStub): PhpDocTag { +class KphpDocTagWarnPerformanceElementTypeSerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagWarnPerformance){ + fun createPsi(stub: PhpDocTagStub): PhpDocTag { return KphpDocTagWarnPerformancePsiImpl(stub, stub.stubType) } - override fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { - return KphpDocTagStubImpl(parentStub, this, psi.name, null) + fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { + return KphpDocTagStubImpl(parentStub, type, psi.name, null) } override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { @@ -24,7 +25,6 @@ object KphpDocTagWarnPerformanceElementType : PhpStubElementType?): PhpDocTagStub { val name = dataStream.readName()?.toString() ?: throw NullPointerException() val stubValue = dataStream.readName()?.toString() - return KphpDocTagStubImpl(parentStub, this, name, stubValue) + return KphpDocTagStubImpl(parentStub, type, name, stubValue) } -} - +} \ No newline at end of file diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index b0170bbf..b28db3d0 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -99,6 +99,8 @@ implementation="com.vk.kphpstorm.kphptags.psi.factory.KphpDocTagSimpleElementTypeStubFactory"/> + @@ -121,6 +123,8 @@ implementation="com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagSimpleElementTypeStubSerializer"/> + From 244a3e91ccd58ca0c9f92174c025d32efe9ed135 Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Fri, 27 Jun 2025 01:19:51 +0300 Subject: [PATCH 05/33] kphp tag template replaced --- .../parser/KphpDocTagTemplateClassParser.kt | 4 +-- .../kphptags/psi/KphpDocElementTypes.kt | 3 +-- ...hpDocTagTemplateClassElementTypeFactory.kt | 25 +++++++++++++++++++ ...cTagTemplateClassElementTypeSerializer.kt} | 24 +++++++++--------- src/main/resources/META-INF/plugin.xml | 5 ++++ 5 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt rename src/main/kotlin/com/vk/kphpstorm/kphptags/psi/{KphpDocTagTemplateClassElementType.kt => serializers/KphpDocTagTemplateClassElementTypeSerializer.kt} (57%) diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagTemplateClassParser.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagTemplateClassParser.kt index aa65abce..cf1c0d55 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagTemplateClassParser.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/parser/KphpDocTagTemplateClassParser.kt @@ -4,11 +4,11 @@ import com.jetbrains.php.lang.documentation.phpdoc.lexer.PhpDocTokenTypes import com.jetbrains.php.lang.documentation.phpdoc.parser.tags.PhpDocTagParser import com.jetbrains.php.lang.parser.PhpParserErrors import com.jetbrains.php.lang.parser.PhpPsiBuilder -import com.vk.kphpstorm.kphptags.psi.KphpDocTagTemplateClassElementType +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes import com.vk.kphpstorm.kphptags.psi.KphpDocTplParameterDeclPsiImpl class KphpDocTagTemplateClassParser : PhpDocTagParser() { - override fun getElementType() = KphpDocTagTemplateClassElementType + override fun getElementType() = KphpDocElementTypes.kphpDocTagTemplateClass override fun parseContents(builder: PhpPsiBuilder): Boolean { do { diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt index a838ca6b..9be3a92b 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt @@ -42,8 +42,7 @@ object KphpDocElementTypes { * (NOTE! This is not working in KPHP for now, it is just a matter of IDE experiments for future) * This tag stores "T1,T2" in stubs and has custom psi for them, therefore is not simple */ - val kphpDocTagTemplateClass = KphpDocTagTemplateClassElementType - + val kphpDocTagTemplateClass = IElementType("@kphp-template-class", PhpLanguage.INSTANCE) } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt new file mode 100644 index 00000000..1a25ff38 --- /dev/null +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt @@ -0,0 +1,25 @@ +package com.vk.kphpstorm.kphptags.psi.factory + +import com.intellij.lang.ASTNode +import com.intellij.psi.PsiElement +import com.intellij.psi.stubs.StubElement +import com.intellij.psi.stubs.StubElementFactory +import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub +import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes +import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagTemplateClassElementTypeSerializer + +object KphpDocTagTemplateClassElementTypeFactory : StubElementFactory { + override fun createPsi(stub: PhpDocTagStub): PhpDocTag { + return KphpDocTagTemplateClassElementTypeSerializer().createPsi(stub) + } + + override fun createStub(psi: PhpDocTag, parentStub: StubElement?): PhpDocTagStub { + return KphpDocTagTemplateClassElementTypeSerializer().createStub(psi, parentStub) + } + + override fun shouldCreateStub(node: ASTNode): Boolean = + node.elementType == KphpDocElementTypes.kphpDocTagTemplateClass + + +} \ No newline at end of file diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagTemplateClassElementType.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt similarity index 57% rename from src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagTemplateClassElementType.kt rename to src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt index b0e5f85a..756984f4 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagTemplateClassElementType.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt @@ -1,25 +1,25 @@ -package com.vk.kphpstorm.kphptags.psi +package com.vk.kphpstorm.kphptags.psi.serializers import com.intellij.psi.stubs.StubElement import com.intellij.psi.stubs.StubInputStream import com.intellij.psi.stubs.StubOutputStream import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub +import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag -import com.jetbrains.php.lang.psi.stubs.PhpStubElementType +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes +import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocTagTemplateClassPsiImpl -/** - * '@kphp-template-class T1, T2' has a separate elementType, psi for 'T1' and 'T2' and stub contents - * @see KphpDocElementTypes.kphpDocTagTemplateClass - */ -object KphpDocTagTemplateClassElementType : PhpStubElementType("@kphp-template-class") { - override fun createPsi(stub: PhpDocTagStub): PhpDocTag { +class KphpDocTagTemplateClassElementTypeSerializer : + PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagTemplateClass) { + fun createPsi(stub: PhpDocTagStub): PhpDocTag { return KphpDocTagTemplateClassPsiImpl(stub, stub.stubType) } - override fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { + fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { // stub value is 'T1,T2' — without spaces val stubValue = (psi as KphpDocTagTemplateClassPsiImpl).getTemplateArguments().joinToString(",") - return KphpDocTagStubImpl(parentStub, this, psi.name, stubValue) + return KphpDocTagStubImpl(parentStub, type, psi.name, stubValue) } override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { @@ -30,6 +30,6 @@ object KphpDocTagTemplateClassElementType : PhpStubElementType?): PhpDocTagStub { val name = dataStream.readName()?.toString() ?: throw NullPointerException() val stubValue = dataStream.readName()?.toString() - return KphpDocTagStubImpl(parentStub, this, name, stubValue) + return KphpDocTagStubImpl(parentStub, type, name, stubValue) } -} +} \ No newline at end of file diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index b28db3d0..63070dc6 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -101,6 +101,8 @@ implementation="com.vk.kphpstorm.kphptags.psi.factory.KphpDocTagJsonElementTypeStubFactory"/> + @@ -125,6 +127,9 @@ implementation="com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagJsonElementTypeStubFactorySerializer"/> + + From 65e2dcec2243bbf8f32407ac010a2504f39e09e9 Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Wed, 2 Jul 2025 18:38:24 +0300 Subject: [PATCH 06/33] fixed general test invoke --- build.gradle.kts | 5 ++++- gradle.properties | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fbec6d76..1fe19a85 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,7 +35,8 @@ dependencies { // 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")) + // TODO: danil42russia think about it man +// create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion")) // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') }) @@ -43,6 +44,8 @@ dependencies { // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace. plugins(providers.gradleProperty("platformPlugins").map { it.split(',') }) + phpstorm("2025.1") + testFramework(TestFrameworkType.Platform) } } diff --git a/gradle.properties b/gradle.properties index 972cf101..ac4e5c8c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,9 +17,9 @@ platformVersion = 2025.1 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # 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 -platformPlugins = com.jetbrains.php:251.23774.318 +platformPlugins = # Example: platformBundledPlugins = com.intellij.java -platformBundledPlugins = com.intellij.java +platformBundledPlugins = com.jetbrains.php # Gradle Releases -> https://github.com/gradle/gradle/releases gradleVersion = 8.13 From 2584d97c808ae0e088fa33fe4800bcaf60985606 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Tue, 1 Jul 2025 20:26:00 +0300 Subject: [PATCH 07/33] fix build --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ac4e5c8c..f1a4fc8e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ pluginSinceBuild = 251 pluginUntilBuild = 251.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension -platformType = IU +platformType = PS platformVersion = 2025.1 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html From 3c7ebf75bbf5a9cf34a1e8b4d175c3e2029e1133 Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Thu, 10 Jul 2025 17:11:47 +0300 Subject: [PATCH 08/33] changed type to php --- .../vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt index 9be3a92b..11f9f4f8 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt @@ -1,7 +1,6 @@ package com.vk.kphpstorm.kphptags.psi -import com.intellij.psi.tree.IElementType -import com.jetbrains.php.lang.PhpLanguage +import com.jetbrains.php.lang.psi.PhpElementType import com.vk.kphpstorm.KphpStormParserDefinition @@ -23,26 +22,26 @@ object KphpDocElementTypes { * * do not store anything in stubs, so their contents is unaccessible from other files * Such doc tags are 'simple' */ - val kphpDocTagSimple = IElementType("@kphp-simple", PhpLanguage.INSTANCE) //KphpDocTagSimpleElementType + val kphpDocTagSimple = PhpElementType("@kphp-simple") //KphpDocTagSimpleElementType /** * '@kphp-warn-performance ...' and '@kphp-analyze-performance ...' * They don't store stubs, but have a psi parser */ - val kphpDocTagWarnPerformance = IElementType("@kphp-warn-performance", PhpLanguage.INSTANCE) + val kphpDocTagWarnPerformance = PhpElementType("@kphp-warn-performance") /** * '@kphp-json [for EncoderName] attribute[= optional value]' * They don't store stubs, but have a psi parser */ - val kphpDocTagJson = IElementType("@kphp-json", PhpLanguage.INSTANCE) + val kphpDocTagJson = PhpElementType("@kphp-json") /** * '@kphp-template-class T1, T2' * (NOTE! This is not working in KPHP for now, it is just a matter of IDE experiments for future) * This tag stores "T1,T2" in stubs and has custom psi for them, therefore is not simple */ - val kphpDocTagTemplateClass = IElementType("@kphp-template-class", PhpLanguage.INSTANCE) + val kphpDocTagTemplateClass = PhpElementType("@kphp-template-class") } From 6b04fd6e699e3b69d7afbdfd9ec572d2d8558d40 Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Sat, 12 Jul 2025 02:06:57 +0300 Subject: [PATCH 09/33] fixed problem with custom tag in psi --- src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt index 85e9c282..3424afa7 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt @@ -3,6 +3,7 @@ package com.vk.kphpstorm.kphptags import com.intellij.lang.annotation.AnnotationHolder import com.intellij.lang.annotation.HighlightSeverity import com.intellij.psi.PsiElement +import com.intellij.psi.util.PsiTreeUtil import com.jetbrains.php.lang.documentation.phpdoc.PhpDocUtil import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag @@ -72,7 +73,8 @@ abstract class KphpDocTag( } fun findThisTagInDocComment(docCommentOwner: PhpNamedElement): PhpDocTag? { - return findThisTagInDocComment(docCommentOwner.docComment ?: return null) + return PsiTreeUtil.findChildrenOfType(docCommentOwner.docComment, PhpDocTag::class.java) + .firstOrNull { it.name == nameWithAt } } inline fun findThisTagsInDocComment(docComment: PhpDocComment): List { From 96ddfcb83aafde0a1a1b7870c876a38d86f3ad99 Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Wed, 16 Jul 2025 16:56:30 +0300 Subject: [PATCH 10/33] good --- build.gradle.kts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1fe19a85..39329da7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,9 +35,10 @@ dependencies { // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html intellijPlatform { - // TODO: danil42russia think about it man -// create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion")) - + create( + providers.gradleProperty("platformType"), + providers.gradleProperty("platformVersion") + ) // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') }) From b9b0e274a16e55d656ec22a5d7f7d660bc40b095 Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Fri, 18 Jul 2025 15:33:01 +0300 Subject: [PATCH 11/33] review fix --- .github/workflows/build.yml | 8 ++++---- build.gradle.kts | 7 ++----- gradle.properties | 1 - .../com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt | 2 +- .../psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt | 2 +- .../factory/KphpDocTagTemplateClassElementTypeFactory.kt | 4 +--- .../KphpDocTagWarnPerformanceElementTypeFactory.kt | 2 +- .../KphpDocTagJsonElementTypeStubFactorySerializer.kt | 2 +- .../KphpDocTagSimpleElementTypeStubSerializer.kt | 2 +- .../KphpDocTagTemplateClassElementTypeSerializer.kt | 2 +- .../KphpDocTagWarnPerformanceElementTypeSerializer.kt | 2 +- 11 files changed, 14 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0139ad65..44e2cde0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: - name: Build plugin run: ./gradlew buildPlugin - # Run tests and upload a code coverage report + # Run tests test: name: Test (${{ matrix.os }}) needs: [ build ] @@ -94,7 +94,7 @@ jobs: if: ${{ failure() }} uses: actions/upload-artifact@v4 with: - name: tests-result + name: tests-result-${{ matrix.os }} path: ${{ github.workspace }}/build/reports/tests # Run plugin structure verification along with IntelliJ Plugin Verifier @@ -106,7 +106,7 @@ jobs: # Free GitHub Actions Environment Disk Space - name: Maximize Build Space - uses: jlumbroso/free-disk-space@main + uses: jlumbroso/free-disk-space@v1.3.1 with: tool-cache: false large-packages: false @@ -143,4 +143,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: pluginVerifier-result - path: ${{ github.workspace }}/build/reports/pluginVerifier + path: ${{ github.workspace }}/build/reports/pluginVerifier \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 39329da7..ece7500e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,8 +36,7 @@ dependencies { // 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") + providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion") ) // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') }) @@ -62,9 +61,7 @@ intellijPlatform { changeNotes = providers.gradleProperty("pluginVersion").map { pluginVersion -> with(changelog) { renderItem( - (getOrNull(pluginVersion) ?: getUnreleased()) - .withHeader(false) - .withEmptySections(false), + (getOrNull(pluginVersion) ?: getUnreleased()).withHeader(false).withEmptySections(false), Changelog.OutputType.HTML, ) } diff --git a/gradle.properties b/gradle.properties index f1a4fc8e..97b27792 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,6 @@ platformVersion = 2025.1 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # 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 platformPlugins = # Example: platformBundledPlugins = com.intellij.java platformBundledPlugins = com.jetbrains.php diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt index 11f9f4f8..df2ee8ff 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt @@ -22,7 +22,7 @@ object KphpDocElementTypes { * * do not store anything in stubs, so their contents is unaccessible from other files * Such doc tags are 'simple' */ - val kphpDocTagSimple = PhpElementType("@kphp-simple") //KphpDocTagSimpleElementType + val kphpDocTagSimple = PhpElementType("@kphp-simple") /** * '@kphp-warn-performance ...' and '@kphp-analyze-performance ...' diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt index 58e1ade5..1eb26c6b 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt @@ -23,4 +23,4 @@ object KphpDocTagSimpleElementTypeStubFactory override fun createPsi(stub: PhpDocTagStub): PhpDocTag = KphpDocTagSimpleElementTypeStubSerializer().createPsi(stub) -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt index 1a25ff38..6579f968 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt @@ -20,6 +20,4 @@ object KphpDocTagTemplateClassElementTypeFactory : StubElementFactory?): PhpDocTagStub { return KphpDocTagStubImpl(parentStub, type, psi.name, null) } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt index 526b2c54..a1e3f410 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt @@ -29,4 +29,4 @@ class KphpDocTagSimpleElementTypeStubSerializer : PhpDocTagStubSerializer(KphpDo val stubValue = dataStream.readName()?.toString() return KphpDocTagStubImpl(parentStub, type, name, stubValue) } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt index 756984f4..33b97cef 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt @@ -32,4 +32,4 @@ class KphpDocTagTemplateClassElementTypeSerializer : val stubValue = dataStream.readName()?.toString() return KphpDocTagStubImpl(parentStub, type, name, stubValue) } -} \ No newline at end of file +} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt index fa33ef9f..e18f7693 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt @@ -27,4 +27,4 @@ class KphpDocTagWarnPerformanceElementTypeSerializer : PhpDocTagStubSerializer(K val stubValue = dataStream.readName()?.toString() return KphpDocTagStubImpl(parentStub, type, name, stubValue) } -} \ No newline at end of file +} From f15fdcdba21b33438294e57da8911fe96a6dc42a Mon Sep 17 00:00:00 2001 From: Richardas Kuchinskas Date: Fri, 18 Jul 2025 22:18:29 +0300 Subject: [PATCH 12/33] ci experiment fix with tests --- build.gradle.kts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index ece7500e..874b7131 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -104,3 +104,9 @@ tasks { gradleVersion = providers.gradleProperty("gradleVersion").get() } } + +sourceSets { + test { + resources.srcDir("src/test/") + } +} From cebd677e051b738159e79602a05f7ad418d99460 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Fri, 25 Jul 2025 17:00:11 +0300 Subject: [PATCH 13/33] tmp --- build.gradle.kts | 2 - .../psi/stubs/KphpStubRegistryExtension.kt | 95 +++++++++++++++++++ src/main/resources/META-INF/plugin.xml | 2 +- 3 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt diff --git a/build.gradle.kts b/build.gradle.kts index 874b7131..68d00a50 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,8 +44,6 @@ dependencies { // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace. plugins(providers.gradleProperty("platformPlugins").map { it.split(',') }) - phpstorm("2025.1") - testFramework(TestFrameworkType.Platform) } } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt new file mode 100644 index 00000000..dd18e03a --- /dev/null +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt @@ -0,0 +1,95 @@ +package com.vk.kphpstorm.kphptags.psi.stubs + +import com.intellij.psi.stubs.StubRegistry +import com.intellij.psi.stubs.StubRegistryExtension +import com.jetbrains.php.lang.documentation.phpdoc.parser.PhpDocStubElementTypes +import com.jetbrains.php.lang.psi.stubs.stub_factories.PhpDocTagStubFactory +import com.vk.kphpstorm.exphptype.psi.ExPhpTypeAnyPsiImpl +import com.vk.kphpstorm.exphptype.psi.ExPhpTypeArrayPsiImpl +import com.vk.kphpstorm.exphptype.psi.ExPhpTypeCallablePsiImpl +import com.vk.kphpstorm.exphptype.psi.ExPhpTypeForcingPsiImpl +import com.vk.kphpstorm.exphptype.psi.ExPhpTypeInstancePsiImpl +import com.vk.kphpstorm.exphptype.psi.ExPhpTypeNullablePsiImpl +import com.vk.kphpstorm.exphptype.psi.ExPhpTypePipePsiImpl +import com.vk.kphpstorm.exphptype.psi.ExPhpTypePrimitivePsiImpl +import com.vk.kphpstorm.exphptype.psi.ExPhpTypeShapePsiImpl +import com.vk.kphpstorm.exphptype.psi.ExPhpTypeTplInstantiationPsiImpl +import com.vk.kphpstorm.exphptype.psi.ExPhpTypeTuplePsiImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocJsonAttributePsiImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocJsonForEncoderPsiImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocTplParameterDeclPsiImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocWarnPerformanceItemPsiImpl + +class KphpStubRegistryExtension : StubRegistryExtension { + override fun register(registry: StubRegistry) { + registerSerializers(registry) + } + + private fun registerSerializers(registry: StubRegistry) { + val docComment = PhpDocStubElementTypes.DOC_COMMENT + + // com.vk.kphpstorm.exphptype.psi +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(ExPhpTypeAnyPsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(ExPhpTypeArrayPsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(ExPhpTypeCallablePsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(ExPhpTypeForcingPsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(ExPhpTypeInstancePsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(ExPhpTypeNullablePsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(ExPhpTypePipePsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(ExPhpTypePrimitivePsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(ExPhpTypeShapePsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(ExPhpTypeTplInstantiationPsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(ExPhpTypeTuplePsiImpl.elementType) +// ) + + // com.vk.kphpstorm.kphptags.psi +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(KphpDocJsonAttributePsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(KphpDocJsonForEncoderPsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(KphpDocTplParameterDeclPsiImpl.elementType) +// ) +// registry.registerStubFactory( +// docComment, +// PhpDocTagStubFactory(KphpDocWarnPerformanceItemPsiImpl.elementType) +// ) + } +} diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 63070dc6..54576be6 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -95,6 +95,7 @@ implementationClass="com.vk.kphpstorm.KphpStormParserDefinition"/> + - Date: Mon, 28 Jul 2025 16:43:47 +0300 Subject: [PATCH 14/33] Fixes --- .../kphptags/psi/KphpDocElementTypes.kt | 2 - .../kphptags/psi/KphpDocTagJsonPsiImpl.kt | 4 +- .../kphptags/psi/KphpDocTagSimplePsiImpl.kt | 4 +- .../psi/KphpDocTagTemplateClassPsiImpl.kt | 4 +- .../psi/KphpDocTagWarnPerformancePsiImpl.kt | 4 +- .../KphpDocTagJsonElementTypeStubFactory.kt | 7 +- .../KphpDocTagSimpleElementTypeStubFactory.kt | 11 +- ...hpDocTagTemplateClassElementTypeFactory.kt | 9 +- ...DocTagWarnPerformanceElementTypeFactory.kt | 7 +- ...phpDocTagJsonElementTypeStubSerializer.kt} | 14 +- ...hpDocTagSimpleElementTypeStubSerializer.kt | 12 +- ...ocTagTemplateClassElementTypeSerializer.kt | 14 +- ...TagWarnPerformanceElementTypeSerializer.kt | 14 +- .../psi/stubs/KphpStubRegistryExtension.kt | 130 +++++++----------- src/main/resources/META-INF/plugin.xml | 18 --- 15 files changed, 84 insertions(+), 170 deletions(-) rename src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/{KphpDocTagJsonElementTypeStubFactorySerializer.kt => KphpDocTagJsonElementTypeStubSerializer.kt} (58%) diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt index df2ee8ff..44ee3e38 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt @@ -43,5 +43,3 @@ object KphpDocElementTypes { */ val kphpDocTagTemplateClass = PhpElementType("@kphp-template-class") } - - diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagJsonPsiImpl.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagJsonPsiImpl.kt index 054ede74..48774e5c 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagJsonPsiImpl.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagJsonPsiImpl.kt @@ -1,14 +1,14 @@ package com.vk.kphpstorm.kphptags.psi import com.intellij.lang.ASTNode -import com.intellij.psi.stubs.IStubElementType +import com.intellij.psi.tree.IElementType import com.intellij.psi.util.PsiTreeUtil import com.jetbrains.php.lang.documentation.phpdoc.psi.impl.tags.PhpDocTagImpl import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub class KphpDocTagJsonPsiImpl : PhpDocTagImpl, KphpDocTagImpl { constructor(node: ASTNode) : super(node) - constructor(stub: PhpDocTagStub, nodeType: IStubElementType<*, *>) : super(stub, nodeType) + constructor(stub: PhpDocTagStub, nodeType: IElementType) : super(stub, nodeType) fun item(): KphpDocJsonAttributePsiImpl? { val item = PsiTreeUtil.skipWhitespacesForward(firstChild) diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimplePsiImpl.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimplePsiImpl.kt index 9bc172ad..f396d7d6 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimplePsiImpl.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimplePsiImpl.kt @@ -1,7 +1,7 @@ package com.vk.kphpstorm.kphptags.psi import com.intellij.lang.ASTNode -import com.intellij.psi.stubs.IStubElementType +import com.intellij.psi.tree.IElementType import com.jetbrains.php.lang.documentation.phpdoc.psi.impl.tags.PhpDocTagImpl import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub @@ -11,5 +11,5 @@ import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub */ class KphpDocTagSimplePsiImpl : PhpDocTagImpl, KphpDocTagImpl { constructor(node: ASTNode) : super(node) - constructor(stub: PhpDocTagStub, nodeType: IStubElementType<*, *>) : super(stub, nodeType) // TODO: exp: change IStubElementType -> IElementType + constructor(stub: PhpDocTagStub, nodeType: IElementType) : super(stub, nodeType) } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagTemplateClassPsiImpl.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagTemplateClassPsiImpl.kt index 15c02fe2..73a3dfe3 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagTemplateClassPsiImpl.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagTemplateClassPsiImpl.kt @@ -1,7 +1,7 @@ package com.vk.kphpstorm.kphptags.psi import com.intellij.lang.ASTNode -import com.intellij.psi.stubs.IStubElementType +import com.intellij.psi.tree.IElementType import com.jetbrains.php.lang.documentation.phpdoc.psi.impl.tags.PhpDocTagImpl import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub @@ -11,7 +11,7 @@ import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub */ class KphpDocTagTemplateClassPsiImpl : PhpDocTagImpl, KphpDocTagImpl { constructor(node: ASTNode) : super(node) - constructor(stub: PhpDocTagStub, nodeType: IStubElementType<*, *>) : super(stub, nodeType) + constructor(stub: PhpDocTagStub, nodeType: IElementType) : super(stub, nodeType) // important! this function can be called when current file is not loaded, // but we store all necessary information in stub diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagWarnPerformancePsiImpl.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagWarnPerformancePsiImpl.kt index a9d46c73..be3d6512 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagWarnPerformancePsiImpl.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagWarnPerformancePsiImpl.kt @@ -1,7 +1,7 @@ package com.vk.kphpstorm.kphptags.psi import com.intellij.lang.ASTNode -import com.intellij.psi.stubs.IStubElementType +import com.intellij.psi.tree.IElementType import com.jetbrains.php.lang.documentation.phpdoc.psi.impl.tags.PhpDocTagImpl import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub @@ -11,5 +11,5 @@ import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub */ class KphpDocTagWarnPerformancePsiImpl : PhpDocTagImpl, KphpDocTagImpl { constructor(node: ASTNode) : super(node) - constructor(stub: PhpDocTagStub, nodeType: IStubElementType<*, *>) : super(stub, nodeType) + constructor(stub: PhpDocTagStub, nodeType: IElementType) : super(stub, nodeType) } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagJsonElementTypeStubFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagJsonElementTypeStubFactory.kt index 4fec4f5d..4412ed9b 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagJsonElementTypeStubFactory.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagJsonElementTypeStubFactory.kt @@ -6,17 +6,18 @@ import com.intellij.psi.stubs.StubElementFactory import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagJsonElementTypeStubFactorySerializer +import com.vk.kphpstorm.kphptags.psi.KphpDocTagJsonPsiImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl object KphpDocTagJsonElementTypeStubFactory : StubElementFactory { override fun shouldCreateStub(node: ASTNode): Boolean = node.elementType == KphpDocElementTypes.kphpDocTagJson override fun createPsi(stub: PhpDocTagStub): PhpDocTag { - return KphpDocTagJsonElementTypeStubFactorySerializer().createPsi(stub) + return KphpDocTagJsonPsiImpl(stub, KphpDocElementTypes.kphpDocTagJson) } override fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { - return KphpDocTagJsonElementTypeStubFactorySerializer().createStub(psi, parentStub) + return KphpDocTagStubImpl(parentStub, KphpDocElementTypes.kphpDocTagJson, psi.name, null) } } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt index 1eb26c6b..ce4bdad4 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt @@ -7,11 +7,10 @@ import com.intellij.psi.stubs.StubElementFactory import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagSimpleElementTypeStubSerializer - -object KphpDocTagSimpleElementTypeStubFactory - : StubElementFactory { +import com.vk.kphpstorm.kphptags.psi.KphpDocTagSimplePsiImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl +object KphpDocTagSimpleElementTypeStubFactory : StubElementFactory { override fun shouldCreateStub(node: ASTNode): Boolean = node.elementType == KphpDocElementTypes.kphpDocTagSimple @@ -19,8 +18,8 @@ object KphpDocTagSimpleElementTypeStubFactory psi: PhpDocTag, parentStub: StubElement? ): PhpDocTagStub = - KphpDocTagSimpleElementTypeStubSerializer().createStub(psi, parentStub) + KphpDocTagStubImpl(parentStub, KphpDocElementTypes.kphpDocTagSimple, psi.name, null) override fun createPsi(stub: PhpDocTagStub): PhpDocTag = - KphpDocTagSimpleElementTypeStubSerializer().createPsi(stub) + KphpDocTagSimplePsiImpl(stub, KphpDocElementTypes.kphpDocTagSimple) } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt index 6579f968..c7350f44 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt @@ -7,15 +7,18 @@ import com.intellij.psi.stubs.StubElementFactory import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagTemplateClassElementTypeSerializer +import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocTagTemplateClassPsiImpl object KphpDocTagTemplateClassElementTypeFactory : StubElementFactory { override fun createPsi(stub: PhpDocTagStub): PhpDocTag { - return KphpDocTagTemplateClassElementTypeSerializer().createPsi(stub) + return KphpDocTagTemplateClassPsiImpl(stub, KphpDocElementTypes.kphpDocTagTemplateClass) } override fun createStub(psi: PhpDocTag, parentStub: StubElement?): PhpDocTagStub { - return KphpDocTagTemplateClassElementTypeSerializer().createStub(psi, parentStub) + // stub value is 'T1,T2' — without spaces + val stubValue = (psi as KphpDocTagTemplateClassPsiImpl).getTemplateArguments().joinToString(",") + return KphpDocTagStubImpl(parentStub, KphpDocElementTypes.kphpDocTagTemplateClass, psi.name, stubValue) } override fun shouldCreateStub(node: ASTNode): Boolean = diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagWarnPerformanceElementTypeFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagWarnPerformanceElementTypeFactory.kt index aa3f9d28..9f382f4c 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagWarnPerformanceElementTypeFactory.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagWarnPerformanceElementTypeFactory.kt @@ -7,7 +7,8 @@ import com.intellij.psi.stubs.StubElementFactory import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagWarnPerformanceElementTypeSerializer +import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocTagWarnPerformancePsiImpl object KphpDocTagWarnPerformanceElementTypeFactory : StubElementFactory { override fun shouldCreateStub(node: ASTNode): Boolean = @@ -15,10 +16,10 @@ object KphpDocTagWarnPerformanceElementTypeFactory : StubElementFactory?): PhpDocTagStub{ - return KphpDocTagWarnPerformanceElementTypeSerializer().createStub(psi, parentStub) + return KphpDocTagStubImpl(parentStub, KphpDocElementTypes.kphpDocTagWarnPerformance, psi.name, null) } override fun createPsi(stub: PhpDocTagStub): PhpDocTag? { - return KphpDocTagWarnPerformanceElementTypeSerializer().createPsi(stub) + return KphpDocTagWarnPerformancePsiImpl(stub, KphpDocElementTypes.kphpDocTagWarnPerformance) } } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubFactorySerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubSerializer.kt similarity index 58% rename from src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubFactorySerializer.kt rename to src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubSerializer.kt index 4a4d9bd4..b3dc4d75 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubFactorySerializer.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubSerializer.kt @@ -5,28 +5,18 @@ import com.intellij.psi.stubs.StubInputStream import com.intellij.psi.stubs.StubOutputStream import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer -import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.KphpDocTagJsonPsiImpl import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl -class KphpDocTagJsonElementTypeStubFactorySerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagJson) { +class KphpDocTagJsonElementTypeStubSerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagJson) { override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { dataStream.writeName(stub.name) dataStream.writeName(stub.value) } override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<*>?): PhpDocTagStub { - val name = dataStream.readName()?.toString() ?: throw NullPointerException() + val name = dataStream.readName()?.toString()!! val stubValue = dataStream.readName()?.toString() return KphpDocTagStubImpl(parentStub, type, name, stubValue) } - - fun createPsi(stub: PhpDocTagStub): PhpDocTag { - return KphpDocTagJsonPsiImpl(stub, stub.stubType) - } - - fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { - return KphpDocTagStubImpl(parentStub, type, psi.name, null) - } } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt index a1e3f410..bd78bcea 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt @@ -5,27 +5,17 @@ import com.intellij.psi.stubs.StubInputStream import com.intellij.psi.stubs.StubOutputStream import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer -import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.KphpDocTagSimplePsiImpl import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl class KphpDocTagSimpleElementTypeStubSerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagSimple){ - fun createPsi(stub: PhpDocTagStub): PhpDocTag { - return KphpDocTagSimplePsiImpl(stub, stub.stubType) - } - - fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { - return KphpDocTagStubImpl(parentStub, type, psi.name, null) - } - override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { dataStream.writeName(stub.name) dataStream.writeName(stub.value) } override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<*>?): PhpDocTagStub { - val name = dataStream.readName()?.toString() ?: throw NullPointerException() + val name = dataStream.readName()?.toString()!! val stubValue = dataStream.readName()?.toString() return KphpDocTagStubImpl(parentStub, type, name, stubValue) } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt index 33b97cef..ff89f739 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt @@ -5,30 +5,18 @@ import com.intellij.psi.stubs.StubInputStream import com.intellij.psi.stubs.StubOutputStream import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer -import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl -import com.vk.kphpstorm.kphptags.psi.KphpDocTagTemplateClassPsiImpl class KphpDocTagTemplateClassElementTypeSerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagTemplateClass) { - fun createPsi(stub: PhpDocTagStub): PhpDocTag { - return KphpDocTagTemplateClassPsiImpl(stub, stub.stubType) - } - - fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { - // stub value is 'T1,T2' — without spaces - val stubValue = (psi as KphpDocTagTemplateClassPsiImpl).getTemplateArguments().joinToString(",") - return KphpDocTagStubImpl(parentStub, type, psi.name, stubValue) - } - override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { dataStream.writeName(stub.name) dataStream.writeName(stub.value) } override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<*>?): PhpDocTagStub { - val name = dataStream.readName()?.toString() ?: throw NullPointerException() + val name = dataStream.readName()?.toString()!! val stubValue = dataStream.readName()?.toString() return KphpDocTagStubImpl(parentStub, type, name, stubValue) } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt index e18f7693..02e7340e 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt @@ -5,25 +5,17 @@ import com.intellij.psi.stubs.StubInputStream import com.intellij.psi.stubs.StubOutputStream import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer -import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag -import com.vk.kphpstorm.kphptags.psi.* +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes +import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl class KphpDocTagWarnPerformanceElementTypeSerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagWarnPerformance){ - fun createPsi(stub: PhpDocTagStub): PhpDocTag { - return KphpDocTagWarnPerformancePsiImpl(stub, stub.stubType) - } - - fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { - return KphpDocTagStubImpl(parentStub, type, psi.name, null) - } - override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { dataStream.writeName(stub.name) dataStream.writeName(stub.value) } override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<*>?): PhpDocTagStub { - val name = dataStream.readName()?.toString() ?: throw NullPointerException() + val name = dataStream.readName()?.toString()!! val stubValue = dataStream.readName()?.toString() return KphpDocTagStubImpl(parentStub, type, name, stubValue) } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt index dd18e03a..15f0aea1 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt @@ -2,94 +2,64 @@ package com.vk.kphpstorm.kphptags.psi.stubs import com.intellij.psi.stubs.StubRegistry import com.intellij.psi.stubs.StubRegistryExtension -import com.jetbrains.php.lang.documentation.phpdoc.parser.PhpDocStubElementTypes -import com.jetbrains.php.lang.psi.stubs.stub_factories.PhpDocTagStubFactory -import com.vk.kphpstorm.exphptype.psi.ExPhpTypeAnyPsiImpl -import com.vk.kphpstorm.exphptype.psi.ExPhpTypeArrayPsiImpl -import com.vk.kphpstorm.exphptype.psi.ExPhpTypeCallablePsiImpl -import com.vk.kphpstorm.exphptype.psi.ExPhpTypeForcingPsiImpl -import com.vk.kphpstorm.exphptype.psi.ExPhpTypeInstancePsiImpl -import com.vk.kphpstorm.exphptype.psi.ExPhpTypeNullablePsiImpl -import com.vk.kphpstorm.exphptype.psi.ExPhpTypePipePsiImpl -import com.vk.kphpstorm.exphptype.psi.ExPhpTypePrimitivePsiImpl -import com.vk.kphpstorm.exphptype.psi.ExPhpTypeShapePsiImpl -import com.vk.kphpstorm.exphptype.psi.ExPhpTypeTplInstantiationPsiImpl -import com.vk.kphpstorm.exphptype.psi.ExPhpTypeTuplePsiImpl -import com.vk.kphpstorm.kphptags.psi.KphpDocJsonAttributePsiImpl -import com.vk.kphpstorm.kphptags.psi.KphpDocJsonForEncoderPsiImpl -import com.vk.kphpstorm.kphptags.psi.KphpDocTplParameterDeclPsiImpl -import com.vk.kphpstorm.kphptags.psi.KphpDocWarnPerformanceItemPsiImpl +import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes +import com.vk.kphpstorm.kphptags.psi.factory.KphpDocTagJsonElementTypeStubFactory +import com.vk.kphpstorm.kphptags.psi.factory.KphpDocTagSimpleElementTypeStubFactory +import com.vk.kphpstorm.kphptags.psi.factory.KphpDocTagTemplateClassElementTypeFactory +import com.vk.kphpstorm.kphptags.psi.factory.KphpDocTagWarnPerformanceElementTypeFactory +import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagJsonElementTypeStubSerializer +import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagSimpleElementTypeStubSerializer +import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagTemplateClassElementTypeSerializer +import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagWarnPerformanceElementTypeSerializer +@Suppress("UnstableApiUsage") class KphpStubRegistryExtension : StubRegistryExtension { override fun register(registry: StubRegistry) { registerSerializers(registry) + registerFactories(registry) } private fun registerSerializers(registry: StubRegistry) { - val docComment = PhpDocStubElementTypes.DOC_COMMENT + registry.registerStubSerializer( + KphpDocElementTypes.kphpDocTagSimple, + KphpDocTagSimpleElementTypeStubSerializer() + ) - // com.vk.kphpstorm.exphptype.psi -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(ExPhpTypeAnyPsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(ExPhpTypeArrayPsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(ExPhpTypeCallablePsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(ExPhpTypeForcingPsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(ExPhpTypeInstancePsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(ExPhpTypeNullablePsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(ExPhpTypePipePsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(ExPhpTypePrimitivePsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(ExPhpTypeShapePsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(ExPhpTypeTplInstantiationPsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(ExPhpTypeTuplePsiImpl.elementType) -// ) + registry.registerStubSerializer( + KphpDocElementTypes.kphpDocTagJson, + KphpDocTagJsonElementTypeStubSerializer() + ) - // com.vk.kphpstorm.kphptags.psi -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(KphpDocJsonAttributePsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(KphpDocJsonForEncoderPsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(KphpDocTplParameterDeclPsiImpl.elementType) -// ) -// registry.registerStubFactory( -// docComment, -// PhpDocTagStubFactory(KphpDocWarnPerformanceItemPsiImpl.elementType) -// ) + registry.registerStubSerializer( + KphpDocElementTypes.kphpDocTagTemplateClass, + KphpDocTagTemplateClassElementTypeSerializer() + ) + + registry.registerStubSerializer( + KphpDocElementTypes.kphpDocTagWarnPerformance, + KphpDocTagWarnPerformanceElementTypeSerializer() + ) + } + + private fun registerFactories(registry: StubRegistry) { + registry.registerStubFactory( + KphpDocElementTypes.kphpDocTagSimple, + KphpDocTagSimpleElementTypeStubFactory + ) + + registry.registerStubFactory( + KphpDocElementTypes.kphpDocTagJson, + KphpDocTagJsonElementTypeStubFactory + ) + + registry.registerStubFactory( + KphpDocElementTypes.kphpDocTagTemplateClass, + KphpDocTagTemplateClassElementTypeFactory + ) + + registry.registerStubFactory( + KphpDocElementTypes.kphpDocTagWarnPerformance, + KphpDocTagWarnPerformanceElementTypeFactory + ) } } diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 54576be6..5a98a691 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -96,15 +96,6 @@ - - - - - - - - - - From 402abd78becf4f5535a2fba35cc210a7d243a79e Mon Sep 17 00:00:00 2001 From: vldf Date: Mon, 28 Jul 2025 17:09:05 +0300 Subject: [PATCH 15/33] remove redundant stubs code --- .../KphpDocTagJsonElementTypeStubFactory.kt | 23 ----------------- ...DocTagWarnPerformanceElementTypeFactory.kt | 25 ------------------- ...KphpDocTagJsonElementTypeStubSerializer.kt | 22 ---------------- ...TagWarnPerformanceElementTypeSerializer.kt | 22 ---------------- .../psi/stubs/KphpStubRegistryExtension.kt | 24 ------------------ 5 files changed, 116 deletions(-) delete mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagJsonElementTypeStubFactory.kt delete mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagWarnPerformanceElementTypeFactory.kt delete mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubSerializer.kt delete mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagJsonElementTypeStubFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagJsonElementTypeStubFactory.kt deleted file mode 100644 index 4412ed9b..00000000 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagJsonElementTypeStubFactory.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.vk.kphpstorm.kphptags.psi.factory - -import com.intellij.lang.ASTNode -import com.intellij.psi.stubs.StubElement -import com.intellij.psi.stubs.StubElementFactory -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub -import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag -import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.KphpDocTagJsonPsiImpl -import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl - -object KphpDocTagJsonElementTypeStubFactory : StubElementFactory { - override fun shouldCreateStub(node: ASTNode): Boolean = - node.elementType == KphpDocElementTypes.kphpDocTagJson - - override fun createPsi(stub: PhpDocTagStub): PhpDocTag { - return KphpDocTagJsonPsiImpl(stub, KphpDocElementTypes.kphpDocTagJson) - } - - override fun createStub(psi: PhpDocTag, parentStub: StubElement<*>?): PhpDocTagStub { - return KphpDocTagStubImpl(parentStub, KphpDocElementTypes.kphpDocTagJson, psi.name, null) - } -} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagWarnPerformanceElementTypeFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagWarnPerformanceElementTypeFactory.kt deleted file mode 100644 index 9f382f4c..00000000 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagWarnPerformanceElementTypeFactory.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.vk.kphpstorm.kphptags.psi.factory - -import com.intellij.lang.ASTNode -import com.intellij.psi.PsiElement -import com.intellij.psi.stubs.StubElement -import com.intellij.psi.stubs.StubElementFactory -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub -import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag -import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl -import com.vk.kphpstorm.kphptags.psi.KphpDocTagWarnPerformancePsiImpl - -object KphpDocTagWarnPerformanceElementTypeFactory : StubElementFactory { - override fun shouldCreateStub(node: ASTNode): Boolean = - node.elementType == KphpDocElementTypes.kphpDocTagWarnPerformance - - - override fun createStub(psi: PhpDocTag, parentStub: StubElement?): PhpDocTagStub{ - return KphpDocTagStubImpl(parentStub, KphpDocElementTypes.kphpDocTagWarnPerformance, psi.name, null) - } - - override fun createPsi(stub: PhpDocTagStub): PhpDocTag? { - return KphpDocTagWarnPerformancePsiImpl(stub, KphpDocElementTypes.kphpDocTagWarnPerformance) - } -} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubSerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubSerializer.kt deleted file mode 100644 index b3dc4d75..00000000 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagJsonElementTypeStubSerializer.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.vk.kphpstorm.kphptags.psi.serializers - -import com.intellij.psi.stubs.StubElement -import com.intellij.psi.stubs.StubInputStream -import com.intellij.psi.stubs.StubOutputStream -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer -import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl - -class KphpDocTagJsonElementTypeStubSerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagJson) { - override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { - dataStream.writeName(stub.name) - dataStream.writeName(stub.value) - } - - override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<*>?): PhpDocTagStub { - val name = dataStream.readName()?.toString()!! - val stubValue = dataStream.readName()?.toString() - return KphpDocTagStubImpl(parentStub, type, name, stubValue) - } -} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt deleted file mode 100644 index 02e7340e..00000000 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagWarnPerformanceElementTypeSerializer.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.vk.kphpstorm.kphptags.psi.serializers - -import com.intellij.psi.stubs.StubElement -import com.intellij.psi.stubs.StubInputStream -import com.intellij.psi.stubs.StubOutputStream -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer -import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl - -class KphpDocTagWarnPerformanceElementTypeSerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagWarnPerformance){ - override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { - dataStream.writeName(stub.name) - dataStream.writeName(stub.value) - } - - override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<*>?): PhpDocTagStub { - val name = dataStream.readName()?.toString()!! - val stubValue = dataStream.readName()?.toString() - return KphpDocTagStubImpl(parentStub, type, name, stubValue) - } -} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt index 15f0aea1..8df7dafc 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt @@ -3,14 +3,10 @@ package com.vk.kphpstorm.kphptags.psi.stubs import com.intellij.psi.stubs.StubRegistry import com.intellij.psi.stubs.StubRegistryExtension import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.factory.KphpDocTagJsonElementTypeStubFactory import com.vk.kphpstorm.kphptags.psi.factory.KphpDocTagSimpleElementTypeStubFactory import com.vk.kphpstorm.kphptags.psi.factory.KphpDocTagTemplateClassElementTypeFactory -import com.vk.kphpstorm.kphptags.psi.factory.KphpDocTagWarnPerformanceElementTypeFactory -import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagJsonElementTypeStubSerializer import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagSimpleElementTypeStubSerializer import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagTemplateClassElementTypeSerializer -import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagWarnPerformanceElementTypeSerializer @Suppress("UnstableApiUsage") class KphpStubRegistryExtension : StubRegistryExtension { @@ -25,20 +21,10 @@ class KphpStubRegistryExtension : StubRegistryExtension { KphpDocTagSimpleElementTypeStubSerializer() ) - registry.registerStubSerializer( - KphpDocElementTypes.kphpDocTagJson, - KphpDocTagJsonElementTypeStubSerializer() - ) - registry.registerStubSerializer( KphpDocElementTypes.kphpDocTagTemplateClass, KphpDocTagTemplateClassElementTypeSerializer() ) - - registry.registerStubSerializer( - KphpDocElementTypes.kphpDocTagWarnPerformance, - KphpDocTagWarnPerformanceElementTypeSerializer() - ) } private fun registerFactories(registry: StubRegistry) { @@ -47,19 +33,9 @@ class KphpStubRegistryExtension : StubRegistryExtension { KphpDocTagSimpleElementTypeStubFactory ) - registry.registerStubFactory( - KphpDocElementTypes.kphpDocTagJson, - KphpDocTagJsonElementTypeStubFactory - ) - registry.registerStubFactory( KphpDocElementTypes.kphpDocTagTemplateClass, KphpDocTagTemplateClassElementTypeFactory ) - - registry.registerStubFactory( - KphpDocElementTypes.kphpDocTagWarnPerformance, - KphpDocTagWarnPerformanceElementTypeFactory - ) } } From e488746495552f994f803cdbc910797434a8552d Mon Sep 17 00:00:00 2001 From: vldf Date: Mon, 28 Jul 2025 17:09:49 +0300 Subject: [PATCH 16/33] return removed comment --- .../KphpDocTagTemplateClassElementTypeSerializer.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt index ff89f739..9c7fd867 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt @@ -8,6 +8,10 @@ import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerial import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl +/** + * '@kphp-template-class T1, T2' has a separate elementType, psi for 'T1' and 'T2' and stub contents + * @see KphpDocElementTypes.kphpDocTagTemplateClass + */ class KphpDocTagTemplateClassElementTypeSerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagTemplateClass) { override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { From 0229e5858de87688a9237e46602de08092cdd2cc Mon Sep 17 00:00:00 2001 From: vldf Date: Mon, 28 Jul 2025 17:27:46 +0300 Subject: [PATCH 17/33] remove redundant code --- .../kphptags/psi/KphpDocTagJsonPsiImpl.kt | 3 -- .../kphptags/psi/KphpDocTagStubImpl.kt | 30 ------------------- .../psi/KphpDocTagWarnPerformancePsiImpl.kt | 3 -- .../KphpDocTagSimpleElementTypeStubFactory.kt | 25 ---------------- ...hpDocTagSimpleElementTypeStubSerializer.kt | 22 -------------- ...ocTagTemplateClassElementTypeSerializer.kt | 27 ----------------- ...hpDocTagTemplateClassElementTypeFactory.kt | 14 +++++++-- .../psi/stubs/KphpStubRegistryExtension.kt | 12 ++++---- src/main/resources/META-INF/plugin.xml | 1 - 9 files changed, 16 insertions(+), 121 deletions(-) delete mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagStubImpl.kt delete mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt delete mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt delete mode 100644 src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt rename src/main/kotlin/com/vk/kphpstorm/kphptags/psi/{factory => stubs}/KphpDocTagTemplateClassElementTypeFactory.kt (73%) diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagJsonPsiImpl.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagJsonPsiImpl.kt index 48774e5c..d6bd24ed 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagJsonPsiImpl.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagJsonPsiImpl.kt @@ -1,14 +1,11 @@ package com.vk.kphpstorm.kphptags.psi import com.intellij.lang.ASTNode -import com.intellij.psi.tree.IElementType import com.intellij.psi.util.PsiTreeUtil import com.jetbrains.php.lang.documentation.phpdoc.psi.impl.tags.PhpDocTagImpl -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub class KphpDocTagJsonPsiImpl : PhpDocTagImpl, KphpDocTagImpl { constructor(node: ASTNode) : super(node) - constructor(stub: PhpDocTagStub, nodeType: IElementType) : super(stub, nodeType) fun item(): KphpDocJsonAttributePsiImpl? { val item = PsiTreeUtil.skipWhitespacesForward(firstChild) diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagStubImpl.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagStubImpl.kt deleted file mode 100644 index 63823f82..00000000 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagStubImpl.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.vk.kphpstorm.kphptags.psi - -import com.intellij.psi.stubs.IStubElementType -import com.intellij.psi.stubs.StubBase -import com.intellij.psi.stubs.StubElement -import com.intellij.psi.tree.IElementType -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub -import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag -import com.jetbrains.php.lang.psi.resolve.types.PhpType - -/** - * When @kphp-... tags (regardless of elementType) are stored as stubs, - * they hold only name and optional arbitrary string value. - * Similar to [com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubImpl] - * - * TODO: make a research to check are we really need stubs? - */ -class KphpDocTagStubImpl( - parent: StubElement<*>?, - elementType: IElementType, - private val name: String, - private val value: String? -) : StubBase(parent, elementType), PhpDocTagStub { - - fun getType() = PhpType() - override fun getName() = name - override fun getValue() = value - - override fun toString(): String = "$name${if (value != null) ": $value" else ""}" -} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagWarnPerformancePsiImpl.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagWarnPerformancePsiImpl.kt index be3d6512..66332d08 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagWarnPerformancePsiImpl.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagWarnPerformancePsiImpl.kt @@ -1,9 +1,7 @@ package com.vk.kphpstorm.kphptags.psi import com.intellij.lang.ASTNode -import com.intellij.psi.tree.IElementType import com.jetbrains.php.lang.documentation.phpdoc.psi.impl.tags.PhpDocTagImpl -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub /** * Implemetation of '@kphp-analyze-performance' and '@kphp-warn-performance' tags @@ -11,5 +9,4 @@ import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub */ class KphpDocTagWarnPerformancePsiImpl : PhpDocTagImpl, KphpDocTagImpl { constructor(node: ASTNode) : super(node) - constructor(stub: PhpDocTagStub, nodeType: IElementType) : super(stub, nodeType) } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt deleted file mode 100644 index ce4bdad4..00000000 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagSimpleElementTypeStubFactory.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.vk.kphpstorm.kphptags.psi.factory - -import com.intellij.lang.ASTNode -import com.intellij.psi.PsiElement -import com.intellij.psi.stubs.StubElement -import com.intellij.psi.stubs.StubElementFactory -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub -import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag -import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.KphpDocTagSimplePsiImpl -import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl - -object KphpDocTagSimpleElementTypeStubFactory : StubElementFactory { - override fun shouldCreateStub(node: ASTNode): Boolean = - node.elementType == KphpDocElementTypes.kphpDocTagSimple - - override fun createStub( - psi: PhpDocTag, - parentStub: StubElement? - ): PhpDocTagStub = - KphpDocTagStubImpl(parentStub, KphpDocElementTypes.kphpDocTagSimple, psi.name, null) - - override fun createPsi(stub: PhpDocTagStub): PhpDocTag = - KphpDocTagSimplePsiImpl(stub, KphpDocElementTypes.kphpDocTagSimple) -} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt deleted file mode 100644 index bd78bcea..00000000 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagSimpleElementTypeStubSerializer.kt +++ /dev/null @@ -1,22 +0,0 @@ -package com.vk.kphpstorm.kphptags.psi.serializers - -import com.intellij.psi.stubs.StubElement -import com.intellij.psi.stubs.StubInputStream -import com.intellij.psi.stubs.StubOutputStream -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer -import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl - -class KphpDocTagSimpleElementTypeStubSerializer : PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagSimple){ - override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { - dataStream.writeName(stub.name) - dataStream.writeName(stub.value) - } - - override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<*>?): PhpDocTagStub { - val name = dataStream.readName()?.toString()!! - val stubValue = dataStream.readName()?.toString() - return KphpDocTagStubImpl(parentStub, type, name, stubValue) - } -} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt deleted file mode 100644 index 9c7fd867..00000000 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/serializers/KphpDocTagTemplateClassElementTypeSerializer.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.vk.kphpstorm.kphptags.psi.serializers - -import com.intellij.psi.stubs.StubElement -import com.intellij.psi.stubs.StubInputStream -import com.intellij.psi.stubs.StubOutputStream -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer -import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl - -/** - * '@kphp-template-class T1, T2' has a separate elementType, psi for 'T1' and 'T2' and stub contents - * @see KphpDocElementTypes.kphpDocTagTemplateClass - */ -class KphpDocTagTemplateClassElementTypeSerializer : - PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagTemplateClass) { - override fun serialize(stub: PhpDocTagStub, dataStream: StubOutputStream) { - dataStream.writeName(stub.name) - dataStream.writeName(stub.value) - } - - override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<*>?): PhpDocTagStub { - val name = dataStream.readName()?.toString()!! - val stubValue = dataStream.readName()?.toString() - return KphpDocTagStubImpl(parentStub, type, name, stubValue) - } -} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpDocTagTemplateClassElementTypeFactory.kt similarity index 73% rename from src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt rename to src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpDocTagTemplateClassElementTypeFactory.kt index c7350f44..fdd47fc9 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/factory/KphpDocTagTemplateClassElementTypeFactory.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpDocTagTemplateClassElementTypeFactory.kt @@ -1,15 +1,17 @@ -package com.vk.kphpstorm.kphptags.psi.factory +package com.vk.kphpstorm.kphptags.psi.stubs import com.intellij.lang.ASTNode import com.intellij.psi.PsiElement import com.intellij.psi.stubs.StubElement import com.intellij.psi.stubs.StubElementFactory +import com.intellij.util.io.StringRef import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub +import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubImpl import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.KphpDocTagStubImpl import com.vk.kphpstorm.kphptags.psi.KphpDocTagTemplateClassPsiImpl +@Suppress("UnstableApiUsage") object KphpDocTagTemplateClassElementTypeFactory : StubElementFactory { override fun createPsi(stub: PhpDocTagStub): PhpDocTag { return KphpDocTagTemplateClassPsiImpl(stub, KphpDocElementTypes.kphpDocTagTemplateClass) @@ -18,7 +20,13 @@ object KphpDocTagTemplateClassElementTypeFactory : StubElementFactory?): PhpDocTagStub { // stub value is 'T1,T2' — without spaces val stubValue = (psi as KphpDocTagTemplateClassPsiImpl).getTemplateArguments().joinToString(",") - return KphpDocTagStubImpl(parentStub, KphpDocElementTypes.kphpDocTagTemplateClass, psi.name, stubValue) + + return PhpDocTagStubImpl( + parentStub, + KphpDocElementTypes.kphpDocTagTemplateClass, + StringRef.fromString(psi.name), + StringRef.fromString(stubValue) + ) } override fun shouldCreateStub(node: ASTNode): Boolean = diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt index 8df7dafc..035c0fee 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt @@ -2,11 +2,9 @@ package com.vk.kphpstorm.kphptags.psi.stubs import com.intellij.psi.stubs.StubRegistry import com.intellij.psi.stubs.StubRegistryExtension +import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubSerializer +import com.jetbrains.php.lang.psi.stubs.stub_factories.PhpDocTagStubFactory import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes -import com.vk.kphpstorm.kphptags.psi.factory.KphpDocTagSimpleElementTypeStubFactory -import com.vk.kphpstorm.kphptags.psi.factory.KphpDocTagTemplateClassElementTypeFactory -import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagSimpleElementTypeStubSerializer -import com.vk.kphpstorm.kphptags.psi.serializers.KphpDocTagTemplateClassElementTypeSerializer @Suppress("UnstableApiUsage") class KphpStubRegistryExtension : StubRegistryExtension { @@ -18,19 +16,19 @@ class KphpStubRegistryExtension : StubRegistryExtension { private fun registerSerializers(registry: StubRegistry) { registry.registerStubSerializer( KphpDocElementTypes.kphpDocTagSimple, - KphpDocTagSimpleElementTypeStubSerializer() + PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagSimple) ) registry.registerStubSerializer( KphpDocElementTypes.kphpDocTagTemplateClass, - KphpDocTagTemplateClassElementTypeSerializer() + PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagTemplateClass) ) } private fun registerFactories(registry: StubRegistry) { registry.registerStubFactory( KphpDocElementTypes.kphpDocTagSimple, - KphpDocTagSimpleElementTypeStubFactory + PhpDocTagStubFactory(KphpDocElementTypes.kphpDocTagSimple) ) registry.registerStubFactory( diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 5a98a691..6668480b 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -93,7 +93,6 @@ implementationClass="com.vk.kphpstorm.completion.KphpStormCompletionContributor"/> - From 472e84435e7fa01a99945a0775ca738fabcfe4dd Mon Sep 17 00:00:00 2001 From: vldf Date: Wed, 30 Jul 2025 12:53:59 +0300 Subject: [PATCH 18/33] sync `build.yml` file with plugin template --- .github/workflows/build.yml | 43 ++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44e2cde0..dd68cef4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,8 +1,9 @@ name: Build - on: + # Trigger the workflow on pushes to only the 'master' branch (this avoids duplicate checks being run e.g., for dependabot pull requests) push: branches: [ master ] + # Trigger the workflow on any pull request pull_request: concurrency: @@ -11,21 +12,27 @@ concurrency: jobs: - # Prepare environment and build the plugin + # Prepare the environment and build the plugin build: name: Build runs-on: ubuntu-latest outputs: version: ${{ steps.properties.outputs.version }} changelog: ${{ steps.properties.outputs.changelog }} - pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }} steps: + # Free GitHub Actions Environment Disk Space + - name: Maximize Build Space + uses: jlumbroso/free-disk-space@v1.3.1 + with: + tool-cache: false + large-packages: false + # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 - # Set up Java environment for the next steps + # Set up the Java environment for the next steps - name: Setup Java uses: actions/setup-java@v4 with: @@ -46,8 +53,6 @@ jobs: CHANGELOG="$(./gradlew getChangelog --unreleased --no-header --console=plain -q)" echo "version=$VERSION" >> $GITHUB_OUTPUT - echo "pluginVerifierHomeDir=~/.pluginVerifier" >> $GITHUB_OUTPUT - echo "changelog<> $GITHUB_OUTPUT echo "$CHANGELOG" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT @@ -56,7 +61,7 @@ jobs: - name: Build plugin run: ./gradlew buildPlugin - # Run tests + # Run tests and upload a code coverage report test: name: Test (${{ matrix.os }}) needs: [ build ] @@ -70,11 +75,18 @@ jobs: - macos-latest steps: + # Free GitHub Actions Environment Disk Space + - name: Maximize Build Space + uses: jlumbroso/free-disk-space@v1.3.1 + with: + tool-cache: false + large-packages: false + # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 - # Set up Java environment for the next steps + # Set up the Java environment for the next steps - name: Setup Java uses: actions/setup-java@v4 with: @@ -84,6 +96,8 @@ jobs: # Setup Gradle - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 + with: + cache-read-only: true # Run tests - name: Run Tests @@ -115,7 +129,7 @@ jobs: - name: Fetch Sources uses: actions/checkout@v4 - # Set up Java environment for the next steps + # Set up the Java environment for the next steps - name: Setup Java uses: actions/setup-java@v4 with: @@ -125,17 +139,12 @@ jobs: # Setup Gradle - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - - # Cache Plugin Verifier IDEs - - name: Setup Plugin Verifier IDEs Cache - uses: actions/cache@v4 with: - path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides - key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }} + cache-read-only: true # Run Verify Plugin task and IntelliJ Plugin Verifier tool - name: Run Plugin Verification tasks - run: ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }} + run: ./gradlew verifyPlugin # Collect Plugin Verifier Result - name: Collect Plugin Verifier Result @@ -143,4 +152,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: pluginVerifier-result - path: ${{ github.workspace }}/build/reports/pluginVerifier \ No newline at end of file + path: ${{ github.workspace }}/build/reports/pluginVerifier From bd12117ccc748e64cdc32aeffdc87641e63a5f7d Mon Sep 17 00:00:00 2001 From: vldf Date: Wed, 30 Jul 2025 13:22:17 +0300 Subject: [PATCH 19/33] fix kphp-json, kphp-template and kphp-warn-performance stubs --- .../kphptags/psi/KphpDocElementTypes.kt | 2 +- .../kphptags/psi/KphpDocTagSimplePsiImpl.kt | 3 --- ...hpDocTagTemplateClassElementTypeFactory.kt | 9 ++++----- .../psi/stubs/KphpStubRegistryExtension.kt | 20 +++++++++++++++++++ .../testing/infrastructure/StubTestBase.kt | 8 +++++--- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt index 44ee3e38..b141e457 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocElementTypes.kt @@ -22,7 +22,7 @@ object KphpDocElementTypes { * * do not store anything in stubs, so their contents is unaccessible from other files * Such doc tags are 'simple' */ - val kphpDocTagSimple = PhpElementType("@kphp-simple") + val kphpDocTagSimple = PhpElementType("") /** * '@kphp-warn-performance ...' and '@kphp-analyze-performance ...' diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimplePsiImpl.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimplePsiImpl.kt index f396d7d6..635383cc 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimplePsiImpl.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/KphpDocTagSimplePsiImpl.kt @@ -1,9 +1,7 @@ package com.vk.kphpstorm.kphptags.psi import com.intellij.lang.ASTNode -import com.intellij.psi.tree.IElementType import com.jetbrains.php.lang.documentation.phpdoc.psi.impl.tags.PhpDocTagImpl -import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub /** * Implemetation of 'simple' @kphp-... tag — created either from stub or from ast @@ -11,5 +9,4 @@ import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub */ class KphpDocTagSimplePsiImpl : PhpDocTagImpl, KphpDocTagImpl { constructor(node: ASTNode) : super(node) - constructor(stub: PhpDocTagStub, nodeType: IElementType) : super(stub, nodeType) } diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpDocTagTemplateClassElementTypeFactory.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpDocTagTemplateClassElementTypeFactory.kt index fdd47fc9..ae593611 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpDocTagTemplateClassElementTypeFactory.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpDocTagTemplateClassElementTypeFactory.kt @@ -7,19 +7,18 @@ import com.intellij.psi.stubs.StubElementFactory import com.intellij.util.io.StringRef import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStub import com.jetbrains.php.lang.documentation.phpdoc.psi.stubs.PhpDocTagStubImpl -import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag import com.vk.kphpstorm.kphptags.psi.KphpDocElementTypes import com.vk.kphpstorm.kphptags.psi.KphpDocTagTemplateClassPsiImpl @Suppress("UnstableApiUsage") -object KphpDocTagTemplateClassElementTypeFactory : StubElementFactory { - override fun createPsi(stub: PhpDocTagStub): PhpDocTag { +object KphpDocTagTemplateClassElementTypeFactory : StubElementFactory { + override fun createPsi(stub: PhpDocTagStub): KphpDocTagTemplateClassPsiImpl { return KphpDocTagTemplateClassPsiImpl(stub, KphpDocElementTypes.kphpDocTagTemplateClass) } - override fun createStub(psi: PhpDocTag, parentStub: StubElement?): PhpDocTagStub { + override fun createStub(psi: KphpDocTagTemplateClassPsiImpl, parentStub: StubElement?): PhpDocTagStub { // stub value is 'T1,T2' — without spaces - val stubValue = (psi as KphpDocTagTemplateClassPsiImpl).getTemplateArguments().joinToString(",") + val stubValue = psi.getTemplateArguments().joinToString(",") return PhpDocTagStubImpl( parentStub, diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt index 035c0fee..45f52300 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/psi/stubs/KphpStubRegistryExtension.kt @@ -23,6 +23,16 @@ class KphpStubRegistryExtension : StubRegistryExtension { KphpDocElementTypes.kphpDocTagTemplateClass, PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagTemplateClass) ) + + registry.registerStubSerializer( + KphpDocElementTypes.kphpDocTagWarnPerformance, + PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagWarnPerformance) + ) + + registry.registerStubSerializer( + KphpDocElementTypes.kphpDocTagJson, + PhpDocTagStubSerializer(KphpDocElementTypes.kphpDocTagJson) + ) } private fun registerFactories(registry: StubRegistry) { @@ -35,5 +45,15 @@ class KphpStubRegistryExtension : StubRegistryExtension { KphpDocElementTypes.kphpDocTagTemplateClass, KphpDocTagTemplateClassElementTypeFactory ) + + registry.registerStubFactory( + KphpDocElementTypes.kphpDocTagWarnPerformance, + PhpDocTagStubFactory(KphpDocElementTypes.kphpDocTagWarnPerformance) + ) + + registry.registerStubFactory( + KphpDocElementTypes.kphpDocTagJson, + PhpDocTagStubFactory(KphpDocElementTypes.kphpDocTagJson) + ) } } diff --git a/src/test/kotlin/com/vk/kphpstorm/testing/infrastructure/StubTestBase.kt b/src/test/kotlin/com/vk/kphpstorm/testing/infrastructure/StubTestBase.kt index 31c01789..821d7380 100644 --- a/src/test/kotlin/com/vk/kphpstorm/testing/infrastructure/StubTestBase.kt +++ b/src/test/kotlin/com/vk/kphpstorm/testing/infrastructure/StubTestBase.kt @@ -40,7 +40,6 @@ abstract class StubTestBase : KphpStormTestBase() { assertSameLinesWithFile(expectedFile.absolutePath, stubTreeString) } - private fun dumpToString(node: StubElement<*>): String { val buffer = StringBuilder() dumpToString(node, buffer, 0) @@ -48,6 +47,7 @@ abstract class StubTestBase : KphpStormTestBase() { return buffer.toString() } + @Suppress("UnstableApiUsage") private fun dumpToString(node: StubElement<*>, buffer: StringBuilder, indent: Int) { StringUtil.repeatSymbol(buffer, ' ', indent) @@ -72,10 +72,12 @@ abstract class StubTestBase : KphpStormTestBase() { } is PhpDocTagStub -> { - "${node.stubType} {name: ${node.name}${if (node.value != null) ", value: " + node.value else ""}}" + "${node.elementType} {name: ${node.name}${if (node.value != null) ", value: " + node.value else ""}}" } - else -> node.stubType + else -> { + if (node is StubElement<*>) node.elementType else node.stubSerializer + } } } } From 81b36349244b1e736c4f17a3024e2e9669a11a83 Mon Sep 17 00:00:00 2001 From: vldf Date: Wed, 30 Jul 2025 15:34:14 +0300 Subject: [PATCH 20/33] sync remaining files with template --- build.gradle.kts | 22 +++++----------------- gradle/libs.versions.toml | 8 +++----- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 68d00a50..3dfab6d8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,4 @@ import org.jetbrains.changelog.Changelog -import org.jetbrains.changelog.markdownToHTML import org.jetbrains.intellij.platform.gradle.TestFrameworkType plugins { @@ -7,7 +6,6 @@ plugins { alias(libs.plugins.kotlin) // Kotlin support alias(libs.plugins.intelliJPlatform) // IntelliJ Platform Gradle Plugin alias(libs.plugins.changelog) // Gradle Changelog Plugin - alias(libs.plugins.kover) // Gradle Kover Plugin } group = providers.gradleProperty("pluginGroup").get() @@ -35,9 +33,8 @@ dependencies { // 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") - ) + create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion")) + // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') }) @@ -59,7 +56,9 @@ intellijPlatform { changeNotes = providers.gradleProperty("pluginVersion").map { pluginVersion -> with(changelog) { renderItem( - (getOrNull(pluginVersion) ?: getUnreleased()).withHeader(false).withEmptySections(false), + (getOrNull(pluginVersion) ?: getUnreleased()) + .withHeader(false) + .withEmptySections(false), Changelog.OutputType.HTML, ) } @@ -86,17 +85,6 @@ changelog { repositoryUrl = providers.gradleProperty("pluginRepositoryUrl") } -// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration -kover { - reports { - total { - xml { - onCheck = true - } - } - } -} - tasks { wrapper { gradleVersion = providers.gradleProperty("gradleVersion").get() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4b459526..1f40753c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,10 +4,9 @@ junit = "4.13.2" opentest4j = "1.3.0" # plugins -changelog = "2.2.1" -intelliJPlatform = "2.5.0" -kotlin = "2.1.20" -kover = "0.9.1" +changelog = "2.3.0" +intelliJPlatform = "2.7.0" +kotlin = "2.2.0" [libraries] junit = { group = "junit", name = "junit", version.ref = "junit" } @@ -17,4 +16,3 @@ opentest4j = { group = "org.opentest4j", name = "opentest4j", version.ref = "ope changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatform" } kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } -kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } From 4729f7aeb8e0e9128d988f140d63e94860de705d Mon Sep 17 00:00:00 2001 From: vldf Date: Wed, 30 Jul 2025 16:35:43 +0300 Subject: [PATCH 21/33] return kover to the project --- build.gradle.kts | 12 ++++++++++++ gradle/libs.versions.toml | 2 ++ 2 files changed, 14 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 3dfab6d8..dbcc6813 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,6 +6,7 @@ plugins { alias(libs.plugins.kotlin) // Kotlin support alias(libs.plugins.intelliJPlatform) // IntelliJ Platform Gradle Plugin alias(libs.plugins.changelog) // Gradle Changelog Plugin + alias(libs.plugins.kover) // Gradle Kover Plugin } group = providers.gradleProperty("pluginGroup").get() @@ -85,6 +86,17 @@ changelog { repositoryUrl = providers.gradleProperty("pluginRepositoryUrl") } +// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration +kover { + reports { + total { + xml { + onCheck = true + } + } + } +} + tasks { wrapper { gradleVersion = providers.gradleProperty("gradleVersion").get() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1f40753c..4e1ffdcf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,6 +7,7 @@ opentest4j = "1.3.0" changelog = "2.3.0" intelliJPlatform = "2.7.0" kotlin = "2.2.0" +kover = "0.9.1" [libraries] junit = { group = "junit", name = "junit", version.ref = "junit" } @@ -16,3 +17,4 @@ opentest4j = { group = "org.opentest4j", name = "opentest4j", version.ref = "ope changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatform" } kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } From 84fda2de223029bca25fda1c6e087ff1add4baf4 Mon Sep 17 00:00:00 2001 From: vldf Date: Wed, 30 Jul 2025 16:43:17 +0300 Subject: [PATCH 22/33] minor fix after rebase --- .../com/vk/kphpstorm/testing/infrastructure/StubTestBase.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/kotlin/com/vk/kphpstorm/testing/infrastructure/StubTestBase.kt b/src/test/kotlin/com/vk/kphpstorm/testing/infrastructure/StubTestBase.kt index 821d7380..c4de74b1 100644 --- a/src/test/kotlin/com/vk/kphpstorm/testing/infrastructure/StubTestBase.kt +++ b/src/test/kotlin/com/vk/kphpstorm/testing/infrastructure/StubTestBase.kt @@ -47,7 +47,6 @@ abstract class StubTestBase : KphpStormTestBase() { return buffer.toString() } - @Suppress("UnstableApiUsage") private fun dumpToString(node: StubElement<*>, buffer: StringBuilder, indent: Int) { StringUtil.repeatSymbol(buffer, ' ', indent) From 51b041b66d16bf9c01282bd39011fa5bf440dd49 Mon Sep 17 00:00:00 2001 From: vldf Date: Wed, 30 Jul 2025 17:06:53 +0300 Subject: [PATCH 23/33] update tests after rebase --- src/test/fixtures/kphp_stub/kphp-json.stub.php | 6 +++--- src/test/fixtures/kphp_stub/kphp-serialize.stub.php | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/fixtures/kphp_stub/kphp-json.stub.php b/src/test/fixtures/kphp_stub/kphp-json.stub.php index 87a60052..1f418178 100644 --- a/src/test/fixtures/kphp_stub/kphp-json.stub.php +++ b/src/test/fixtures/kphp_stub/kphp-json.stub.php @@ -1,9 +1,9 @@ PhpFileStubImpl DOC_COMMENT:PhpDocCommentStubImpl - @kphp-json {name: @kphp-json}:@kphp-json + @kphp-json {name: @kphp-json}:PhpDocTagStubImpl CLASS:PhpClassStubImpl{C} DOC_COMMENT:PhpDocCommentStubImpl - @kphp-json {name: @kphp-json}:@kphp-json - @kphp-json {name: @kphp-json}:@kphp-json + @kphp-json {name: @kphp-json}:PhpDocTagStubImpl + @kphp-json {name: @kphp-json}:PhpDocTagStubImpl CLASS_FIELDS:PhpClassFieldListStubImpl CLASS_FIELD:PhpFieldStubImpl diff --git a/src/test/fixtures/kphp_stub/kphp-serialize.stub.php b/src/test/fixtures/kphp_stub/kphp-serialize.stub.php index 8296b4a1..56fccf4a 100644 --- a/src/test/fixtures/kphp_stub/kphp-serialize.stub.php +++ b/src/test/fixtures/kphp_stub/kphp-serialize.stub.php @@ -1,17 +1,17 @@ PhpFileStubImpl DOC_COMMENT:PhpDocCommentStubImpl - @kphp-... {name: @kphp-serializable}:@kphp-serializable - @kphp-... {name: @kphp-reserved-fields}:@kphp-reserved-fields + {name: @kphp-serializable}:PhpDocTagStubImpl + {name: @kphp-reserved-fields}:PhpDocTagStubImpl CLASS:PhpClassStubImpl{C} DOC_COMMENT:PhpDocCommentStubImpl - @kphp-... {name: @kphp-serialized-float32}:@kphp-serialized-float32 + {name: @kphp-serialized-float32}:PhpDocTagStubImpl CLASS_FIELDS:PhpClassFieldListStubImpl CLASS_FIELD:PhpFieldStubImpl DOC_COMMENT:PhpDocCommentStubImpl - @kphp-... {name: @kphp-serialized-field}:@kphp-serialized-field + {name: @kphp-serialized-field}:PhpDocTagStubImpl CLASS_FIELDS:PhpClassFieldListStubImpl CLASS_FIELD:PhpFieldStubImpl DOC_COMMENT:PhpDocCommentStubImpl - @kphp-... {name: @kphp-serialized-field}:@kphp-serialized-field + {name: @kphp-serialized-field}:PhpDocTagStubImpl CLASS_FIELDS:PhpClassFieldListStubImpl CLASS_FIELD:PhpFieldStubImpl From f742cc55b8ecb43099672d7a68f6a18f5a5edd27 Mon Sep 17 00:00:00 2001 From: vldf Date: Wed, 30 Jul 2025 17:26:51 +0300 Subject: [PATCH 24/33] update tests --- src/test/fixtures/kphp_stub/kphp-simple-tags.stub.php | 10 +++++----- src/test/fixtures/kphp_stub/kphp-template.stub.php | 2 +- .../fixtures/kphp_stub/kphp-warn-performance.stub.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/fixtures/kphp_stub/kphp-simple-tags.stub.php b/src/test/fixtures/kphp_stub/kphp-simple-tags.stub.php index 13affd06..f9c56c7c 100644 --- a/src/test/fixtures/kphp_stub/kphp-simple-tags.stub.php +++ b/src/test/fixtures/kphp_stub/kphp-simple-tags.stub.php @@ -1,10 +1,10 @@ PhpFileStubImpl DOC_COMMENT:PhpDocCommentStubImpl - @kphp-... {name: @kphp-throws}:@kphp-throws - @kphp-... {name: @kphp-color}:@kphp-color - @kphp-... {name: @kphp-required}:@kphp-required - @kphp-... {name: @kphp-inline}:@kphp-inline - @kphp-... {name: @kphp-profile}:@kphp-profile + {name: @kphp-throws}:PhpDocTagStubImpl + {name: @kphp-color}:PhpDocTagStubImpl + {name: @kphp-required}:PhpDocTagStubImpl + {name: @kphp-inline}:PhpDocTagStubImpl + {name: @kphp-profile}:PhpDocTagStubImpl FUNCTION:PhpFunctionStubImpl NOT_PROMOTED_PARAMETER:PhpParameterStubImpl NOT_PROMOTED_PARAMETER:PhpParameterStubImpl diff --git a/src/test/fixtures/kphp_stub/kphp-template.stub.php b/src/test/fixtures/kphp_stub/kphp-template.stub.php index afd06096..0d65eb0e 100644 --- a/src/test/fixtures/kphp_stub/kphp-template.stub.php +++ b/src/test/fixtures/kphp_stub/kphp-template.stub.php @@ -1,4 +1,4 @@ PhpFileStubImpl DOC_COMMENT:PhpDocCommentStubImpl - @kphp-template-class {name: @kphp-template-class, value: int,string}:@kphp-template-class: int,string + @kphp-template-class {name: @kphp-template-class, value: int,string}:PhpDocTagStubImpl CLASS:PhpClassStubImpl{C} diff --git a/src/test/fixtures/kphp_stub/kphp-warn-performance.stub.php b/src/test/fixtures/kphp_stub/kphp-warn-performance.stub.php index 24b3092f..55e26590 100644 --- a/src/test/fixtures/kphp_stub/kphp-warn-performance.stub.php +++ b/src/test/fixtures/kphp_stub/kphp-warn-performance.stub.php @@ -1,4 +1,4 @@ PhpFileStubImpl DOC_COMMENT:PhpDocCommentStubImpl - @kphp-warn-performance {name: @kphp-warn-performance}:@kphp-warn-performance + @kphp-warn-performance {name: @kphp-warn-performance}:PhpDocTagStubImpl FUNCTION:PhpFunctionStubImpl From 4a16783d1a79c794787e111e3235f1147908c09f Mon Sep 17 00:00:00 2001 From: vldf Date: Wed, 30 Jul 2025 18:34:19 +0300 Subject: [PATCH 25/33] run `free-disk-space` action only on linux --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd68cef4..02394e04 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,6 +78,7 @@ jobs: # Free GitHub Actions Environment Disk Space - name: Maximize Build Space uses: jlumbroso/free-disk-space@v1.3.1 + if: runner.os == 'Linux' with: tool-cache: false large-packages: false From 58c1ed3b4bf8d7f081c4e330fc6439239bd92a88 Mon Sep 17 00:00:00 2001 From: vldf Date: Wed, 30 Jul 2025 21:45:08 +0300 Subject: [PATCH 26/33] fix tests on windows --- .../vk/kphpstorm/testing/infrastructure/KphpStormTestBase.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/kotlin/com/vk/kphpstorm/testing/infrastructure/KphpStormTestBase.kt b/src/test/kotlin/com/vk/kphpstorm/testing/infrastructure/KphpStormTestBase.kt index 07b3c434..746c7f20 100644 --- a/src/test/kotlin/com/vk/kphpstorm/testing/infrastructure/KphpStormTestBase.kt +++ b/src/test/kotlin/com/vk/kphpstorm/testing/infrastructure/KphpStormTestBase.kt @@ -1,8 +1,10 @@ package com.vk.kphpstorm.testing.infrastructure +import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess import com.intellij.testFramework.fixtures.BasePlatformTestCase import com.jetbrains.php.config.PhpLanguageLevel import com.jetbrains.php.config.PhpProjectConfigurationFacade +import java.nio.file.Paths abstract class KphpStormTestBase() : BasePlatformTestCase() { @@ -13,6 +15,8 @@ abstract class KphpStormTestBase() : BasePlatformTestCase() { override fun setUp() { super.setUp() setupLanguageLevel() + val testDataAbsPath = Paths.get(testDataPath).toAbsolutePath().toString() + VfsRootAccess.allowRootAccess(testRootDisposable, testDataAbsPath) } private fun setupLanguageLevel() { From a893fab83cfba7af8dc0ac493d5a8bba49a18114 Mon Sep 17 00:00:00 2001 From: vldf Date: Thu, 31 Jul 2025 11:52:33 +0300 Subject: [PATCH 27/33] update gradle to match the template one --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 97b27792..a83b9490 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ platformPlugins = platformBundledPlugins = com.jetbrains.php # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.13 +gradleVersion = 8.14.3 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency = false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b1..d4081da4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 64b594a99db66eff404ef138c62b9fa5111292ed Mon Sep 17 00:00:00 2001 From: vldf Date: Thu, 31 Jul 2025 12:57:43 +0300 Subject: [PATCH 28/33] up plugin's version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a83b9490..d9532a61 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ pluginGroup = com.vk pluginName = kphpstorm pluginRepositoryUrl = https://github.com/VKCOM/kphpstorm # SemVer format -> https://semver.org -pluginVersion = 1.2.15 +pluginVersion = 1.2.16 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html pluginSinceBuild = 251 From be417fef0143e724583a9173e48e28b368794cc9 Mon Sep 17 00:00:00 2001 From: vldf Date: Mon, 4 Aug 2025 11:55:46 +0300 Subject: [PATCH 29/33] update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 381098a5..d0859eea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] +## [1.2.16] - 04.08.2025 + +- Adapt code for PhpStorm 2025.1 + ## [1.2.15] - 31.07.2025 - introduce an intention to add `@kphp-immutable-class` annotation From 4525e58d36ddf02cb2a4748be14e1859fa1da3f6 Mon Sep 17 00:00:00 2001 From: vldf Date: Mon, 4 Aug 2025 14:49:29 +0300 Subject: [PATCH 30/33] update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 873c3220..4e28c97d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ build .DS_Store out +.kotlin From 570ec5779972dc984b87befde31fe1b53c615e54 Mon Sep 17 00:00:00 2001 From: vldf Date: Mon, 4 Aug 2025 14:52:00 +0300 Subject: [PATCH 31/33] update gradle --- gradle/wrapper/gradle-wrapper.jar | Bin 43705 -> 43764 bytes gradlew | 4 ++-- gradlew.bat | 4 ++-- settings.gradle.kts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644 GIT binary patch delta 642 zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|** z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$ z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O% zFic^X{7^$?^Ho04eona9n#mGMxKhA=~8B%JN`M zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n zVkxF2rjrjWR+_xr6e6@_u@s~2uv{9vi*1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^ z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK I1x7am0No)LiU0rr delta 584 zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe z+ES)HSrVnWLtJ&)lO%hRkV9zl5qqWRt0e;bb zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts AA^-pY diff --git a/gradlew b/gradlew index faf93008..23d15a93 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a218..db3a6ac2 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle.kts b/settings.gradle.kts index e6d0fb0f..36794d4b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } rootProject.name = "kphpstorm" From 38803c25fec7861f8f4749f942528071e7f79557 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Mon, 4 Aug 2025 16:50:02 +0300 Subject: [PATCH 32/33] ultra fix --- build.gradle.kts | 6 ------ src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index dbcc6813..60ebae11 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -102,9 +102,3 @@ tasks { gradleVersion = providers.gradleProperty("gradleVersion").get() } } - -sourceSets { - test { - resources.srcDir("src/test/") - } -} diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt index 3424afa7..3307388f 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt @@ -73,8 +73,7 @@ abstract class KphpDocTag( } fun findThisTagInDocComment(docCommentOwner: PhpNamedElement): PhpDocTag? { - return PsiTreeUtil.findChildrenOfType(docCommentOwner.docComment, PhpDocTag::class.java) - .firstOrNull { it.name == nameWithAt } + return findThisTagInDocComment(docCommentOwner.docComment ?: return null) } inline fun findThisTagsInDocComment(docComment: PhpDocComment): List { From 00ac831eb2fa9724290e4d68db2aa43955576790 Mon Sep 17 00:00:00 2001 From: Danil Ovchinnikov Date: Mon, 4 Aug 2025 16:51:44 +0300 Subject: [PATCH 33/33] oops --- src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt b/src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt index 3307388f..85e9c282 100644 --- a/src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt +++ b/src/main/kotlin/com/vk/kphpstorm/kphptags/KphpDocTag.kt @@ -3,7 +3,6 @@ package com.vk.kphpstorm.kphptags import com.intellij.lang.annotation.AnnotationHolder import com.intellij.lang.annotation.HighlightSeverity import com.intellij.psi.PsiElement -import com.intellij.psi.util.PsiTreeUtil import com.jetbrains.php.lang.documentation.phpdoc.PhpDocUtil import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment import com.jetbrains.php.lang.documentation.phpdoc.psi.tags.PhpDocTag