azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename of KotlinQuickDocumentationProvider to KotlinDocumentationProvider

Browse Source
This commit is contained in:
Igor Yakovlev
2020-04-01 02:36:28 +03:00
parent a71fd0e6d9
commit 75c4607e57
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/META-INF/plugin-common.xml
+2 -2
View File
@@ -590,8 +590,8 @@
<breadcrumbsInfoProvider implementation="org.jetbrains.kotlin.idea.codeInsight.KotlinBreadcrumbsInfoProvider"/>
<lang.documentationProvider language="JAVA" implementationClass="org.jetbrains.kotlin.idea.KotlinQuickDocumentationProvider" order="first"/>
<documentationProvider implementation="org.jetbrains.kotlin.idea.KotlinQuickDocumentationProvider"/>
<lang.documentationProvider language="JAVA" implementationClass="org.jetbrains.kotlin.idea.KotlinDocumentationProvider" order="first"/>
<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.KotlinRecursiveCallLineMarkerProvider"/>
idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt → idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProvider.kt
+2 -2
View File
@@ -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? {
return if (contextElement.isModifier()) contextElement else null
@@ -155,7 +155,7 @@ open class KotlinQuickDocumentationProviderCompatBase : AbstractDocumentationPro
}
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 {
classifierNamePolicy = HtmlClassifierNamePolicy(ClassifierNamePolicy.SHORT)
idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProviderCompat.kt → idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt
+1 -1
View File
@@ -6,4 +6,4 @@
package org.jetbrains.kotlin.idea
// BUNCH 201
class KotlinQuickDocumentationProvider : KotlinQuickDocumentationProviderCompatBase()
class KotlinDocumentationProvider : KotlinDocumentationProviderCompatBase()
idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProviderCompat.kt.201 → idea/src/org/jetbrains/kotlin/idea/KotlinDocumentationProviderCompat.kt.201
+1 -1
View File
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.psi.KtFile
import java.util.function.Consumer
// BUNCH 201
class KotlinQuickDocumentationProvider : KotlinQuickDocumentationProviderCompatBase() {
class KotlinDocumentationProvider : KotlinDocumentationProviderCompatBase() {
override fun collectDocComments(file: PsiFile, sink: Consumer<PsiDocCommentBase>) {
if (file !is KtFile) return
idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractRenderingKDocTest.kt.201
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.idea.codeInsight
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.KotlinWithJdkAndRuntimeLightProjectDescriptor
import org.jetbrains.kotlin.test.InTextDirectivesUtils
@@ -20,7 +20,7 @@ abstract class AbstractRenderingKDocTest : KotlinLightCodeInsightFixtureTestCase
myFixture.configureByFile(fileName())
val file = myFixture.file
val kDocProvider = KotlinQuickDocumentationProvider()
val kDocProvider = KotlinDocumentationProvider()
val comments = mutableListOf<String>()
kDocProvider.collectDocComments(file) {
idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocInCompletionTest.kt
+2 -2
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.idea.editor.quickDoc
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.KotlinWithJdkAndRuntimeLightProjectDescriptor
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
@@ -38,7 +38,7 @@ class QuickDocInCompletionTest : KotlinLightCodeInsightFixtureTestCase() {
myFixture.configureByFile(getTestName(true) + ".kt")
val lookupElements = myFixture.completeBasic()
val lookupObject = lookupElements.first().`object`
return KotlinQuickDocumentationProvider().getDocumentationElementForLookupItem(
return KotlinDocumentationProvider().getDocumentationElementForLookupItem(
myFixture.psiManager, lookupObject, null
)
}
idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocInHierarchyTest.kt
+2 -2
View File
@@ -18,7 +18,7 @@ import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement
import com.intellij.testFramework.MapDataContext
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.test.JUnit3WithIdeaConfigurationRunner
import org.junit.runner.RunWith
@@ -43,7 +43,7 @@ class QuickDocInHierarchyTest() : CodeInsightTestCase() {
HierarchyBrowserBaseEx.SCOPE_PROJECT
)
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"))
}
idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/QuickDocNavigationTest.kt
+3 -3
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.editor.quickDoc
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement
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.PluginTestCaseBase
import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources
@@ -46,7 +46,7 @@ class QuickDocNavigationTest() : KotlinLightCodeInsightFixtureTestCase() {
UsefulTestCase.assertInstanceOf(target, KtFunction::class.java)
Assert.assertEquals("reader", (target as KtFunction).name)
val secondaryTarget = KotlinQuickDocumentationProvider().getDocumentationElementForLink(
val secondaryTarget = KotlinDocumentationProvider().getDocumentationElementForLink(
myFixture.psiManager, "InputStream", target
)
UsefulTestCase.assertInstanceOf(secondaryTarget, PsiClass::class.java)
@@ -74,7 +74,7 @@ class QuickDocNavigationTest() : KotlinLightCodeInsightFixtureTestCase() {
private fun resolveDocLink(linkText: String): PsiElement? {
myFixture.configureByFile(getTestName(true) + ".kt")
val source = myFixture.elementAtCaret.getParentOfType<KtDeclaration>(false)
return KotlinQuickDocumentationProvider().getDocumentationElementForLink(
return KotlinDocumentationProvider().getDocumentationElementForLink(
myFixture.psiManager, linkText, source
)
}