update

build.gradle

@@ -1,13 +1,13 @@
 plugins {
     id 'java'
     id 'idea'
-    id 'org.jetbrains.intellij' version '1.3.0'     // https://github.com/JetBrains/gradle-intellij-plugin
-    id 'org.jetbrains.kotlin.jvm' version '1.6.0'   // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
+    id 'org.jetbrains.intellij' version '1.5.3'     // https://github.com/JetBrains/gradle-intellij-plugin
+    id 'org.jetbrains.kotlin.jvm' version '1.6.10'   // https://plugins.gradle.org/plugin/org.jetbrains.kotlin.jvm
 }
 
 group 'com.vk'
 // important! update changeNotes (below) on version bump
-version '1.2.2'
+version '1.2.3'
 
 repositories {
     mavenCentral()
@@ -40,9 +40,9 @@ intellij {
     type = 'IU'
     // for release versions: https://www.jetbrains.com/intellij-repository/releases (com.jetbrains.intellij.idea)
     // for EAPs: https://www.jetbrains.com/intellij-repository/snapshots
-    version = '2021.3.1'
+    version = '2022.1'
     plugins = [
-        'com.jetbrains.php:213.5744.223', // https://plugins.jetbrains.com/plugin/6610-php/versions
+        'com.jetbrains.php:221.5080.224', // https://plugins.jetbrains.com/plugin/6610-php/versions
     ]
 }
 runIde {
@@ -54,7 +54,7 @@ patchPluginXml {
     // <change-notes> is only for LATEST version and should be updated on every version bump
     changeNotes = """
 <ul>
-  <li>adapt code for 2021.3</li>
+  <li>adapt code for 2022.1</li>
 </ul>
 """
 }

src/main/kotlin/com/vk/kphpstorm/KphpStormASTFactory.kt

@@ -1,17 +1,57 @@
 package com.vk.kphpstorm
 
-import com.intellij.lang.DefaultASTFactoryImpl
-import com.intellij.psi.impl.source.tree.LeafElement
-import com.intellij.psi.impl.source.tree.PsiCommentImpl
+import com.intellij.lang.ASTFactory
+import com.intellij.lang.LanguageParserDefinitions
+import com.intellij.psi.impl.source.tree.*
 import com.intellij.psi.tree.IElementType
-import com.vk.kphpstorm.generics.psi.GenericInstantiationPsiCommentImpl
+import com.intellij.psi.tree.IFileElementType
+import com.intellij.psi.tree.ILazyParseableElementType
+import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocTokenImpl
+import com.jetbrains.php.lang.lexer.PhpTokenTypes
 
-class KphpStormASTFactory : DefaultASTFactoryImpl() {
+class KphpStormASTFactory : MyDefaultASTFactoryImpl() {
     override fun createComment(type: IElementType, text: CharSequence): LeafElement {
         if (!text.startsWith("/*<") && !text.endsWith(">*/")) {
             return PsiCommentImpl(type, text)
         }
 
-        return GenericInstantiationPsiCommentImpl(type, text)
+        return PhpDocTokenImpl(type, text)
+    }
+}
+
+abstract class MyDefaultASTFactoryImpl : ASTFactory() {
+    override fun createLazy(type: ILazyParseableElementType, text: CharSequence?): LazyParseableElement {
+        if (type == PhpTokenTypes.C_STYLE_COMMENT) {
+            return LazyParseableElement(type, text)
+        }
+
+        return if (type is IFileElementType) {
+            FileElement(type, text)
+        } else LazyParseableElement(type, text)
+    }
+
+    override fun createComposite(type: IElementType): CompositeElement {
+        if (type == PhpTokenTypes.C_STYLE_COMMENT) {
+            return CompositeElement(type)
+        }
+
+        return if (type is IFileElementType) {
+            FileElement(type, null)
+        } else CompositeElement(type)
+    }
+
+    override fun createLeaf(type: IElementType, text: CharSequence): LeafElement {
+        val lang = type.language
+        val parserDefinition = LanguageParserDefinitions.INSTANCE.forLanguage(lang)
+        if (parserDefinition != null) {
+            if (parserDefinition.commentTokens.contains(type)) {
+                return createComment(type, text)
+            }
+        }
+        return LeafPsiElement(type, text)
+    }
+
+    open fun createComment(type: IElementType, text: CharSequence): LeafElement {
+        return PsiCommentImpl(type, text)
     }
 }

src/main/kotlin/com/vk/kphpstorm/KphpStormParserDefinition.kt

@@ -4,6 +4,7 @@ import com.intellij.lang.ASTNode
 import com.intellij.psi.PsiElement
 import com.jetbrains.php.lang.documentation.phpdoc.parser.tags.PhpDocTagParserRegistry
 import com.jetbrains.php.lang.documentation.phpdoc.psi.impl.PhpDocTypeImpl
+import com.jetbrains.php.lang.lexer.PhpTokenTypes
 import com.jetbrains.php.lang.parser.PhpParserDefinition
 import com.jetbrains.php.lang.parser.PhpPsiElementCreator
 import com.vk.kphpstorm.exphptype.psi.*
@@ -52,6 +53,10 @@ class KphpStormParserDefinition() : PhpParserDefinition() {
             ExPhpTypeClassStringPsiImpl.elementType        -> ExPhpTypeClassStringPsiImpl(node)
             ExPhpTypeForcingPsiImpl.elementType            -> ExPhpTypeForcingPsiImpl(node)
 
+            PhpTokenTypes.C_STYLE_COMMENT                  -> {
+                PhpDocTypeImpl(node)
+            }
+
             else                                           -> PhpPsiElementCreator.create(node)
         }
     }

src/main/kotlin/com/vk/kphpstorm/generics/GenericFunctionCall.kt

@@ -115,6 +115,17 @@ class GenericsReifier(val project: Project) {
             }
         }
 
+        if (paramExType is ExPhpTypeCallable) {
+            if (argExType is ExPhpTypeCallable) {
+                if (argExType.returnType != null && paramExType.returnType != null) {
+                    reifyArgumentGenericsT(argExType.returnType, paramExType.returnType)
+                }
+                for (i in 0 until min(argExType.argTypes.size, paramExType.argTypes.size)) {
+                    reifyArgumentGenericsT(argExType.argTypes[i], paramExType.argTypes[i])
+                }
+            }
+        }
+
         if (paramExType is ExPhpTypeClassString) {
             val isPipeWithClassString = argExType is ExPhpTypePipe &&
                     argExType.items.any { it is ExPhpTypeClassString }
@@ -614,6 +625,7 @@ abstract class GenericCall(val project: Project) {
     val specializationNameMap get() = extractor.specializationNameMap
     val implicitSpecs get() = reifier.implicitSpecs
     val implicitSpecializationNameMap get() = reifier.implicitSpecializationNameMap
+    val implicitClassSpecializationNameMap get() = reifier.implicitClassSpecializationNameMap
     val implicitSpecializationErrors get() = reifier.implicitSpecializationErrors
 
     protected fun init() {

src/main/kotlin/com/vk/kphpstorm/inspections/GenericInstantiationArgsCountMismatchInspection.kt

@@ -34,7 +34,7 @@ class GenericInstantiationArgsCountMismatchInspection : PhpInspection() {
             private fun checkGenericCall(call: GenericCall) {
                 if (!call.isResolved()) return
 
-                val countGenericNames = call.genericNames().size
+                val countGenericNames = call.genericNames().size - call.implicitClassSpecializationNameMap.size
                 val countExplicitSpecs = call.explicitSpecs.size
                 val explicitSpecsPsi = call.explicitSpecsPsi
 

src/test/fixtures/generics/class_resolving.fixture.php

@@ -1,4 +1,8 @@
 <?php
+
+$a = mirror/*<GlobalA>*/(new GlobalA());
+
+
 /** @noinspection FunctionUnnecessaryExplicitGenericInstantiationListInspection */
 /** @noinspection PhpUndefinedFunctionInspection */
 /** @noinspection PhpExpressionResultUnusedInspection */

src/test/fixtures/generics/classes/Vector.fixture.php

@@ -45,4 +45,127 @@ function filter_is_instance($class) {
     function combine_with($other) {
         return new Vector/*<T|T1>*/(array_merge($this->data, $other->data));
     }
+
+
+    /**
+     * @kphp-generic T1
+     * @param callable(T):T1 $fn
+     * @return Vector<T1>
+     */
+    function map($fn) {
+        /** @var T1 $new_data */
+        $new_data = array_map($fn, $this->data);
+        return new Vector(...$new_data);
+    }
+}
+
+/**
+ * @kphp-generic T
+ * @param T ...$els
+ * @return Vector<T>
+ */
+function listOf(...$els) {
+    return new Vector(...$els);
 }
+//
+
+//listOf(1, 2, 3)->get(10);
+//listOf("1", "2", "3")->get(10);
+
+$vec = listOf(1, 2)->map(function ($el): string {
+    return "$el";
+});
+
+
+/** @noinspection GenericUnnecessaryExplicitInstantiationListInspection */
+/** @noinspection PhpUndefinedFunctionInspection */
+/** @noinspection PhpExpressionResultUnusedInspection */
+
+
+//
+//$a = mirror(tuple([new GlobalA()], new \Classes\A() ?? new \Classes\C));
+//expr_type($a, "tuple(\GlobalA[],\Classes\C|\Classes\A)");
+//
+
+//use Classes\Base;
+//
+//class SerializableItem implements Serializable {
+//    public function serialize() {}
+//
+//    /**
+//     * @param mixed $data
+//     */
+//    public function unserialize($data) {}
+//}
+//
+///**
+// * Not mutable generic collection.
+// *
+// * @kphp-generic T: Serializable
+// */
+//class VectorList1 {
+//    /** @var T[] */
+//    protected $data = [];
+//
+//    /**
+//     * @param T ...$els
+//     */
+//    public function __construct(...$els) {
+//        $this->data = $els;
+//    }
+//
+//    /**
+//     * @return T
+//     */
+//    public function get(int $index) {
+//        return $this->data[$index];
+//    }
+//}
+//
+///**
+// * @kphp-generic T: Serializable
+// * @param T $a
+// */
+//function acceptSerializable($a) {
+//    // Сделать тут тип $a == Serializable, чтобы было базовое автодополнение
+//}
+//
+//////$vec = new VectorList1/*<string>*/(1, 2, 3);
+//////$vec = new VectorList1/*<GlobalA>*/(1, 2, 3);
+////$vec = new VectorList1/*<Base>*/(1, 2, 3);
+////$vec = new VectorList1(new Base);
+////$vec = new VectorList1/*<SerializableItem>*/(new SerializableItem());
+////
+////acceptSerializable(new Base);
+////acceptSerializable/*<Base>*/(new Base);
+////acceptSerializable(new SerializableItem);
+//
+//class BaseClass {}
+//
+//class ChildClass extends BaseClass {
+//    /**
+//     * @kphp-generic T: self
+//     * @param T $a
+//     */
+//    function f($a) {
+//
+//    }
+//}
+//
+//$a = new ChildClass();
+////$a->f(new BaseClass());
+//$a->f(new SerializableItem());
+//
+///**
+// * @kphp-generic T1, T2: T1
+// * @param T1 $a
+// * @param T2 $b
+// */
+//function g($a, $b) {
+//
+//}
+//
+//g/*<SerializableItem, ChildClass>*/();
+
+
+

src/test/fixtures/generics/tests.php

@@ -1,63 +1,10 @@
 <?php
-/** @noinspection GenericUnnecessaryExplicitInstantiationListInspection */
-/** @noinspection PhpUndefinedFunctionInspection */
-/** @noinspection PhpExpressionResultUnusedInspection */
-
-
-//
-//$a = mirror(tuple([new GlobalA()], new \Classes\A() ?? new \Classes\C));
-//expr_type($a, "tuple(\GlobalA[],\Classes\C|\Classes\A)");
-//
-
-use Classes\Base;
-
-class SerializableItem implements Serializable {
-    public function serialize() {}
-
-    /**
-     * @param mixed $data
-     */
-    public function unserialize($data) {}
-}
 
 /**
- * Not mutable generic collection.
- *
- * @kphp-generic T: Serializable
+ * @param $a GlobalA
  */
-class VectorList1 {
-    /** @var T[] */
-    protected $data = [];
+function f() {
 
-    /**
-     * @param T ...$els
-     */
-    public function __construct(...$els) {
-        $this->data = $els;
-    }
-
-    /**
-     * @return T
-     */
-    public function get(int $index) {
-        return $this->data[$index];
-    }
-}
-
-/**
- * @kphp-generic T: Serializable
- * @param T $a
- */
-function acceptSerializable($a) {
-    // Сделать тут тип $a == Serializable, чтобы было базовое автодополнение
 }
+$a = mirror/*<GlobalA>*/(new GlobalA());
 
-//$vec = new VectorList1/*<string>*/(1, 2, 3);
-//$vec = new VectorList1/*<GlobalA>*/(1, 2, 3);
-$vec = new VectorList1/*<Base>*/(1, 2, 3);
-$vec = new VectorList1(new Base);
-$vec = new VectorList1/*<SerializableItem>*/(new SerializableItem());
-
-acceptSerializable(new Base);
-acceptSerializable/*<Base>*/(new Base);
-acceptSerializable(new SerializableItem);