From 08dd3d906410936be0ab50ef47af6f80719fd5ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Wed, 17 Apr 2024 15:10:56 +0200 Subject: [PATCH] [devkit] support line marker to plugin.xml for EPs with >1 CTOR parameter (IDEA-351950) add more tests GitOrigin-RevId: 671729c6a760a7b8aae4d39a51f5d8afc830a0ff --- .../extensionDeclaration/MyExtension.java | 6 ------ .../MyExtensionNoParameters.java | 3 +++ .../MyExtensionSingleParameter.java | 5 +++++ .../MyExtensionTwoParameters.java | 6 ++++++ .../navigation/extensionDeclaration/plugin.xml | 5 ++++- ...clarationRelatedItemLineMarkerProviderTest.java | 14 +++++++++++--- 6 files changed, 29 insertions(+), 10 deletions(-) delete mode 100644 plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtension.java create mode 100644 plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtensionNoParameters.java create mode 100644 plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtensionSingleParameter.java create mode 100644 plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtensionTwoParameters.java diff --git a/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtension.java b/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtension.java deleted file mode 100644 index 3775d7e7dc95..000000000000 --- a/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtension.java +++ /dev/null @@ -1,6 +0,0 @@ -import com.intellij.openapi.project.Project; -import kotlinx.coroutines.CoroutineScope - -public class MyExtension { - public MyExtension(Project project, CoroutineScope cs) {} -} \ No newline at end of file diff --git a/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtensionNoParameters.java b/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtensionNoParameters.java new file mode 100644 index 000000000000..ccdb07da0fd3 --- /dev/null +++ b/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtensionNoParameters.java @@ -0,0 +1,3 @@ +public class MyExtensionNoParameters { + public MyExtensionNoParameters() {} +} \ No newline at end of file diff --git a/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtensionSingleParameter.java b/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtensionSingleParameter.java new file mode 100644 index 000000000000..e41fe351abf9 --- /dev/null +++ b/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtensionSingleParameter.java @@ -0,0 +1,5 @@ +import com.intellij.openapi.project.Project; + +public class MyExtensionSingleParameter { + public MyExtensionSingleParameter(Project project) {} +} \ No newline at end of file diff --git a/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtensionTwoParameters.java b/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtensionTwoParameters.java new file mode 100644 index 000000000000..01c816c9150b --- /dev/null +++ b/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/MyExtensionTwoParameters.java @@ -0,0 +1,6 @@ +import com.intellij.openapi.project.Project; +import kotlinx.coroutines.CoroutineScope + +public class MyExtensionTwoParameters { + public MyExtensionTwoParameters(Project project, CoroutineScope cs) {} +} \ No newline at end of file diff --git a/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/plugin.xml b/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/plugin.xml index b28c1895876d..37b6d70108ef 100644 --- a/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/plugin.xml +++ b/plugins/devkit/devkit-java-tests/testData/navigation/extensionDeclaration/plugin.xml @@ -8,7 +8,10 @@ - + + + + \ No newline at end of file diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/navigation/ExtensionPluginDescriptorDeclarationRelatedItemLineMarkerProviderTest.java b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/navigation/ExtensionPluginDescriptorDeclarationRelatedItemLineMarkerProviderTest.java index 5e43246c6058..6138b474f1f9 100644 --- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/navigation/ExtensionPluginDescriptorDeclarationRelatedItemLineMarkerProviderTest.java +++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/navigation/ExtensionPluginDescriptorDeclarationRelatedItemLineMarkerProviderTest.java @@ -1,4 +1,4 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.idea.devkit.navigation; import com.intellij.testFramework.TestDataPath; @@ -18,8 +18,16 @@ public class ExtensionPluginDescriptorDeclarationRelatedItemLineMarkerProviderTe doTestInvalidExtension("MyInvalidExtension.java"); } - public void testExtension() { - doTestExtension("MyExtension.java", ""); + public void testExtensionNoParameters() { + doTestExtension("MyExtensionNoParameters.java", ""); + } + + public void testExtensionSingleParameter() { + doTestExtension("MyExtensionSingleParameter.java", ""); + } + + public void testExtensionTwoParameters() { + doTestExtension("MyExtensionTwoParameters.java", ""); } public void testNestedClassExtension() {