Skip to content

Commit 9a472c0

Browse files
committed
🐎 don't call inline inspections unnecessary
1 parent a43ddb9 commit 9a472c0

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

src/inspect/inspectors/inspectIterable.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import {
66
ConsoleInspectOptions,
77
} from "../consoleInspect";
88
import { type ConsoleObject, consoleObject } from "../../core/consoleObject";
9-
import spansLength from "../../utils/spansLength";
109
import indent from "../../utils/indent";
1110
import isPrimitive from "../../utils/isPrimitive";
1211
import ConsoleInspection from "../utils/ConsoleInspection";
1312
import inspectInline from "./inspectInline";
1413
import { inspectObject } from "./inspectObject";
14+
import spansLength from "../../utils/spansLength";
1515

1616
export function inspectIterable(
1717
iterable: Iterable<unknown>,
@@ -34,16 +34,22 @@ export function inspectIterable(
3434
}
3535

3636
// wrap is "auto", try to fit on one line
37-
const inspection = inspectIterableSingleLine(iterable, options, context);
37+
3838
const array = iterableArray(iterable);
3939
if (
40-
spansLength(inspection.spans) <= context.wrap &&
4140
array.every(isPrimitive) &&
4241
iterableExtraKeys(iterable).every((key) =>
4342
isPrimitive(array[key as keyof typeof array]),
4443
)
4544
) {
46-
return inspection;
45+
const inspection = inspectIterableSingleLine(
46+
iterable,
47+
options,
48+
context,
49+
);
50+
if (spansLength(inspection.spans) <= context.wrap) {
51+
return inspection;
52+
}
4753
}
4854

4955
return inspectIterableMultiLine(iterable, options, context);

src/inspect/inspectors/inspectObject.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,11 @@ export function inspectObject(
3434
}
3535

3636
// wrap is "auto", try to fit on one line
37-
const inspection = inspectObjectSingleLine(object, options, context);
38-
if (
39-
hasOnlyPrimitives(object) &&
40-
spansLength(inspection.spans) <= context.wrap
41-
) {
42-
return inspection;
37+
if (hasOnlyPrimitives(object)) {
38+
const inspection = inspectObjectSingleLine(object, options, context);
39+
if (spansLength(inspection.spans) <= context.wrap) {
40+
return inspection;
41+
}
4342
}
4443

4544
return inspectObjectMultiLine(object, options, context);

0 commit comments

Comments
 (0)