diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-14 20:30:54 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-14 20:30:54 +0100 |
| commit | 807451f9ad9664e7b26cc50c4f08a2a9bf3be538 (patch) | |
| tree | 08f6e458ae15aa5796a53d4629b2ff5c16f783c9 /test/data | |
| parent | 77c1f53cab3c2b143a3dafaf6c7bef49df5bcdb9 (diff) | |
| parent | f36d9b0e4f336de7e35dcfa33934ab287b76d964 (diff) | |
| download | dokka-807451f9ad9664e7b26cc50c4f08a2a9bf3be538.tar.gz dokka-807451f9ad9664e7b26cc50c4f08a2a9bf3be538.tar.bz2 dokka-807451f9ad9664e7b26cc50c4f08a2a9bf3be538.zip | |
Merge branch 'defaut-param-values'
Conflicts:
src/Kotlin/DocumentationBuilder.kt
test/src/format/MarkdownFormatTest.kt
Diffstat (limited to 'test/data')
| -rw-r--r-- | test/data/format/functionWithDefaultParameter.kt | 1 | ||||
| -rw-r--r-- | test/data/format/functionWithDefaultParameter.md | 12 | ||||
| -rw-r--r-- | test/data/functions/functionWithDefaultParameter.kt | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/test/data/format/functionWithDefaultParameter.kt b/test/data/format/functionWithDefaultParameter.kt new file mode 100644 index 00000000..3a3a102f --- /dev/null +++ b/test/data/format/functionWithDefaultParameter.kt @@ -0,0 +1 @@ +fun f(x: String = "") {} diff --git a/test/data/format/functionWithDefaultParameter.md b/test/data/format/functionWithDefaultParameter.md new file mode 100644 index 00000000..1acab0ef --- /dev/null +++ b/test/data/format/functionWithDefaultParameter.md @@ -0,0 +1,12 @@ +[test](out.md) / [](out.md) / [f](out.md) + + +# f + + +``` +fun f(x: String = ""): Unit +``` + + + diff --git a/test/data/functions/functionWithDefaultParameter.kt b/test/data/functions/functionWithDefaultParameter.kt new file mode 100644 index 00000000..3a3a102f --- /dev/null +++ b/test/data/functions/functionWithDefaultParameter.kt @@ -0,0 +1 @@ +fun f(x: String = "") {} |