Skip to content

Commit 0c4b076

Browse files
committed
Make return types and args more distinguishable
1 parent fe4f239 commit 0c4b076

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

app/components/class-field-description.hbs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{{! template-lint-disable no-invalid-interactive }}
22
<section class='class-field-description {{@type}}'>
33
<h3 id='{{@field.name}}' class="class-field-description--header">
4-
<span class='{{@type}}-name'>{{@field.name}}</span>
5-
{{#if @field.params}}
6-
<span class='args'>
7-
({{join ', ' (map-by 'name' @field.params)}})
4+
<span class="signature">
5+
<span class='{{@type}}-name'>
6+
{{@field.name}}
87
</span>
9-
{{/if}}
10-
{{#if @field.return}}
11-
<span class='return-type'>{{@field.return.type}}</span>
12-
{{/if}}
8+
{{#if @field.params}}(<span class='args'>{{join ', ' (map-by 'name' @field.params)}}</span>){{/if}}
9+
{{#if @field.return}}
10+
: <span class='return-type'>{{@field.return.type}}</span>
11+
{{/if}}
12+
</span>
1313
{{#if @field.access}}
1414
<span class='access'>{{@field.access}}</span>
1515
{{/if}}

app/styles/app.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ dd {
145145
margin: 0;
146146
}
147147

148+
.class-field-description .args {
149+
font-weight: var(--font-weight-2);
150+
}
151+
148152
.parameter-type,
149153
.class-field-description .return-type,
150154
.return .return-type {

tests/acceptance/function-test.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@ module('Acceptance | Function', function (hooks) {
2121
await visit('ember/3.28/functions/@ember%2Fapplication/getOwner');
2222

2323
assert.dom('.method').exists({ count: 1 }, 'Single function per page');
24-
assert.equal(
25-
find('.method .method-name').innerText,
26-
'getOwner',
27-
'Correct function is shown'
28-
);
24+
assert
25+
.dom('.method .method-name')
26+
.hasText('getOwner', 'Correct function is shown');
2927
});
3028
});

tests/integration/components/class-field-description-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module('Integration | Component | class field description', function (hooks) {
2828
assert.dom('.method-name').hasText('concat');
2929
assert.dom(findAll('.access')[0]).hasText('public');
3030
assert.dom(findAll('.access')[1]).hasText('deprecated');
31-
assert.dom(findAll('.args')[0]).hasText('(param1, param2, param3)');
31+
assert.dom(findAll('.args')[0]).hasText('param1, param2, param3');
3232
});
3333

3434
test('parameter props are displayed', async function (assert) {

0 commit comments

Comments
 (0)