Code

feat: new formatter#6300

Code

Merged

asterite merged 222 commits intomasternoir-lang/noir:masterfrom ab/formatternoir-lang/noir:ab/formatterCopy head branch name to clipboardOct 22, 2024

+14,620-4,712

Commits

Commits on Oct 14, 2024

• The beginnings of a new formatter

  asterite

  committed
  770a1ad

  Copy full SHA for 770a1ad

• Function modifiers

  asterite

  committed
  21fdfbe

  Copy full SHA for 21fdfbe

• Format function generics

  asterite

  committed
  aba5220

  Copy full SHA for aba5220

• Format function return type

  asterite

  committed
  f3a377a

  Copy full SHA for f3a377a

• Got modules right

  asterite

  committed
  a1d856c

  Copy full SHA for a1d856c

• Preserve newlines (at most 2)

  asterite

  committed
  e5dc373

  Copy full SHA for e5dc373

• Small rename/refactor

  asterite

  committed
  f6cbe26

  Copy full SHA for f6cbe26

• Param and return visibility

  asterite

  committed
  6ad8636

  Copy full SHA for 6ad8636

• Format type aliases

  asterite

  committed
  4680271

  Copy full SHA for 4680271

• Format globals

  asterite

  committed
  52c29d4

  Copy full SHA for 52c29d4

• A few types and path

  asterite

  committed
  c159683

  Copy full SHA for c159683

• Format where clause

  asterite

  committed
  7042f29

  Copy full SHA for 7042f29

• Handle empty where clause

  asterite

  committed
  7b7037c

  Copy full SHA for 7b7037c

• Format array type

  asterite

  committed
  51f2313

  Copy full SHA for 51f2313

• Format mutable reference type

  asterite

  committed
  aaefaff

  Copy full SHA for aaefaff

• Format generic type args

  asterite

  committed
  b01487c

  Copy full SHA for b01487c

• Format parenthesized type

  asterite

  committed
  b1d536d

  Copy full SHA for b1d536d

• Format function types

  asterite

  committed
  937a188

  Copy full SHA for 937a188

• Format tuple types

  asterite

  committed
  782067e

  Copy full SHA for 782067e

• Some fixes to functions

  asterite

  committed
  ea9deba

  Copy full SHA for ea9deba

• More functions

  asterite

  committed
  d234d9c

  Copy full SHA for d234d9c

• More fixes

  asterite

  committed
  fc6c738

  Copy full SHA for fc6c738

• Improved fn formatting

  asterite

  committed
  8e66bd5

  Copy full SHA for 8e66bd5

• Start formatting statements

  asterite

  committed
  c04b093

  Copy full SHA for c04b093

• Handle comments a bit better

  asterite

  committed
  1d74184

  Copy full SHA for 1d74184

• Some literals

  asterite

  committed
  05cea5d

  Copy full SHA for 05cea5d

• Some arrays

  asterite

  committed
  da7977e

  Copy full SHA for da7977e

• Format arrays

  asterite

  committed
  92437ac

  Copy full SHA for 92437ac

Commits on Oct 15, 2024

• Correct formatting of comments inside chunks

  asterite

  committed
  effa043

  Copy full SHA for effa043

• Better way to format function body

  asterite

  committed
  09a5080

  Copy full SHA for 09a5080

• More comments fixes

  asterite

  committed
  ddab02c

  Copy full SHA for ddab02c

• Remove dbg

  asterite

  committed
  49081c8

  Copy full SHA for 49081c8

• No need to have ForceLine

  asterite

  committed
  2c59e9e

  Copy full SHA for 2c59e9e

• Write two lines if two or more exist in the source code

  asterite

  committed
  31d9df0

  Copy full SHA for 31d9df0

• Use new array formatting

  asterite

  committed
  ab4be16

  Copy full SHA for ab4be16

• Contract

  asterite

  committed
  6fab2b1

  Copy full SHA for 6fab2b1

• Format cast

  asterite

  committed
  379d5d3

  Copy full SHA for 379d5d3

• Rename Chunk::Chunks to Chunk::Group

  asterite

  committed
  9218a3d

  Copy full SHA for 9218a3d

• Vars, and don't use two lines at beginning or end of group

  asterite

  committed
  77b072e

  Copy full SHA for 77b072e

• Add a comment

  asterite

  committed
  64f9447

  Copy full SHA for 64f9447

• Include newlinw when formatting empty file

  asterite

  committed
  b91dd09

  Copy full SHA for b91dd09

• Trait as type

  asterite

  committed
  47ccea4

  Copy full SHA for 47ccea4

• Format hex integers

  asterite

  committed
  66546ae

  Copy full SHA for 66546ae

• Don't add extra space before initial comment

  asterite

  committed
  ab6aa5d

  Copy full SHA for ab6aa5d

• Format patterns

  asterite

  committed
  92f2d9c

  Copy full SHA for 92f2d9c

• Format impl

  asterite

  committed
  806b664

  Copy full SHA for 806b664

• self parameter

  asterite

  committed
  242174a

  Copy full SHA for 242174a

• More impl

  asterite

  committed
  a33dff2

  Copy full SHA for a33dff2

• More comments

  asterite

  committed
  3336741

  Copy full SHA for 3336741

• Small enhancement formatting impls

  asterite

  committed
  687eb70

  Copy full SHA for 687eb70

• Format traits

  asterite

  committed
  2b74f71

  Copy full SHA for 2b74f71

• Format slice type

  asterite

  committed
  3fedd3f

  Copy full SHA for 3fedd3f

• Format string type

  asterite

  committed
  a1eac74

  Copy full SHA for a1eac74

• Format fmtstr type

  asterite

  committed
  e629f74

  Copy full SHA for e629f74

• Format quoted type

  asterite

  committed
  0e715a6

  Copy full SHA for 0e715a6

• Format AsTraitPath

  asterite

  committed
  a5e880a

  Copy full SHA for a5e880a

• A few simple statements

  asterite

  committed
  00780d4

  Copy full SHA for 00780d4

• Format let statement

  asterite

  committed
  b20b5e6

  Copy full SHA for b20b5e6

• Format assign

  asterite

  committed
  b3fc75a

  Copy full SHA for b3fc75a

• Format op assign

  asterite

  committed
  79f852d

  Copy full SHA for 79f852d

• Format LValues

  asterite

  committed
  f7ea1ca

  Copy full SHA for f7ea1ca

• Format tuple expression

  asterite

  committed
  549888a

  Copy full SHA for 549888a

• Format as trait path expr

  asterite

  committed
  c853eff

  Copy full SHA for c853eff

• Index and prefix

  asterite

  committed
  21ce453

  Copy full SHA for 21ce453

• Better formatting of index expression

  asterite

  committed
  cd9fe5c

  Copy full SHA for cd9fe5c

Commits on Oct 16, 2024

• Focus on getting everything done, let's perfect it at the end

  asterite

  committed
  3fa421e

  Copy full SHA for 3fa421e

• Format type expressions

  asterite

  committed
  91083d7

  Copy full SHA for 91083d7

• Format parenthesized lvalues

  asterite

  committed
  6424b90

  Copy full SHA for 6424b90

• Format comptime statement

  asterite

  committed
  99048f2

  Copy full SHA for 99048f2

• Refactor

  asterite

  committed
  49d5a1c

  Copy full SHA for 49d5a1c

• Format blocks in statements

  asterite

  committed
  b456bb2

  Copy full SHA for b456bb2

• Format comptime block

  asterite

  committed
  50e1e37

  Copy full SHA for 50e1e37

• Blocks

  asterite

  committed
  7e1799b

  Copy full SHA for 7e1799b

• Add a test for something that's not ideal

  asterite

  committed
  45772b7

  Copy full SHA for 45772b7

• Format for loop

  asterite

  committed
  fe53160

  Copy full SHA for fe53160

• Format assert and assert_eq

  asterite

  committed
  1283298

  Copy full SHA for 1283298

• Format call

  asterite

  committed
  e810fb4

  Copy full SHA for e810fb4

• Format method call

  asterite

  committed
  47f4d5d

  Copy full SHA for 47f4d5d

• Format member access

  asterite

  committed
  493f224

  Copy full SHA for 493f224

• Format path turbofish

  asterite

  committed
  64b1457

  Copy full SHA for 64b1457

• Some fixes

  asterite

  committed
  04b1d16

  Copy full SHA for 04b1d16

• Refactor

  asterite

  committed
  0353dcc

  Copy full SHA for 0353dcc

• Format parenthesized expression

  asterite

  committed
  cab9d68

  Copy full SHA for cab9d68

• Format unsafe expression

  asterite

  committed
  444ba8b

  Copy full SHA for 444ba8b

• Format unsafe statement

  asterite

  committed
  0400e88

  Copy full SHA for 0400e88

• Add something for later

  asterite

  committed
  4e279c4

  Copy full SHA for 4e279c4

• Another case not to forget

  asterite

  committed
  45390c8

  Copy full SHA for 45390c8

• Format constructor

  asterite

  committed
  400c78c

  Copy full SHA for 400c78c

• Format negative integers

  asterite

  committed
  c1dc482

  Copy full SHA for c1dc482

• Mutable reference fix

  asterite

  committed
  b6075c5

  Copy full SHA for b6075c5

• Format comptime statement and expression

  asterite

  committed
  b70996e

  Copy full SHA for b70996e

• Format type path

  asterite

  committed
  6133a26

  Copy full SHA for 6133a26

• Format if expression

  asterite

  committed
  e7d82a6

  Copy full SHA for e7d82a6

• Format if

  asterite

  committed
  2e44128

  Copy full SHA for 2e44128

• Allow whitespace between quote and {

  asterite

  committed
  041868e

  Copy full SHA for 041868e

• Format quote

  asterite

  committed
  6573c17

  Copy full SHA for 6573c17

• Format lambda

  asterite

  committed
  7a59c9a

  Copy full SHA for 7a59c9a

• Format trait impls

  asterite

  committed
  0946752

  Copy full SHA for 0946752

• Format imports

  asterite

  committed
  7945291

  Copy full SHA for 7945291

• Fix empty blocks when they just have newlines

  asterite

  committed
  9c2ac62

  Copy full SHA for 9c2ac62

• Apply new format to turbofish_call

  asterite

  committed
  fe61d89

  Copy full SHA for fe61d89

• Fix method call with turbofish

  asterite

  committed
  8cf054f

  Copy full SHA for 8cf054f

• Write line afte use

  asterite

  committed
  34a021a

  Copy full SHA for 34a021a

• Refactor: extract format_let_or_global

  asterite

  committed
  b24e23c

  Copy full SHA for b24e23c

• Simplify use tree list with just one item

  asterite

  committed
  fd343d6

  Copy full SHA for fd343d6

• Format constructor field without value

  asterite

  committed
  44d4ce4

  Copy full SHA for 44d4ce4

• Don't indent+ let/global after =

  asterite

  committed
  8e98598

  Copy full SHA for 8e98598

• Transform TextIfMultiline to Text

  asterite

  committed
  f1f2fac

  Copy full SHA for f1f2fac

• Simplify

  asterite

  committed
  34b243c

  Copy full SHA for 34b243c

• Correct format for vec example (remove trailing spaces)

  asterite

  committed
  2eec35c

  Copy full SHA for 2eec35c

• Correct format for module sample

  asterite

  committed
  6508f8b

  Copy full SHA for 6508f8b

• Fix issue with comment

  asterite

  committed
  c412f7e

  Copy full SHA for c412f7e

• New format for impl

  asterite

  committed
  ef585d4

  Copy full SHA for ef585d4

Commits on Oct 17, 2024

• Honor config.tab_spaces

  asterite

  committed
  fa11b43

  Copy full SHA for fa11b43

• Remove some TODOs

  asterite

  committed
  fe75b4e

  Copy full SHA for fe75b4e

• Honor single_line_if_else_max_width

  asterite

  committed
  3f28068

  Copy full SHA for 3f28068

• Handle comments after if condition and else keyword

  asterite

  committed
  7cab276

  Copy full SHA for 7cab276

• Honor fn_call_width

  asterite

  committed
  99f98b0

  Copy full SHA for 99f98b0

• Fix formatting of struct patterns

  asterite

  committed
  cd88246

  Copy full SHA for cd88246

• Don't break lambda parameters

  asterite

  committed
  4f3aa93

  Copy full SHA for 4f3aa93

• Preserve multiple lines between fors

  asterite

  committed
  f9baa42

  Copy full SHA for f9baa42

• Glue trailing comma to last text

  asterite

  committed
  5c1961c

  Copy full SHA for 5c1961c

• Extract comments_and_whitespace module

  asterite

  committed
  ca3bf71

  Copy full SHA for ca3bf71

• Better chunk tags

  asterite

  committed
  8b6d678

  Copy full SHA for 8b6d678

• Better way to format infix expressions

  asterite

  committed
  328f5b4

  Copy full SHA for 328f5b4

• Better formatting of MemberAccess chains

  asterite

  committed
  86a98d9

  Copy full SHA for 86a98d9

• More chains

  asterite

  committed
  c28f806

  Copy full SHA for c28f806

• A bit more member access and method calls

  asterite

  committed
  6fbb4c4

  Copy full SHA for 6fbb4c4

• A bit more infix

  asterite

  committed
  ce7cce5

  Copy full SHA for ce7cce5

• Add a failing test

  asterite

  committed
  fc298a4

  Copy full SHA for fc298a4

• No need to force chain children to be multiline

  asterite

  committed
  47a4840

  Copy full SHA for 47a4840

• Fix use trees

  asterite

  committed
  81d9c09

  Copy full SHA for 81d9c09

• Trait impl impl generics

  asterite

  committed
  739b17c

  Copy full SHA for 739b17c

• comptime mut globals

  asterite

  committed
  b62feb7

  Copy full SHA for b62feb7

• Format tuple member access

  asterite

  committed
  33ffecb

  Copy full SHA for 33ffecb

• Format trait function with where clause but not body

  asterite

  committed
  cd3ad71

  Copy full SHA for cd3ad71

• Write line after trait

  asterite

  committed
  ea4fdbe

  Copy full SHA for ea4fdbe

• Write line after item

  asterite

  committed
  1fe9d4a

  Copy full SHA for 1fe9d4a

• Format trait where clause

  asterite

  committed
  815d347

  Copy full SHA for 815d347

• Trait bound generics

  asterite

  committed
  97da905

  Copy full SHA for 97da905

• Remove TODO

  asterite

  committed
  cd39bae

  Copy full SHA for cd39bae

• Fix unintended token bump when formatting chunks

  asterite

  committed
  28c76bc

  Copy full SHA for 28c76bc

• Obey indentation chunks even when formatting in one line

  asterite

  committed
  0042f3f

  Copy full SHA for 0042f3f

• Fix contract test

  asterite

  committed
  5131f43

  Copy full SHA for 5131f43

• Put comments tests in its own module

  asterite

  committed
  6b55f9c

  Copy full SHA for 6b55f9c

• Format { /* comment */ }

  asterite

  committed
  a1a9f8c

  Copy full SHA for a1a9f8c

• More comments handling

  asterite

  committed
  eaf7727

  Copy full SHA for eaf7727

• More comments

  asterite

  committed
  370b48b

  Copy full SHA for 370b48b

• Finally expr test file formats fine

  asterite

  committed
  56630ea

  Copy full SHA for 56630ea

• Handle comment inside index

  asterite

  committed
  265ed7a

  Copy full SHA for 265ed7a

• Spaces around infix operands

  asterite

  committed
  c6e417a

  Copy full SHA for c6e417a

• More comments and whitespaces

  asterite

  committed
  40568f0

  Copy full SHA for 40568f0

• Remove nested parents, and more comments and whitespace

  asterite

  committed
  84b8b62

  Copy full SHA for 84b8b62

• Tuples

  asterite

  committed
  e2d3fc6

  Copy full SHA for e2d3fc6

• Hopefully no need for ignore anymore

  asterite

  committed
  eecba23

  Copy full SHA for eecba23

• Fix empty arguments list when multiple lines are needed

  asterite

  committed
  ca1d5d3

  Copy full SHA for ca1d5d3

• Attach comma to last group

  asterite

  committed
  6ef4c78

  Copy full SHA for 6ef4c78

• Fix constructor with turbofish

  asterite

  committed
  7817923

  Copy full SHA for 7817923

• Assign to tuple member

  asterite

  committed
  b044cc8

  Copy full SHA for b044cc8

Commits on Oct 18, 2024

• Format lambda as last argument in a special (nice) way

  asterite

  committed
  4872371

  Copy full SHA for 4872371

• A bit more lambda

  asterite

  committed
  173dcea

  Copy full SHA for 173dcea

• More lambdas :-)

  asterite

  committed
  1b91c8f

  Copy full SHA for 1b91c8f

• Fix some comments indentation

  asterite

  committed
  55df85e

  Copy full SHA for 55df85e

• Clippy

  asterite

  committed
  a7b09f6

  Copy full SHA for a7b09f6

• Fix issue with long use list

  asterite

  committed
  675a5d3

  Copy full SHA for 675a5d3

• Honor the short_array_element_width_threshold config

  asterite

  committed
  2f71cd2

  Copy full SHA for 2f71cd2

• Comments and renames

  asterite

  committed
  6283127

  Copy full SHA for 6283127

• More comments

  asterite

  committed
  40f23ba

  Copy full SHA for 40f23ba

• Clippy

  asterite

  committed
  41cd590

  Copy full SHA for 41cd590

• Format the standard library and test programs

  asterite

  committed
  926af37

  Copy full SHA for 926af37

• Handle comments after struct field

  asterite

  committed
  c3570a2

  Copy full SHA for c3570a2

• Format the stdlib again

  asterite

  committed
  6bbb36c

  Copy full SHA for 6bbb36c

• Remove "error on lost comment" as this formatter never loses comments

  asterite

  committed
  5367c51

  Copy full SHA for 5367c51

• Handle comments after function signature

  asterite

  committed
  fe80ff2

  Copy full SHA for fe80ff2

• Fix for long function signatures without parameters

  asterite

  committed
  3a17152

  Copy full SHA for 3a17152

• Implement noir-fmt:ignore

  asterite

  committed
  b56c3c8

  Copy full SHA for b56c3c8

• Don't indent in assign after =

  asterite

  committed
  102f802

  Copy full SHA for 102f802

• Document

  asterite

  committed
  5cbe1b7

  Copy full SHA for 5cbe1b7

• Remove lines before anything, preserve lines after comment and item

  asterite

  committed
  e331266

  Copy full SHA for e331266

• Move test

  asterite

  committed
  77860e6

  Copy full SHA for 77860e6

• Reformat

  asterite

  committed
  d3c3b71

  Copy full SHA for d3c3b71

• Better way to see if we wrote comments

  asterite

  committed
  d198d69

  Copy full SHA for d198d69

Commits on Oct 19, 2024

• Format let statement attributes

  asterite

  committed
  8686b40

  Copy full SHA for 8686b40

• No need to skip idempotency anymore

  asterite

  committed
  fe48c2f

  Copy full SHA for fe48c2f

• Fix regarding cspell

  asterite

  committed
  b76ea4b

  Copy full SHA for b76ea4b

• Attach semicolon to last group text

  asterite

  committed
  435e9d8

  Copy full SHA for 435e9d8

• Better way to format let statements and assignments

  asterite

  committed
  b28b9b3

  Copy full SHA for b28b9b3

• Better way to format method calls and chains in general

  asterite

  committed
  5092e12

  Copy full SHA for 5092e12

• Reformat the standard library and test programs

  asterite

  committed
  451d174

  Copy full SHA for 451d174

• Make sure to always attach semicolons to parent groups

  asterite

  committed
  ada28f0

  Copy full SHA for ada28f0

• Introduce ChunkGroup::semicolon

  asterite

  committed
  cb299e5

  Copy full SHA for cb299e5

• Introduce ChunkGroup::space

  asterite

  committed
  89a5a7e

  Copy full SHA for 89a5a7e

• Document a bit more

  asterite

  committed
  2229d40

  Copy full SHA for 2229d40

• Merge branch 'master' into ab/formatter

  asterite

  committed
  1f714c2

  Copy full SHA for 1f714c2

Commits on Oct 20, 2024

• os-dependent newlines

  asterite

  committed
  fb5be0f

  Copy full SHA for fb5be0f

Commits on Oct 21, 2024

• Fix quote contents getting wrong format

  asterite

  committed
  6d9d375

  Copy full SHA for 6d9d375

• Better (shorter) way to format nested calls and nested expression lists in general

  asterite

  committed
  e87bb19

  Copy full SHA for e87bb19

• Clippy

  asterite

  committed
  1c6256f

  Copy full SHA for 1c6256f

• Reformat

  asterite

  committed
  f224bec

  Copy full SHA for f224bec

• Better way to avoid indenting twice

  asterite

  committed
  c07d540

  Copy full SHA for c07d540

• Update tooling/nargo_fmt/src/formatter.rs

  Show description for 9e1f811
  

  asterite

  and

  aakoshh

  authored
  9e1f811

  Copy full SHA for 9e1f811

• Update tooling/nargo_fmt/src/formatter/chunks.rs

  Show description for 9d58753
  

  asterite

  and

  aakoshh

  authored
  9d58753

  Copy full SHA for 9d58753

• Update tooling/nargo_fmt/src/formatter/chunks.rs

  Show description for 743d524
  

  asterite

  and

  aakoshh

  authored
  743d524

  Copy full SHA for 743d524

• Update tooling/nargo_fmt/src/formatter/chunks.rs

  Show description for 9f7636c
  

  asterite

  and

  aakoshh

  authored
  9f7636c

  Copy full SHA for 9f7636c

• Update tooling/nargo_fmt/src/formatter/chunks.rs

  Show description for 51a0006
  

  asterite

  and

  aakoshh

  authored
  51a0006

  Copy full SHA for 51a0006

• Format and use text snippet instead of rust

  asterite

  committed
  76ab4ef

  Copy full SHA for 76ab4ef

• Reuse add_trailing_comma_to_last_text

  asterite

  committed
  aec8fda

  Copy full SHA for aec8fda

• Remove unneeded code

  asterite

  committed
  3f2e724

  Copy full SHA for 3f2e724

• Introduce a Buffer object to avoid writing to it in unintended ways

  asterite

  committed
  7abc31e

  Copy full SHA for 7abc31e

• Merge branch 'master' into ab/formatter

  asterite

  committed
  593ad00

  Copy full SHA for 593ad00

• Format after merge

  asterite

  committed
  d7cc3c1

  Copy full SHA for d7cc3c1

• Derive Debug for Buffer

  asterite

  committed
  ba0ac2c

  Copy full SHA for ba0ac2c

• Better way to format lambdas that don't have a block as a body

  asterite

  committed
  e5e062a

  Copy full SHA for e5e062a

• Always name a ChunkGroup as group, never as chunks

  asterite

  committed
  f6b0ffa

  Copy full SHA for f6b0ffa

• Fix an issue introduced in the new lambda formatting

  asterite

  committed
  e6a1088

  Copy full SHA for e6a1088

• Merge branch 'master' into ab/formatter

  asterite

  committed
  54ad8b7

  Copy full SHA for 54ad8b7

Commits on Oct 22, 2024

• Update tooling/nargo_fmt/tests/expected/tuple.nr

  Show description for bc841e5
  

  asterite

  and

  TomAFrench

  authored
  bc841e5

  Copy full SHA for bc841e5

• Move chunks outside of the formatter directory

  asterite

  committed
  33a288f

  Copy full SHA for 33a288f

• Merge branch 'ab/formatter' of github.com:noir-lang/noir into ab/formatter

  asterite

  committed
  b88c4ed

  Copy full SHA for b88c4ed

• Merge branch 'master' into ab/formatter

  asterite

  committed
  768560d

  Copy full SHA for 768560d

• Remove FIXME from tuple sample

  asterite

  committed
  a386434

  Copy full SHA for a386434

• Introduce ChunkFormatter to avoid mixing formatting modes (thank you @aakoshh !)

  asterite

  committed
  fb27136

  Copy full SHA for fb27136