Rename of KotlinQuickDocumentationProvider to KotlinDocumentationProvider
This commit is contained in:
@@ -590,8 +590,8 @@
|
|||||||
|
|
||||||
<breadcrumbsInfoProvider implementation="org.jetbrains.kotlin.idea.codeInsight.KotlinBreadcrumbsInfoProvider"/>
|
<breadcrumbsInfoProvider implementation="org.jetbrains.kotlin.idea.codeInsight.KotlinBreadcrumbsInfoProvider"/>
|
||||||
|
|
||||||
<lang.documentationProvider language="JAVA" implementationClass="org.jetbrains.kotlin.idea.KotlinQuickDocumentationProvider" order="first"/>
|
<lang.documentationProvider language="JAVA" implementationClass="org.jetbrains.kotlin.idea.KotlinDocumentationProvider" order="first"/>
|
||||||
<documentationProvider implementation="org.jetbrains.kotlin.idea.KotlinQuickDocumentationProvider"/>
|
<documentationProvider implementation="org.jetbrains.kotlin.idea.KotlinDocumentationProvider"/>
|
||||||
|
|
||||||
<codeInsight.lineMarkerProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.markers.KotlinLineMarkerProvider"/>
|
<codeInsight.lineMarkerProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.markers.KotlinLineMarkerProvider"/>
|
||||||
<codeInsight.lineMarkerProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinRecursiveCallLineMarkerProvider"/>
|
<codeInsight.lineMarkerProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinRecursiveCallLineMarkerProvider"/>
|
||||||
|
|||||||
+2
-2
@@ -118,7 +118,7 @@ class WrapValueParameterHandler(val base: DescriptorRenderer.ValueParametersHand
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
open class KotlinQuickDocumentationProviderCompatBase : AbstractDocumentationProvider() {
|
open class KotlinDocumentationProviderCompatBase : AbstractDocumentationProvider() {
|
||||||
|
|
||||||
override fun getCustomDocumentationElement(editor: Editor, fil: PsiFile, contextElement: PsiElement?): PsiElement? {
|
override fun getCustomDocumentationElement(editor: Editor, fil: PsiFile, contextElement: PsiElement?): PsiElement? {
|
||||||
return if (contextElement.isModifier()) contextElement else null
|
return if (contextElement.isModifier()) contextElement else null
|
||||||
@@ -155,7 +155,7 @@ open class KotlinQuickDocumentationProviderCompatBase : AbstractDocumentationPro
|
|||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private val LOG = Logger.getInstance(KotlinQuickDocumentationProvider::class.java)
|
private val LOG = Logger.getInstance(KotlinDocumentationProvider::class.java)
|
||||||
|
|
||||||
private val DESCRIPTOR_RENDERER = DescriptorRenderer.HTML.withOptions {
|
private val DESCRIPTOR_RENDERER = DescriptorRenderer.HTML.withOptions {
|
||||||
classifierNamePolicy = HtmlClassifierNamePolicy(ClassifierNamePolicy.SHORT)
|
classifierNamePolicy = HtmlClassifierNamePolicy(ClassifierNamePolicy.SHORT)
|
||||||
+1
-1
@@ -6,4 +6,4 @@
|
|||||||
package org.jetbrains.kotlin.idea
|
package org.jetbrains.kotlin.idea
|
||||||
|
|
||||||
// BUNCH 201
|
// BUNCH 201
|
||||||
class KotlinQuickDocumentationProvider : KotlinQuickDocumentationProviderCompatBase()
|
class KotlinDocumentationProvider : KotlinDocumentationProviderCompatBase()
|
||||||
+1
-1
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.psi.KtFile
|
|||||||
import java.util.function.Consumer
|
import java.util.function.Consumer
|
||||||
|
|
||||||
// BUNCH 201
|
// BUNCH 201
|
||||||
class KotlinQuickDocumentationProvider : KotlinQuickDocumentationProviderCompatBase() {
|
class KotlinDocumentationProvider : KotlinDocumentationProviderCompatBase() {
|
||||||
|
|
||||||
override fun collectDocComments(file: PsiFile, sink: Consumer<PsiDocCommentBase>) {
|
override fun collectDocComments(file: PsiFile, sink: Consumer<PsiDocCommentBase>) {
|
||||||
if (file !is KtFile) return
|
if (file !is KtFile) return
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
package org.jetbrains.kotlin.idea.codeInsight
|
package org.jetbrains.kotlin.idea.codeInsight
|
||||||
|
|
||||||
import com.intellij.testFramework.UsefulTestCase
|
import com.intellij.testFramework.UsefulTestCase
|
||||||
import org.jetbrains.kotlin.idea.KotlinQuickDocumentationProvider
|
import org.jetbrains.kotlin.idea.KotlinDocumentationProvider
|
||||||
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
|
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
|
||||||
import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
|
import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
|
||||||
import org.jetbrains.kotlin.test.InTextDirectivesUtils
|
import org.jetbrains.kotlin.test.InTextDirectivesUtils
|
||||||
@@ -20,7 +20,7 @@ abstract class AbstractRenderingKDocTest : KotlinLightCodeInsightFixtureTestCase
|
|||||||
myFixture.configureByFile(fileName())
|
myFixture.configureByFile(fileName())
|
||||||
val file = myFixture.file
|
val file = myFixture.file
|
||||||
|
|
||||||
val kDocProvider = KotlinQuickDocumentationProvider()
|
val kDocProvider = KotlinDocumentationProvider()
|
||||||
|
|
||||||
val comments = mutableListOf<String>()
|
val comments = mutableListOf<String>()
|
||||||
kDocProvider.collectDocComments(file) {
|
kDocProvider.collectDocComments(file) {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
package org.jetbrains.kotlin.idea.editor.quickDoc
|
package org.jetbrains.kotlin.idea.editor.quickDoc
|
||||||
|
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import org.jetbrains.kotlin.idea.KotlinQuickDocumentationProvider
|
import org.jetbrains.kotlin.idea.KotlinDocumentationProvider
|
||||||
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
|
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
|
||||||
import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
|
import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
|
||||||
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
|
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
|
||||||
@@ -38,7 +38,7 @@ class QuickDocInCompletionTest : KotlinLightCodeInsightFixtureTestCase() {
|
|||||||
myFixture.configureByFile(getTestName(true) + ".kt")
|
myFixture.configureByFile(getTestName(true) + ".kt")
|
||||||
val lookupElements = myFixture.completeBasic()
|
val lookupElements = myFixture.completeBasic()
|
||||||
val lookupObject = lookupElements.first().`object`
|
val lookupObject = lookupElements.first().`object`
|
||||||
return KotlinQuickDocumentationProvider().getDocumentationElementForLookupItem(
|
return KotlinDocumentationProvider().getDocumentationElementForLookupItem(
|
||||||
myFixture.psiManager, lookupObject, null
|
myFixture.psiManager, lookupObject, null
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import com.intellij.psi.PsiClass
|
|||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.testFramework.MapDataContext
|
import com.intellij.testFramework.MapDataContext
|
||||||
import junit.framework.TestCase
|
import junit.framework.TestCase
|
||||||
import org.jetbrains.kotlin.idea.KotlinQuickDocumentationProvider
|
import org.jetbrains.kotlin.idea.KotlinDocumentationProvider
|
||||||
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
|
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
|
||||||
import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
|
import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
|
||||||
import org.junit.runner.RunWith
|
import org.junit.runner.RunWith
|
||||||
@@ -43,7 +43,7 @@ class QuickDocInHierarchyTest() : CodeInsightTestCase() {
|
|||||||
HierarchyBrowserBaseEx.SCOPE_PROJECT
|
HierarchyBrowserBaseEx.SCOPE_PROJECT
|
||||||
)
|
)
|
||||||
val hierarchyNodeDescriptor = hierarchyTreeStructure.baseDescriptor as TypeHierarchyNodeDescriptor
|
val hierarchyNodeDescriptor = hierarchyTreeStructure.baseDescriptor as TypeHierarchyNodeDescriptor
|
||||||
val doc = KotlinQuickDocumentationProvider().generateDoc(hierarchyNodeDescriptor.psiClass as PsiElement, null)!!
|
val doc = KotlinDocumentationProvider().generateDoc(hierarchyNodeDescriptor.psiClass as PsiElement, null)!!
|
||||||
|
|
||||||
TestCase.assertTrue("Invalid doc\n: $doc", doc.contains("Very special class"))
|
TestCase.assertTrue("Invalid doc\n: $doc", doc.contains("Very special class"))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.editor.quickDoc
|
|||||||
import com.intellij.psi.PsiClass
|
import com.intellij.psi.PsiClass
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.testFramework.UsefulTestCase
|
import com.intellij.testFramework.UsefulTestCase
|
||||||
import org.jetbrains.kotlin.idea.KotlinQuickDocumentationProvider
|
import org.jetbrains.kotlin.idea.KotlinDocumentationProvider
|
||||||
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
|
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
|
||||||
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
|
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
|
||||||
import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources
|
import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources
|
||||||
@@ -46,7 +46,7 @@ class QuickDocNavigationTest() : KotlinLightCodeInsightFixtureTestCase() {
|
|||||||
UsefulTestCase.assertInstanceOf(target, KtFunction::class.java)
|
UsefulTestCase.assertInstanceOf(target, KtFunction::class.java)
|
||||||
Assert.assertEquals("reader", (target as KtFunction).name)
|
Assert.assertEquals("reader", (target as KtFunction).name)
|
||||||
|
|
||||||
val secondaryTarget = KotlinQuickDocumentationProvider().getDocumentationElementForLink(
|
val secondaryTarget = KotlinDocumentationProvider().getDocumentationElementForLink(
|
||||||
myFixture.psiManager, "InputStream", target
|
myFixture.psiManager, "InputStream", target
|
||||||
)
|
)
|
||||||
UsefulTestCase.assertInstanceOf(secondaryTarget, PsiClass::class.java)
|
UsefulTestCase.assertInstanceOf(secondaryTarget, PsiClass::class.java)
|
||||||
@@ -74,7 +74,7 @@ class QuickDocNavigationTest() : KotlinLightCodeInsightFixtureTestCase() {
|
|||||||
private fun resolveDocLink(linkText: String): PsiElement? {
|
private fun resolveDocLink(linkText: String): PsiElement? {
|
||||||
myFixture.configureByFile(getTestName(true) + ".kt")
|
myFixture.configureByFile(getTestName(true) + ".kt")
|
||||||
val source = myFixture.elementAtCaret.getParentOfType<KtDeclaration>(false)
|
val source = myFixture.elementAtCaret.getParentOfType<KtDeclaration>(false)
|
||||||
return KotlinQuickDocumentationProvider().getDocumentationElementForLink(
|
return KotlinDocumentationProvider().getDocumentationElementForLink(
|
||||||
myFixture.psiManager, linkText, source
|
myFixture.psiManager, linkText, source
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user