Skip to content

Commit 08d2ccd

Browse files
committed
[T3CMS] Adapt LineMarkerProvider.collectionNavigationMarkers signature
To adapt to 2020.2
1 parent 6f5a612 commit 08d2ccd

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ matrix:
1919
include:
2020
- 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.*"
2121
- 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.*"
22-
- env: IDEA_VERSION="IU-2020.2" PHP_PLUGIN_VERSION="202.6397.94" PSI_VIEWER_PLUGIN_VERSION="202-SNAPSHOT" GRAMMAR_KIT_PLUGIN_VERSION="2020.2" SINCE_BUILD="202" UNTIL_BUILD="202.*"
22+
- 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.*"
2323

2424
before_install:
2525
- "export ORG_GRADLE_PROJECT_ideaVersion=${IDEA_VERSION}"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ isEAP = false
66

77
jFlexRelease = 1.7.0-1
88

9-
grammarKitPluginVersion = 2020.2
9+
grammarKitPluginVersion = 2020.2.1
1010
ideaVersion = IU-2020.2
1111
phpPluginVersion = 202.6397.94
1212
psiViewerPluginVersion = 202-SNAPSHOT

lang-fluid/src/main/java/com/cedricziel/idea/fluid/codeInsight/ControllerLineMarkerProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
public class ControllerLineMarkerProvider extends RelatedItemLineMarkerProvider {
1818
@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) {
2020
if (!PlatformPatterns.psiElement(PhpTokenTypes.IDENTIFIER).withParent(PlatformPatterns.psiElement(Method.class).withName(PlatformPatterns.string().endsWith("Action"))).accepts(element)) {
2121
return;
2222
}

lang-fluid/src/main/java/com/cedricziel/idea/fluid/codeInsight/TemplateLineMarkerProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
public class TemplateLineMarkerProvider extends RelatedItemLineMarkerProvider {
1717
@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) {
1919
if (!PlatformPatterns.psiElement(FluidFile.class).accepts(element)) {
2020
return;
2121
}

typo3-cms/src/main/java/com/cedricziel/idea/typo3/codeInsight/RouteLineMarkerProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
public class RouteLineMarkerProvider extends RelatedItemLineMarkerProvider {
2424
@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) {
2626
if (!TYPO3CMSProjectSettings.isEnabled(element)) {
2727
return;
2828
}

0 commit comments

Comments
 (0)