diff options
author | Dmitry Jemerov <yole@jetbrains.com> | 2015-02-26 19:08:59 +0100 |
---|---|---|
committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-02-26 19:08:59 +0100 |
commit | 146764aca661d51daa298c7cfe6b9b5efcff7e5f (patch) | |
tree | 8379c830a61ffa9a879e29405c83847b552aa028 /test/data/format | |
parent | 1e74c644b1163948c389dd9082e0cba60ab5ed65 (diff) | |
download | dokka-146764aca661d51daa298c7cfe6b9b5efcff7e5f.tar.gz dokka-146764aca661d51daa298c7cfe6b9b5efcff7e5f.tar.bz2 dokka-146764aca661d51daa298c7cfe6b9b5efcff7e5f.zip |
stop generating separate pages for property accessors
Diffstat (limited to 'test/data/format')
-rw-r--r-- | test/data/format/accessor.get.md | 8 | ||||
-rw-r--r-- | test/data/format/accessor.kt | 4 | ||||
-rw-r--r-- | test/data/format/accessor.md | 18 | ||||
-rw-r--r-- | test/data/format/accessor.set.md | 8 | ||||
-rw-r--r-- | test/data/format/deprecated.class.html | 13 | ||||
-rw-r--r-- | test/data/format/deprecated.package.html | 2 | ||||
-rw-r--r-- | test/data/format/extensions.class.md | 2 |
7 files changed, 23 insertions, 32 deletions
diff --git a/test/data/format/accessor.get.md b/test/data/format/accessor.get.md deleted file mode 100644 index 67a2f395..00000000 --- a/test/data/format/accessor.get.md +++ /dev/null @@ -1,8 +0,0 @@ -[test](test/index) / [C](test/-c/index) / [x](test/-c/x/index) / [get](test/-c/x/get) - - -# get - -`get(): String` - - diff --git a/test/data/format/accessor.kt b/test/data/format/accessor.kt index b6ed9624..5a4d1742 100644 --- a/test/data/format/accessor.kt +++ b/test/data/format/accessor.kt @@ -1,5 +1,5 @@ class C() { var x: String - get() = "" - set(value) { } + /** The getter returns an empty string. */ get() = "" + /** The setter does nothing. */ set(value) { } } diff --git a/test/data/format/accessor.md b/test/data/format/accessor.md new file mode 100644 index 00000000..8279f452 --- /dev/null +++ b/test/data/format/accessor.md @@ -0,0 +1,18 @@ +[test](test/index) / [C](test/-c/index) / [x](test/-c/x) + + +# x + +`var x: String` +**Getter** + +The getter returns an empty string. + + +**Setter** + +The setter does nothing. + + + + diff --git a/test/data/format/accessor.set.md b/test/data/format/accessor.set.md deleted file mode 100644 index e93766cd..00000000 --- a/test/data/format/accessor.set.md +++ /dev/null @@ -1,8 +0,0 @@ -[test](test/index) / [C](test/-c/index) / [x](test/-c/x/index) / [set](test/-c/x/set) - - -# set - -`set(value: String)` - - diff --git a/test/data/format/deprecated.class.html b/test/data/format/deprecated.class.html index 352bd435..922306fc 100644 --- a/test/data/format/deprecated.class.html +++ b/test/data/format/deprecated.class.html @@ -16,7 +16,7 @@ <strong>Deprecated:</strong> This function sucks<br/> <br/> <br/> -<a href="test/index">test</a> / <a href="test/p/index">p</a><br/> +<a href="test/index">test</a> / <a href="test/p">p</a><br/> <br/> <h1>p</h1> <code><span class="keyword">val </span><s><span class="identifier">p</span></s><span class="symbol">: </span><span class="identifier">Int</span></code><br/> @@ -34,16 +34,5 @@ </tr> </tbody> </table> -<h3>Accessors</h3> -<table> -<tbody> -<tr> -<td> -<a href="test/p/get">get</a></td> -<td> -<code><span class="identifier">get</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></td> -</tr> -</tbody> -</table> </BODY> </HTML> diff --git a/test/data/format/deprecated.package.html b/test/data/format/deprecated.package.html index 8e3c2aa9..1700eb15 100644 --- a/test/data/format/deprecated.package.html +++ b/test/data/format/deprecated.package.html @@ -25,7 +25,7 @@ <tbody> <tr> <td> -<a href="test/p/index">p</a></td> +<a href="test/p">p</a></td> <td> <code><span class="keyword">val </span><s><span class="identifier">p</span></s><span class="symbol">: </span><span class="identifier">Int</span></code></td> </tr> diff --git a/test/data/format/extensions.class.md b/test/data/format/extensions.class.md index 11ee9ba7..33721e67 100644 --- a/test/data/format/extensions.class.md +++ b/test/data/format/extensions.class.md @@ -9,7 +9,7 @@ Function with receiver | -| [foobar](test/foo/-string/foobar/index) | `val String.foobar: Int` +| [foobar](test/foo/-string/foobar) | `val String.foobar: Int` Property with receiver. | |