Skip to content

Commit 35ccb69

Browse files
committed
Fix missing whitespace when rendering types
Resolves #2882
1 parent 06fe541 commit 35ccb69

File tree

3 files changed

+32
-18
lines changed

3 files changed

+32
-18
lines changed

src/lib/output/themes/default/partials/typeDetails.tsx

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,7 @@ function renderChild(
220220
<h5 id={anchorTargetIfPresent(context, child)}>
221221
{!!child.flags.isRest && <span class="tsd-signature-symbol">...</span>}
222222
<span class={getKindClass(child)}>{child.name}</span>
223-
<span class="tsd-signature-symbol">{!!child.flags.isOptional && "?"}:</span>
224-
function
223+
<span class="tsd-signature-symbol">{!!child.flags.isOptional && "?"}:</span> function
225224
</h5>
226225

227226
{context.memberSignatures(child)}
@@ -272,10 +271,9 @@ function renderChild(
272271
<li class="tsd-parameter">
273272
<h5 id={anchorTargetIfPresent(context, child)}>
274273
{context.reflectionFlags(child.getSignature)}
275-
<span class="tsd-signature-keyword">get</span>
274+
<span class="tsd-signature-keyword">get</span>{" "}
276275
<span class={getKindClass(child)}>{child.name}</span>
277-
<span class="tsd-signature-symbol">():</span>
278-
{context.type(child.getSignature.type)}
276+
<span class="tsd-signature-symbol">():</span> {context.type(child.getSignature.type)}
279277
</h5>
280278

281279
{highlightOrComment(child.getSignature)}
@@ -285,18 +283,16 @@ function renderChild(
285283
<li class="tsd-parameter">
286284
<h5 id={!child.getSignature ? anchorTargetIfPresent(context, child) : undefined}>
287285
{context.reflectionFlags(child.setSignature)}
288-
<span class="tsd-signature-keyword">set</span>
286+
<span class="tsd-signature-keyword">set</span>{" "}
289287
<span class={getKindClass(child)}>{child.name}</span>
290288
<span class="tsd-signature-symbol">(</span>
291289
{child.setSignature.parameters?.map((item) => (
292290
<>
293291
{item.name}
294-
<span class="tsd-signature-symbol">:</span>
295-
{context.type(item.type)}
292+
<span class="tsd-signature-symbol">:</span> {context.type(item.type)}
296293
</>
297294
))}
298-
<span class="tsd-signature-symbol">):</span>
299-
{context.type(child.setSignature.type)}
295+
<span class="tsd-signature-symbol">):</span> {context.type(child.setSignature.type)}
300296
</h5>
301297

302298
{highlightOrComment(child.setSignature)}
@@ -310,7 +306,12 @@ function renderIndexSignature(context: DefaultThemeRenderContext, index: Signatu
310306
return (
311307
<li class="tsd-parameter-index-signature">
312308
<h5>
313-
{index.flags.isReadonly && <span class="tsd-signature-keyword">readonly</span>}
309+
{index.flags.isReadonly && (
310+
<>
311+
<span class="tsd-signature-keyword">readonly</span>
312+
{" "}
313+
</>
314+
)}
314315
<span class="tsd-signature-symbol">[</span>
315316
{index.parameters!.map((item) => (
316317
<>

src/lib/output/themes/default/templates/reflection.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ function renderIndexSignature(context: DefaultThemeRenderContext, index: Signatu
8181
return (
8282
<li class={classNames({ "tsd-index-signature": true }, context.getReflectionClasses(index))}>
8383
<div class="tsd-signature">
84-
{index.flags.isReadonly && <span class="tsd-signature-keyword">readonly</span>}
84+
{index.flags.isReadonly && (
85+
<>
86+
<span class="tsd-signature-keyword">readonly</span>
87+
{" "}
88+
</>
89+
)}
8590
<span class="tsd-signature-symbol">[</span>
8691
{index.parameters!.map((item) => (
8792
<>

src/lib/output/themes/lib.tsx

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,12 @@ export function renderTypeParametersSignature(
109109
<span class="tsd-signature-symbol">{"<"}</span>
110110
{join(<span class="tsd-signature-symbol">{", "}</span>, typeParameters, (item) => (
111111
<>
112-
{item.flags.isConst && <span class="tsd-signature-keyword">const</span>}
113-
{item.varianceModifier ? `${item.varianceModifier} ` : ""}
112+
{(item.flags.isConst || item.varianceModifier) && (
113+
<span class="tsd-signature-keyword">
114+
{item.flags.isConst && "const "}
115+
{item.varianceModifier && `${item.varianceModifier} `}
116+
</span>
117+
)}
114118
<a class="tsd-signature-type tsd-kind-type-parameter" href={context.urlTo(item)}>
115119
{item.name}
116120
</a>
@@ -126,13 +130,17 @@ export function renderTypeParametersSignature(
126130
<span class="tsd-signature-symbol">{"<"}</span>
127131
{join(<span class="tsd-signature-symbol">{", "}</span>, typeParameters, (item) => (
128132
<>
129-
{item.flags.isConst && "const "}
130-
{item.varianceModifier ? `${item.varianceModifier} ` : ""}
133+
{(item.flags.isConst || item.varianceModifier) && (
134+
<span class="tsd-signature-keyword">
135+
{item.flags.isConst && "const "}
136+
{item.varianceModifier && `${item.varianceModifier} `}
137+
</span>
138+
)}
131139
<span class="tsd-signature-type tsd-kind-type-parameter">{item.name}</span>
132140
{!!item.type && (
133141
<>
134-
<span class="tsd-signature-keyword">extends</span>
135-
{context.type(item.type)}
142+
{" "}
143+
<span class="tsd-signature-keyword">extends</span> {context.type(item.type)}
136144
</>
137145
)}
138146
</>

0 commit comments

Comments
 (0)