diff options
| author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2019-09-30 18:55:29 +0300 |
|---|---|---|
| committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2019-09-30 18:55:29 +0300 |
| commit | 3faee19a6b547837f49fbc6794965767cf8caf6d (patch) | |
| tree | 119dfab8d77b4b0eb6e40cab7669495a8a1e5471 /core/src | |
| parent | ab3a0654364534cf2c8cad86756450e908faa358 (diff) | |
| parent | 5b1bfb684dcca4b7ff05d3c3c431df62acf2d5c1 (diff) | |
| download | dokka-3faee19a6b547837f49fbc6794965767cf8caf6d.tar.gz dokka-3faee19a6b547837f49fbc6794965767cf8caf6d.tar.bz2 dokka-3faee19a6b547837f49fbc6794965767cf8caf6d.zip | |
Merge remote-tracking branch 'origin/master' into tmp--release--0.10.0
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/main/kotlin/Model/PackageDocs.kt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/kotlin/Model/PackageDocs.kt b/core/src/main/kotlin/Model/PackageDocs.kt index cf6cd808..b24efc5d 100644 --- a/core/src/main/kotlin/Model/PackageDocs.kt +++ b/core/src/main/kotlin/Model/PackageDocs.kt @@ -7,6 +7,7 @@ import com.intellij.psi.PsiClass import com.intellij.psi.PsiFileFactory import com.intellij.psi.util.PsiTreeUtil import com.intellij.util.LocalTimeCounter +import com.intellij.openapi.util.text.StringUtil import org.intellij.markdown.MarkdownElementTypes import org.intellij.markdown.MarkdownTokenTypes import org.intellij.markdown.parser.LinkMap @@ -30,7 +31,7 @@ class PackageDocs fun parse(fileName: String, linkResolveContext: List<PackageFragmentDescriptor>) { val file = File(fileName) if (file.exists()) { - val text = file.readText() + val text = StringUtil.convertLineSeparators(file.readText()) val tree = parseMarkdown(text) val linkMap = LinkMap.buildLinkMap(tree.node, text) var targetContent: MutableContent = moduleContent |