Skip to content
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

WIP use dprint for internal code formatting #4681

Closed
wants to merge 1 commit into from
Closed

WIP use dprint for internal code formatting #4681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions tools/dprint_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"lineWidth": "80",
"indentWidth": "2",
"nextControlFlowPosition": "sameLine",
"bracePosition": "sameLine"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was a bug related to this config option that is now fixed: https://github.com/dsherret/dprint/issues/180

}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can replace this with...

{
    "deno": true
}

...to have the same config (I renamed this from "prettier" to "deno" because it was different on trailing commas).

Then you may want to test out and provide feedback on the new preferSingleLine option:

{
    "deno": true,
    "preferSingleLine": true
}

...I'm still working on improving that, but I'll turn it on soon in the deno config because it's what prettier does.

Main things for me still are:

  1. More preferSingleLine config.
  2. Improve binary expression formatting (ex. 1 + 2)

11 changes: 10 additions & 1 deletion tools/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def main():

did_fmt = False
if args.js:
dprint()
prettier()
did_fmt = True
if args.py:
Expand All @@ -37,11 +38,19 @@ def prettier():
print "prettier"
script = os.path.join(third_party_path, "node_modules", "prettier",
"bin-prettier.js")
source_files = git_ls_files(root_path, ["*.js", "*.json", "*.ts", "*.md"])
source_files = git_ls_files(root_path, ["*.json", "*.md"])
run(["node", script, "--write", "--loglevel=error", "--"] + source_files,
shell=False,
quiet=True)

def dprint():
print "dprint"
config = os.path.join(root_path, "tools", "dprint_config.json")
source_files = git_ls_files(root_path, ["*.js", "*.ts"])
run(["dprint", "--config", config] + source_files,
shell=False,
quiet=True)


def yapf():
print "yapf"
Expand Down