Skip to content

Commit 28aec84

Browse files
tgreyuktgreyuk
authored
Merge pull request #28 from wachri/master
Fix #27 Broken parameter tabel when function has a parameter with dif…
2 parents 85da47d + a907f1c commit 28aec84

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+308
-240
lines changed

‎src/theme/partials/member.parameters.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{{getParametersTableHeaders parameters}}
55
{{#each parameters}}
6-
| {{#each flags}}`{{this}}` {{/each}}{{ name }} | {{#with type}}{{>type}}{{/with}}{{#if defaultValue}} | {{defaultValue}} | {{else}} | {{/if}}{{#if comment}} {{#getMarkdownFromHtml}}{{#markdown}}{{ getStrippedComment comment }}{{/markdown}}{{/getMarkdownFromHtml}} |{{/if}}
6+
| {{#compact}}{{#each flags}}`{{this}}` {{/each}}{{ name }} | {{#with type}}{{>type}}{{/with}}{{#if defaultValue}} | {{defaultValue}} | {{else}} | {{/if}}{{#if comment}} {{#getMarkdownFromHtml}}{{#markdown}}{{ getStrippedComment comment }}{{/markdown}}{{/getMarkdownFromHtml}} |{{/if}}{{/compact}}
77
{{/each}}
88
{{getNewLine}}{{getNewLine}}
99
{{/if}}

‎src/theme/partials/type.hbs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
{{/with}}
1818
{{else}}
1919
{{#if types}}
20-
{{#each types}}
21-
{{#if @index}} {{#ifCond ../type '==' 'intersection'}}&{{else}}|{{/ifCond}}
22-
{{/if}}{{> type}}{{/each}}
20+
{{#each types}}{{#if @index}} {{#ifCond ../type '==' 'intersection'}}&{{else}}|{{/ifCond}}{{/if}} {{> type}}{{/each}}
2321
{{else}}
2422
{{#if elements}}
2523
{{#compact}}

‎test/fixtures/bitbucket/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -308,11 +308,11 @@ This is a function with a parameter that has a default value.
308308

309309
| Param | Type | Default value |
310310
| ------ | ------ | ------ |
311-
| `Default value` valueA | `string` | "defaultValue" |
312-
| `Default value` valueB | `number` | 100 |
313-
| `Default value` valueC | `number` | Number.NaN |
314-
| `Default value` valueD | `boolean` | true |
315-
| `Default value` valueE | `boolean` | false |
311+
| `Default value` valueA | `string` | "defaultValue" |
312+
| `Default value` valueB | `number` | 100 |
313+
| `Default value` valueC | `number` | Number.NaN |
314+
| `Default value` valueD | `boolean` | true |
315+
| `Default value` valueE | `boolean` | false |
316316

317317
**Returns:** `string`
318318
The input value or the default value.

‎test/fixtures/bitbucket/classes/baseclass.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ This is a simple example on how to use BaseClass.
5959

6060
| Param | Type |
6161
| ------ | ------ |
62-
| name | `string` |
62+
| name | `string` |
6363

6464
**Returns:** [BaseClass](baseclass.md)
6565

@@ -69,7 +69,7 @@ This is a simple example on how to use BaseClass.
6969

7070
| Param | Type |
7171
| ------ | ------ |
72-
| source | [BaseClass](baseclass.md) |
72+
| source | [BaseClass](baseclass.md) |
7373

7474
**Returns:** [BaseClass](baseclass.md)
7575

@@ -199,10 +199,10 @@ ___
199199

200200
| Param | Type |
201201
| ------ | ------ |
202-
| originalValues | [BaseClass](baseclass.md) |
203-
| newRecord | `any` |
204-
| fieldNames | `string`[] |
205-
| mandatoryFields | `string`[] |
202+
| originalValues | [BaseClass](baseclass.md) |
203+
| newRecord | `any` |
204+
| fieldNames | `string`[] |
205+
| mandatoryFields | `string`[] |
206206

207207
**Returns:** `string`
208208

‎test/fixtures/bitbucket/classes/color.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444

4545
| Param | Type |
4646
| ------ | ------ |
47-
| r | `number` |
48-
| g | `number` |
49-
| b | `number` |
47+
| r | `number` |
48+
| g | `number` |
49+
| b | `number` |
5050

5151
**Returns:** [Color](color.md)
5252

@@ -130,8 +130,8 @@ ___
130130

131131
| Param | Type |
132132
| ------ | ------ |
133-
| v1 | [Color](color.md) |
134-
| v2 | [Color](color.md) |
133+
| v1 | [Color](color.md) |
134+
| v2 | [Color](color.md) |
135135

136136
**Returns:** [Color](color.md)
137137

@@ -147,8 +147,8 @@ ___
147147

148148
| Param | Type |
149149
| ------ | ------ |
150-
| k | `number` |
151-
| v | [Color](color.md) |
150+
| k | `number` |
151+
| v | [Color](color.md) |
152152

153153
**Returns:** [Color](color.md)
154154

@@ -164,8 +164,8 @@ ___
164164

165165
| Param | Type |
166166
| ------ | ------ |
167-
| v1 | [Color](color.md) |
168-
| v2 | [Color](color.md) |
167+
| v1 | [Color](color.md) |
168+
| v2 | [Color](color.md) |
169169

170170
**Returns:** [Color](color.md)
171171

@@ -181,7 +181,7 @@ ___
181181

182182
| Param | Type |
183183
| ------ | ------ |
184-
| c | [Color](color.md) |
184+
| c | [Color](color.md) |
185185

186186
**Returns:** `object`
187187

‎test/fixtures/bitbucket/classes/genericclass.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ This a type parameter.
4141

4242
⊕ **new GenericClass**(p1: *`any`*, p2: *`T`*, p3: *`number`*, p4: *`number`*, p5: *`string`*): [GenericClass](genericclass.md)
4343

44-
*Defined in [classes.ts:284](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-284)*
44+
*Defined in [classes.ts:293](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-293)*
4545

4646
Constructor short text.
4747

@@ -65,7 +65,7 @@ ___
6565

6666
**● p2**: *`T`*
6767

68-
*Defined in [classes.ts:295](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-295)*
68+
*Defined in [classes.ts:304](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-304)*
6969

7070
Private string property
7171

@@ -75,7 +75,7 @@ ___
7575

7676
**● p3**: *`number`*
7777

78-
*Defined in [classes.ts:295](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-295)*
78+
*Defined in [classes.ts:304](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-304)*
7979

8080
Public number property
8181

@@ -85,7 +85,7 @@ ___
8585

8686
**● p5**: *`string`*
8787

88-
*Defined in [classes.ts:295](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-295)*
88+
*Defined in [classes.ts:304](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-304)*
8989

9090
Readonly property
9191

@@ -95,7 +95,7 @@ ___
9595

9696
**● value**: *`T`*
9797

98-
*Defined in [classes.ts:284](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-284)*
98+
*Defined in [classes.ts:293](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-293)*
9999

100100
___
101101

@@ -105,7 +105,7 @@ ___
105105

106106
▸ **getValue**(): `T`
107107

108-
*Defined in [classes.ts:305](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-305)*
108+
*Defined in [classes.ts:314](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-314)*
109109

110110
**Returns:** `T`
111111

@@ -115,7 +115,7 @@ ___
115115

116116
▸ **setValue**(value: *`T`*): `void`
117117

118-
*Defined in [classes.ts:301](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-301)*
118+
*Defined in [classes.ts:310](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer=file-view-default#classes.ts-310)*
119119

120120
**Parameters:**
121121

‎test/fixtures/bitbucket/classes/internalclass.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This is an internal class, it is not exported.
3030

3131
| Param | Type |
3232
| ------ | ------ |
33-
| options | `object` |
33+
| options | `object` |
3434

3535
**Returns:** [InternalClass](internalclass.md)
3636

‎test/fixtures/bitbucket/classes/mythirdclass.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
| Param | Type |
3232
| ------ | ------ |
33-
| arg | [MyFourthClass](myfourthclass.md)<[MyFirstClass](myfirstclass.md), [MySecondClass](mysecondclass.md)<[MyFirstClass](myfirstclass.md)>> |
33+
| arg | [MyFourthClass](myfourthclass.md)<[MyFirstClass](myfirstclass.md), [MySecondClass](mysecondclass.md)<[MyFirstClass](myfirstclass.md)>> |
3434

3535
**Returns:** [MyThirdClass](mythirdclass.md)
3636

‎test/fixtures/bitbucket/classes/nongenericclass.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ This a non generic class derived from a [generic class](genericclass.md).
3838

3939
*Inherited from [GenericClass](genericclass.md).[constructor](genericclass.md#markdown-header-constructor)*
4040

41-
*Defined in [classes.ts:284](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-284)*
41+
*Defined in [classes.ts:293](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-293)*
4242

4343
Constructor short text.
4444

@@ -64,7 +64,7 @@ ___
6464

6565
*Inherited from [GenericClass](genericclass.md).[p2](genericclass.md#markdown-header-protected-p2)*
6666

67-
*Defined in [classes.ts:295](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-295)*
67+
*Defined in [classes.ts:304](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-304)*
6868

6969
Private string property
7070

@@ -76,7 +76,7 @@ ___
7676

7777
*Inherited from [GenericClass](genericclass.md).[p3](genericclass.md#markdown-header-p3)*
7878

79-
*Defined in [classes.ts:295](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-295)*
79+
*Defined in [classes.ts:304](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-304)*
8080

8181
Public number property
8282

@@ -88,7 +88,7 @@ ___
8888

8989
*Inherited from [GenericClass](genericclass.md).[p5](genericclass.md#markdown-header-p5)*
9090

91-
*Defined in [classes.ts:295](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-295)*
91+
*Defined in [classes.ts:304](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-304)*
9292

9393
Readonly property
9494

@@ -100,7 +100,7 @@ ___
100100

101101
*Inherited from [GenericClass](genericclass.md).[value](genericclass.md#markdown-header-value)*
102102

103-
*Defined in [classes.ts:284](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-284)*
103+
*Defined in [classes.ts:293](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-293)*
104104

105105
___
106106

@@ -112,7 +112,7 @@ ___
112112

113113
*Inherited from [GenericClass](genericclass.md).[getValue](genericclass.md#markdown-header-getvalue)*
114114

115-
*Defined in [classes.ts:305](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-305)*
115+
*Defined in [classes.ts:314](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-314)*
116116

117117
**Returns:** [SubClassB](subclassb.md)
118118

@@ -124,7 +124,7 @@ ___
124124

125125
*Inherited from [GenericClass](genericclass.md).[setValue](genericclass.md#markdown-header-setvalue)*
126126

127-
*Defined in [classes.ts:301](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-301)*
127+
*Defined in [classes.ts:310](https://bitbucket.org/owner/repository_name/src/master/src/classes.ts?fileviewer&amp;#x3D;file-view-default#classes.ts-310)*
128128

129129
**Parameters:**
130130

‎test/fixtures/bitbucket/classes/subclassa.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ This class has no own constructor, so its constructor should be inherited from B
6666

6767
| Param | Type |
6868
| ------ | ------ |
69-
| name | `string` |
69+
| name | `string` |
7070

7171
**Returns:** [SubClassA](subclassa.md)
7272

@@ -78,7 +78,7 @@ This class has no own constructor, so its constructor should be inherited from B
7878

7979
| Param | Type |
8080
| ------ | ------ |
81-
| source | [BaseClass](baseclass.md) |
81+
| source | [BaseClass](baseclass.md) |
8282

8383
**Returns:** [SubClassA](subclassa.md)
8484

@@ -262,7 +262,7 @@ This is a simple interface function.
262262

263263
| Param | Type |
264264
| ------ | ------ |
265-
| value | `string` |
265+
| value | `string` |
266266

267267
**Returns:** `void`
268268

@@ -318,10 +318,10 @@ ___
318318

319319
| Param | Type |
320320
| ------ | ------ |
321-
| originalValues | [BaseClass](baseclass.md) |
322-
| newRecord | `any` |
323-
| fieldNames | `string`[] |
324-
| mandatoryFields | `string`[] |
321+
| originalValues | [BaseClass](baseclass.md) |
322+
| newRecord | `any` |
323+
| fieldNames | `string`[] |
324+
| mandatoryFields | `string`[] |
325325

326326
**Returns:** `string`
327327

0 commit comments

Comments
 (0)