🐎 don't call inline inspections unnecessary

astoilkov · Jul 15, 2024 · 9a472c0 · 9a472c0
1 parent a43ddb9
commit 9a472c0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/inspect/inspectors/inspectIterable.ts b/src/inspect/inspectors/inspectIterable.ts
@@ -6,12 +6,12 @@ import {
     ConsoleInspectOptions,
 } from "../consoleInspect";
 import { type ConsoleObject, consoleObject } from "../../core/consoleObject";
-import spansLength from "../../utils/spansLength";
 import indent from "../../utils/indent";
 import isPrimitive from "../../utils/isPrimitive";
 import ConsoleInspection from "../utils/ConsoleInspection";
 import inspectInline from "./inspectInline";
 import { inspectObject } from "./inspectObject";
+import spansLength from "../../utils/spansLength";
 
 export function inspectIterable(
     iterable: Iterable<unknown>,
@@ -34,16 +34,22 @@ export function inspectIterable(
     }
 
     // wrap is "auto", try to fit on one line
-    const inspection = inspectIterableSingleLine(iterable, options, context);
+
     const array = iterableArray(iterable);
     if (
-        spansLength(inspection.spans) <= context.wrap &&
         array.every(isPrimitive) &&
         iterableExtraKeys(iterable).every((key) =>
             isPrimitive(array[key as keyof typeof array]),
         )
     ) {
-        return inspection;
+        const inspection = inspectIterableSingleLine(
+            iterable,
+            options,
+            context,
+        );
+        if (spansLength(inspection.spans) <= context.wrap) {
+            return inspection;
+        }
     }
 
     return inspectIterableMultiLine(iterable, options, context);

diff --git a/src/inspect/inspectors/inspectObject.ts b/src/inspect/inspectors/inspectObject.ts
@@ -34,12 +34,11 @@ export function inspectObject(
     }
 
     // wrap is "auto", try to fit on one line
-    const inspection = inspectObjectSingleLine(object, options, context);
-    if (
-        hasOnlyPrimitives(object) &&
-        spansLength(inspection.spans) <= context.wrap
-    ) {
-        return inspection;
+    if (hasOnlyPrimitives(object)) {
+        const inspection = inspectObjectSingleLine(object, options, context);
+        if (spansLength(inspection.spans) <= context.wrap) {
+            return inspection;
+        }
     }
 
     return inspectObjectMultiLine(object, options, context);