Skip to content

[WIP] [Feedback] Inlining function call arguments #21

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

Closed
wants to merge 5 commits into from
Closed

[WIP] [Feedback] Inlining function call arguments #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
416d8d2
Avoid linebreak on function expression
Mar 12, 2018
06d666f
Rename and default inline option to true
Mar 13, 2018
69a226c
Add more function call samples to be tested
Mar 13, 2018
84436c8
Further work on inlining call arguments
Mar 13, 2018
6c14636
Updated tests
Mar 14, 2018
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
2 changes: 2 additions & 0 deletions src/options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export interface Options {
indentCount: number;
useTabs: boolean;
linebreakMultipleAssignments: boolean;
inlineFunctionCalls: boolean;
quotemark: Quotemark;
writeMode: WriteMode;
}
Expand All @@ -23,6 +24,7 @@ export const defaultOptions: Options = {
indentCount: 4,
useTabs: false,
linebreakMultipleAssignments: false,
inlineFunctionCalls: true,
quotemark: 'double',
writeMode: WriteMode.StdOut
};
Expand Down
27 changes: 18 additions & 9 deletions src/printer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ function printNodeNoParens(path: FastPath, options: Options, print: PrintFn) {
const canBreakLine = node.init.some(n =>
n != null &&
n.type !== 'TableConstructorExpression' &&
n.type !== 'FunctionDeclaration'
n.type !== 'FunctionDeclaration' &&
n.type !== 'CallExpression'
);

return group(
Expand Down Expand Up @@ -491,17 +492,25 @@ function printNodeNoParens(path: FastPath, options: Options, print: PrintFn) {
// last argument is a table, it would be beneficial to break on the table, rather than breaking the entire
// argument list.

const callExpressionSpacing = options.inlineFunctionCalls ?
[
'(',
concat([join(concat([',', ' ']), printedCallExpressionArgs)]),
')'
] :
[
'(',
indent(
concat([softline, join(concat([',', line]), printedCallExpressionArgs)])
),
softline,
')'
];

return concat([
path.call(print, 'base'),
group(
concat([
'(',
indent(
concat([softline, join(concat([',', line]), printedCallExpressionArgs)])
),
softline,
')'
]),
concat(callExpressionSpacing),
printedCallExpressionArgs.some(willBreak)
)
]);
Expand Down
19 changes: 14 additions & 5 deletions test/function/__snapshots__/function.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,19 @@ end

local ok, err = pcall(foo)

local ok, err =
pcall(
function()
end
)
local ok, err = pcall(function()
end)

local result = foo({1, 2, 3}, function(value)
return 1 % 2 == 0
end)

local result = foo({1, 2, 3}, \\"helloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\\", \\"hi\\", true, nil, function(
value)
return 1 % 2 == 0
end)

local result = foo(function(value)
end, {1, 2, 3}, \\"helloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo\\")
"
`;
6 changes: 6 additions & 0 deletions test/function/functions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,9 @@ end
local ok, err = pcall(foo)

local ok, err = pcall(function() end)

local result = foo({1, 2, 3}, function(value) return 1 % 2 == 0 end)

local result = foo({1, 2, 3}, "helloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo", 'hi', true, nil, function(value) return 1 % 2 == 0 end)

local result = foo(function(value) end, {1, 2, 3}, "helloooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo")
29 changes: 9 additions & 20 deletions test/linewrap/__snapshots__/linewrap.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,37 +11,26 @@ end
local a,
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
c = foo()
print(
a,
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
c
)
print(a, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, c)

local a,
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc =
foo()
cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc = foo()

local a, b, c, d, e, f = emptyFunction()

local a, b, c, d, e, f = emptyFunction(), emptyFunction()

local a, b, c, d, e, f = emptyFunction(), emptyFunction(), emptyFunction()

local a, b, c, d, e, f =
emptyFunction(),
emptyFunction(
function()
return true
end
)

local a, b, c, d, e, f =
emptyFunction(
function()
local a, b, c, d, e, f = emptyFunction(),
emptyFunction(function()
return true
end
)
end)

local a, b, c, d, e, f = emptyFunction(function()
return true
end)

local function object()
local self = {}
Expand Down
2 changes: 1 addition & 1 deletion test/linewrap/assignment.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ end
local a, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, c = foo()
print(a, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, c)

local a, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc = foo()
local a, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc = foo()

local a, b, c, d, e, f = emptyFunction()

Expand Down