Merge pull request #325 from cedricziel/eap-2020.2

cedricziel · web-flow · commit 08b71c3c8900 · 2020-07-28T22:33:50.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -17,8 +17,7 @@ cache:
 
 matrix:
   include:
-  - env: IDEA_VERSION="IU-2019.3.4" PHP_PLUGIN_VERSION="193.6911.15" PSI_VIEWER_PLUGIN_VERSION="193-SNAPSHOT" GRAMMAR_KIT_PLUGIN_VERSION="2019.3" SINCE_BUILD="193" UNTIL_BUILD="193.*"
-  - env: IDEA_VERSION="IU-2020.1.1" PHP_PLUGIN_VERSION="201.7223.91" PSI_VIEWER_PLUGIN_VERSION="201-SNAPSHOT" GRAMMAR_KIT_PLUGIN_VERSION="2020.1" SINCE_BUILD="201" UNTIL_BUILD="201.*"
+  - env: IDEA_VERSION="IU-2020.2" PHP_PLUGIN_VERSION="202.6397.94" PSI_VIEWER_PLUGIN_VERSION="202-SNAPSHOT" GRAMMAR_KIT_PLUGIN_VERSION="2020.2.1" SINCE_BUILD="202" UNTIL_BUILD="202.*"
 
 before_install:
 - "export ORG_GRADLE_PROJECT_ideaVersion=${IDEA_VERSION}"
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 }
 
 plugins {
-    id "org.jetbrains.intellij" version "0.4.18"
+    id "org.jetbrains.intellij" version "0.4.21"
     id "org.jetbrains.grammarkit" version "${grammarKitPluginVersion}"
     id 'com.palantir.git-version' version "0.11.0"
 }
diff --git a/gradle.properties b/gradle.properties
@@ -6,12 +6,19 @@ isEAP = false
 
 jFlexRelease = 1.7.0-1
 
-grammarKitPluginVersion = 2020.1
-ideaVersion = IU-2020.1.1
-phpPluginVersion = 201.7223.91
-psiViewerPluginVersion = 201-SNAPSHOT
-customSinceBuild=201
-customUntilBuild=201.*
+grammarKitPluginVersion = 2020.2.1
+ideaVersion = IU-2020.2
+phpPluginVersion = 202.6397.94
+psiViewerPluginVersion = 202-SNAPSHOT
+customSinceBuild=202
+customUntilBuild=202.*
+
+#grammarKitPluginVersion = 2020.1
+#ideaVersion = IU-2020.1.1
+#phpPluginVersion = 201.7223.91
+#psiViewerPluginVersion = 201-SNAPSHOT
+#customSinceBuild=201
+#customUntilBuild=201.*
 
 #grammarKitPluginVersion = 2019.3
 #ideaVersion = IU-2019.3.4
diff --git a/lang-fluid/src/main/java/com/cedricziel/idea/fluid/codeInsight/ControllerLineMarkerProvider.java b/lang-fluid/src/main/java/com/cedricziel/idea/fluid/codeInsight/ControllerLineMarkerProvider.java
@@ -16,7 +16,7 @@
 
 public class ControllerLineMarkerProvider extends RelatedItemLineMarkerProvider {
     @Override
-    protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo> result) {
+    protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo<?>> result) {
         if (!PlatformPatterns.psiElement(PhpTokenTypes.IDENTIFIER).withParent(PlatformPatterns.psiElement(Method.class).withName(PlatformPatterns.string().endsWith("Action"))).accepts(element)) {
             return;
         }
diff --git a/lang-fluid/src/main/java/com/cedricziel/idea/fluid/codeInsight/TemplateLineMarkerProvider.java b/lang-fluid/src/main/java/com/cedricziel/idea/fluid/codeInsight/TemplateLineMarkerProvider.java
@@ -15,7 +15,7 @@
 
 public class TemplateLineMarkerProvider extends RelatedItemLineMarkerProvider {
     @Override
-    protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo> result) {
+    protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo<?>> result) {
         if (!PlatformPatterns.psiElement(FluidFile.class).accepts(element)) {
             return;
         }
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/codeInsight/RouteLineMarkerProvider.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/codeInsight/RouteLineMarkerProvider.java
@@ -22,7 +22,7 @@
 
 public class RouteLineMarkerProvider extends RelatedItemLineMarkerProvider {
     @Override
-    protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo> result) {
+    protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo<?>> result) {
         if (!TYPO3CMSProjectSettings.isEnabled(element)) {
             return;
         }
diff --git a/typo3-cms/src/main/java/com/cedricziel/idea/typo3/extbase/persistence/ExtbaseModelCollectionReturnTypeProvider.java b/typo3-cms/src/main/java/com/cedricziel/idea/typo3/extbase/persistence/ExtbaseModelCollectionReturnTypeProvider.java
diff --git a/typo3-cms/src/main/resources/META-INF/plugin.xml b/typo3-cms/src/main/resources/META-INF/plugin.xml
@@ -34,7 +34,6 @@
         <typeProvider4 implementation="com.cedricziel.idea.typo3.provider.ObjectManagerTypeProvider"/>
         <typeProvider4 implementation="com.cedricziel.idea.typo3.provider.PhpGlobalsTypeProvider"/>
 
-        <typeProvider4 implementation="com.cedricziel.idea.typo3.extbase.persistence.ExtbaseModelCollectionReturnTypeProvider"/>
         <typeProvider4 implementation="com.cedricziel.idea.typo3.contextApi.ContextTypeProvider"/>
     </extensions>
 
diff --git a/typo3-cms/src/test/java/com/cedricziel/idea/typo3/extbase/persistence/ExtbaseModelCollectionReturnTypeProviderTest.java b/typo3-cms/src/test/java/com/cedricziel/idea/typo3/extbase/persistence/ExtbaseModelCollectionReturnTypeProviderTest.java

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ buildscript {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`plugins {`
`15`		`- id "org.jetbrains.intellij" version "0.4.18"`
	`15`	`+ id "org.jetbrains.intellij" version "0.4.21"`
`16`	`16`	`id "org.jetbrains.grammarkit" version "${grammarKitPluginVersion}"`
`17`	`17`	`id 'com.palantir.git-version' version "0.11.0"`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`public class ControllerLineMarkerProvider extends RelatedItemLineMarkerProvider {`
`18`	`18`	`@Override`
`19`		`- protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo> result) {`
	`19`	`+ protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo<?>> result) {`
`20`	`20`	`if (!PlatformPatterns.psiElement(PhpTokenTypes.IDENTIFIER).withParent(PlatformPatterns.psiElement(Method.class).withName(PlatformPatterns.string().endsWith("Action"))).accepts(element)) {`
`21`	`21`	`return;`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`public class TemplateLineMarkerProvider extends RelatedItemLineMarkerProvider {`
`17`	`17`	`@Override`
`18`		`- protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo> result) {`
	`18`	`+ protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo<?>> result) {`
`19`	`19`	`if (!PlatformPatterns.psiElement(FluidFile.class).accepts(element)) {`
`20`	`20`	`return;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`public class RouteLineMarkerProvider extends RelatedItemLineMarkerProvider {`
`24`	`24`	`@Override`
`25`		`- protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo> result) {`
	`25`	`+ protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo<?>> result) {`
`26`	`26`	`if (!TYPO3CMSProjectSettings.isEnabled(element)) {`
`27`	`27`	`return;`
`28`	`28`	`}`