diff options
author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-03-20 15:37:46 +0300 |
---|---|---|
committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-03-20 15:37:46 +0300 |
commit | 8eff2cf33d1ba671191d6e2873f005e6b5f7057e (patch) | |
tree | 8cfd83e1eb6aa08500e600233a5ca509bd1f4bd7 /core/testdata | |
parent | 39bfaa5f89dc07bce5456578f4e17905f2e4c095 (diff) | |
parent | 372e9c796cc77aaff788df56a13deeef64b6edd7 (diff) | |
download | dokka-8eff2cf33d1ba671191d6e2873f005e6b5f7057e.tar.gz dokka-8eff2cf33d1ba671191d6e2873f005e6b5f7057e.tar.bz2 dokka-8eff2cf33d1ba671191d6e2873f005e6b5f7057e.zip |
Merge branch '0.9.14/KT-15497'
# Conflicts:
# core/src/test/kotlin/format/MarkdownFormatTest.kt
Diffstat (limited to 'core/testdata')
-rw-r--r-- | core/testdata/format/sampleByFQName.kt | 12 | ||||
-rw-r--r-- | core/testdata/format/sampleByFQName.md | 14 | ||||
-rw-r--r-- | core/testdata/format/sampleByShortName.kt | 12 | ||||
-rw-r--r-- | core/testdata/format/sampleByShortName.md | 14 |
4 files changed, 52 insertions, 0 deletions
diff --git a/core/testdata/format/sampleByFQName.kt b/core/testdata/format/sampleByFQName.kt new file mode 100644 index 00000000..2c0af092 --- /dev/null +++ b/core/testdata/format/sampleByFQName.kt @@ -0,0 +1,12 @@ +package test + +fun sample() { + println("sample") +} + +/** + * @sample test.sample + */ +fun use() { + +}
\ No newline at end of file diff --git a/core/testdata/format/sampleByFQName.md b/core/testdata/format/sampleByFQName.md new file mode 100644 index 00000000..06333e13 --- /dev/null +++ b/core/testdata/format/sampleByFQName.md @@ -0,0 +1,14 @@ +[test](test/index) / [test](test/test/index) / [sample](test/test/sample) + +# sample + +`fun sample(): Unit`[test](test/index) / [test](test/test/index) / [use](test/test/use) + +# use + +`fun use(): Unit` + +``` kotlin +println("sample") +``` + diff --git a/core/testdata/format/sampleByShortName.kt b/core/testdata/format/sampleByShortName.kt new file mode 100644 index 00000000..2e03310f --- /dev/null +++ b/core/testdata/format/sampleByShortName.kt @@ -0,0 +1,12 @@ +package test + +fun sample() { + println("sample") +} + +/** + * @sample sample + */ +fun use() { + +}
\ No newline at end of file diff --git a/core/testdata/format/sampleByShortName.md b/core/testdata/format/sampleByShortName.md new file mode 100644 index 00000000..06333e13 --- /dev/null +++ b/core/testdata/format/sampleByShortName.md @@ -0,0 +1,14 @@ +[test](test/index) / [test](test/test/index) / [sample](test/test/sample) + +# sample + +`fun sample(): Unit`[test](test/index) / [test](test/test/index) / [use](test/test/use) + +# use + +`fun use(): Unit` + +``` kotlin +println("sample") +``` + |