Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Correct await-ed inline snapshot indentation #12986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 5, 2022
Merged

Correct await-ed inline snapshot indentation #12986

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a57b39
add failing test for awaited snapshot indentation
robinpokorny Jul 4, 2022
b454eaa
indent awaited snapshots with spaces
robinpokorny Jul 4, 2022
fa8c1bf
update Changelog
robinpokorny Jul 4, 2022
60a2183
add PR number to changelog
robinpokorny Jul 4, 2022
a44110f
Update packages/jest-snapshot/src/InlineSnapshots.ts
SimenB Jul 5, 2022
8ccfe4e
run prettier
robinpokorny Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
indent awaited snapshots with spaces
  • Loading branch information
@robinpokorny
robinpokorny committed Jul 4, 2022
commit b454eaaf05006e82861837d21d33d808e23781b0
19 changes: 15 additions & 4 deletions packages/jest-snapshot/src/InlineSnapshots.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@

import * as path from 'path';
import type {PluginItem} from '@babel/core';
import type {Expression, File, Program} from '@babel/types';
import {
type Expression,
type File,
type Program,
isAwaitExpression,
} from '@babel/types';
import * as fs from 'graceful-fs';
import type {
CustomParser as PrettierCustomParser,
Expand Down Expand Up @@ -312,7 +317,7 @@ const createFormattingParser =

const ast = resolveAst(parsers[inferredParser](text, options));
babelTraverse(ast, {
CallExpression({node: {arguments: args, callee}}) {
CallExpression({node: {arguments: args, callee}, parent}) {
if (
callee.type !== 'MemberExpression' ||
callee.property.type !== 'Identifier' ||
Expand All @@ -336,13 +341,19 @@ const createFormattingParser =
return;
}

const startColumn =
isAwaitExpression(parent) && parent.loc
? parent.loc.start.column
: callee.loc.start.column;

const useSpaces = !options.useTabs;
snapshot = indent(
snapshot,
Math.ceil(
useSpaces
? callee.loc.start.column / (options.tabWidth ?? 1)
: callee.loc.start.column / 2, // Each tab is 2 characters.
? startColumn / (options.tabWidth ?? 1)
: // Each tab is 2 characters.
startColumn / 2,
),
useSpaces ? ' '.repeat(options.tabWidth ?? 1) : '\t',
);
Expand Down