From 891cdbbe19580ee2379e3b7cfe269109bf897d84 Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Fri, 24 Jul 2015 15:35:22 +0300 Subject: Put source position information to node's details section --- src/Model/DocumentationNode.kt | 1 + src/Model/SourceLinks.kt | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) (limited to 'src/Model') diff --git a/src/Model/DocumentationNode.kt b/src/Model/DocumentationNode.kt index 7f862183..2f0638bc 100644 --- a/src/Model/DocumentationNode.kt +++ b/src/Model/DocumentationNode.kt @@ -101,6 +101,7 @@ public open class DocumentationNode(val name: String, Value, SourceUrl, + SourcePosition, /** * A note which is rendered once on a page documenting a group of overloaded functions. diff --git a/src/Model/SourceLinks.kt b/src/Model/SourceLinks.kt index fc3293f2..dff4b36b 100644 --- a/src/Model/SourceLinks.kt +++ b/src/Model/SourceLinks.kt @@ -4,16 +4,15 @@ import com.intellij.psi.PsiElement import java.io.File import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiNameIdentifierOwner +import org.jetbrains.kotlin.psi.psiUtil.startOffset class SourceLinkDefinition(val path: String, val url: String, val lineSuffix: String?) fun DocumentationNode.appendSourceLink(psi: PsiElement?, sourceLinks: List) { - val path = psi?.getContainingFile()?.getVirtualFile()?.getPath() - if (path == null) { - return - } - val target = if (psi is PsiNameIdentifierOwner) psi.getNameIdentifier() else psi - val absPath = File(path).getAbsolutePath() + val path = psi?.containingFile?.virtualFile?.path ?: return + + val target = if (psi is PsiNameIdentifierOwner) psi.nameIdentifier else psi + val absPath = File(path).absolutePath val linkDef = sourceLinks.firstOrNull { absPath.startsWith(it.path) } if (linkDef != null) { var url = linkDef.url + path.substring(linkDef.path.length()) @@ -26,10 +25,19 @@ fun DocumentationNode.appendSourceLink(psi: PsiElement?, sourceLinks: List