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.

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

Improvements to ocp-indent-compat and the Janestreet profile #2314

Merged
merged 151 commits into from
Jan 16, 2024
Merged
Changes from 1 commit
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
20ebef9
JaneStreet: Disable 'max-indent=2'
Julow Mar 17, 2023
3f41d48
ocp-indent-compat: Function args and type annot
Julow Mar 17, 2023
13eeab1
ocp-indent-compat: Docked `fun` body
Julow Mar 17, 2023
f05c13c
De-indent comment after record field
Julow Mar 17, 2023
efcbba3
ocp-indent-compat: Break before type constructors
Julow Mar 17, 2023
7256e1a
De-indent left-separated tuples
Julow Mar 17, 2023
574d62b
ocp-indent-compat: Docked function cases
Julow Mar 21, 2023
2ea9bf8
ocp-indent-compat: `fun` arguments
Julow Mar 21, 2023
fad2037
ocp-indent-compat: Docstring after record field decl
Julow Mar 21, 2023
6756d12
ocp-indent-compat: Recursive function arguments
Julow Mar 21, 2023
7bbb897
Merge branch 'main' into HEAD
Julow Mar 22, 2023
4d0e610
ocp-indent-compat: Labelled non-docked fun args
Julow Mar 21, 2023
484a31a
ocp-indent-compat: Module unpack annotation
Julow Mar 21, 2023
89d2da3
ocp-indent-compat: Expression type constraint
Julow Mar 21, 2023
bc1cef6
Revert "ocp-indent-compat: Recursive function arguments"
Julow Mar 22, 2023
c9ef972
ocp-indent-compat: Align fun decl arguments
Julow Mar 22, 2023
50cc017
ocp-indent-compat: Begin-line assignment operator
Julow Mar 22, 2023
5b448de
ocp-indent-compat: Parenthesed `fun` and `function`
Julow Mar 22, 2023
1f051c0
ocp-indent-compat: Module constraint with inline struct/sig
Julow Mar 22, 2023
9af41ef
ocp-indent-compat: Docked match after infix
Julow Mar 21, 2023
3ca1db3
Update CHANGES
Julow Mar 22, 2023
9f60100
Fix regression on unparenthesed matches
Julow Mar 22, 2023
187559a
Merge branch 'ocp-infix-match' into js-ocp-indent
Julow Mar 23, 2023
ff28762
fmt
Julow Mar 23, 2023
460641e
ocp-indent-compat: Docstring after variant constructor
Julow Mar 23, 2023
510e622
ocp-indent-compat: Align module packs
Julow Mar 23, 2023
3b611d2
ocp-indent-compat: Parenthesed variant arguments
Julow Mar 23, 2023
bbc1cc9
Merge branch 'main' into js-ocp-indent
Julow Mar 23, 2023
9602774
ocp-indent-compat: Breaking `fun` with no label
Julow Mar 23, 2023
51d3358
ocp-indent-compat: `function` in `fun` body
Julow Mar 23, 2023
fe066dd
ocp-indent-compat: Don't align `fun` args
Julow Mar 23, 2023
c7d25ce
ocp-indent-compat: Module type with constraints
Julow Mar 23, 2023
0cbcdd2
Don't align condition when `if-then-else` = `keyword-first`
Julow Mar 23, 2023
4446922
ocp-indent-compat: Indent type constr with args
Julow Mar 23, 2023
b7df86c
ocp-indent-compat: Constructor and variant patterns
Julow Mar 23, 2023
4975645
Improve formatting of module arguments
Julow Mar 24, 2023
3a216df
ocp-indent-compat: variant argument
gpetiot Apr 4, 2023
93ac80a
ocp-indent-compat: fix non-breaking attr after expr
gpetiot Apr 4, 2023
9ef66c7
ocp-indent-compat: Dock only one argument
Julow Mar 24, 2023
2564d7d
cmt
Julow Apr 4, 2023
8081b27
Merge branch 'main' into module-arg-boxes
Julow Apr 4, 2023
be28dde
Merge branch 'module-arg-boxes' into js-ocp-indent
Julow Apr 4, 2023
37c452b
indent Pmod_extension
gpetiot Apr 4, 2023
6a259f0
Merge branch 'main' into js-ocp-indent
Julow Apr 6, 2023
ea447cf
ocp-indent-compat: Align functor arguments on parens
Julow Apr 6, 2023
ca18b9c
Indent extensions according to [stritem-]extension-indent
gpetiot Apr 6, 2023
5fca39a
Detect contained structure items
Julow Apr 6, 2023
9db8fa2
Merge branch 'main' into js-ocp-indent
Julow Apr 6, 2023
726eef3
Merge branch 'pr/2330' into js-ocp-indent
Julow Apr 6, 2023
31a557a
Reformat
gpetiot Apr 11, 2023
439dd0e
ocp-indent: adjust indentation of Pexp_fun body and arguments
gpetiot Apr 11, 2023
75ed25e
Merge branch 'main' into js-ocp-indent
Julow Apr 14, 2023
8e59d82
Add failing test
Julow Apr 18, 2023
688e6f8
Define 'fmt_code' type
Julow Apr 18, 2023
5b1d50b
Staged formatting of code blocks
Julow Apr 19, 2023
2e2d6dc
Update CHANGES
Julow Apr 19, 2023
7853ae5
Fix non-stabilizing comments attached to type_constr
gpetiot Apr 19, 2023
f1ef7bf
Fix formatting of cinaps comments
Julow Apr 19, 2023
dec588e
Fix trailing spaces on empty lines in cinaps
Julow Apr 19, 2023
8444e97
Merge branch 'fmt_code_string_break' into js-ocp-indent
Julow Apr 19, 2023
c8887f3
Improve formatting of mty_with constraints
gpetiot Apr 20, 2023
c3b3d10
Fix formatting of cinaps comments with strings
Julow Apr 24, 2023
3b83050
Update Changes
Julow Apr 24, 2023
596546b
Merge branch 'main' into cinaps-string-indented
Julow Apr 25, 2023
ad632ed
Fix changelog
Julow Apr 25, 2023
6f48d88
Protect match after `fun _ : _ ->`
Julow Apr 25, 2023
3ce5c96
Update changes
Julow Apr 25, 2023
0ed4053
Fix non-stabilizing comments attached to a record type field
gpetiot Apr 25, 2023
9a2cafd
Merge branch 'main' into js-ocp-indent
Julow Apr 25, 2023
7b60ca2
Merge branch 'match-fun-constraint-match' into js-ocp-indent
Julow Apr 25, 2023
5b1c27e
Merge branch 'cinaps-string-indented' into js-ocp-indent
Julow Apr 25, 2023
ea48262
Fix linebreaks in muktiline toplevel comments
gpetiot Apr 27, 2023
5a7d74f
Merge branch 'main' into js-ocp-indent
Julow May 9, 2023
7e9bf84
Add failing test
Julow May 9, 2023
dfd63a7
Align pattern alias
Julow May 9, 2023
0a56a04
Merge branch 'align-pat-alias' into js-ocp-indent
Julow May 9, 2023
ea79fd1
Merge branch 'main' into js-ocp-indent
Julow May 25, 2023
7df9213
WIP: Factorize interpretation of comments
Julow Apr 27, 2023
9caf607
Fix lost ending space
Julow May 26, 2023
207f471
Promote
Julow May 26, 2023
86ff2e4
WIP: Rewrite parsing of normal and asterisk prefixed comments
Julow May 26, 2023
f5cce1a
Test 'error4' requires one more iteration
Julow May 30, 2023
032f6c3
Fix added newline in cinaps comments
Julow May 30, 2023
124a89b
Strip trailing spaces of cinaps comments
Julow May 31, 2023
2d0930d
Promote
Julow May 31, 2023
b207454
Strip heading/trailing empty lines
Julow May 31, 2023
e8875b5
Small cleanup in docstring fmt function
Julow May 31, 2023
c42280a
Fix incorrect unindenting of cinaps comments
Julow May 31, 2023
4e4ef13
Normalize comments in code in comments
Julow May 30, 2023
7e9e6ab
Revert "Normalize comments in code in comments"
Julow May 31, 2023
6061527
Fix unindenting when first line is empty
Julow Jun 1, 2023
520a35c
Don't unindent doc comments
Julow Jun 1, 2023
2095965
Revert "Test 'error4' requires one more iteration"
Julow Jun 1, 2023
606447a
Trim trailing empty lines and whitespaces
Julow Jun 1, 2023
4572014
Preserve empty trailing lines in doc comments
Julow Jun 2, 2023
3468395
Restore formatting of cinaps comments
Julow Jun 2, 2023
aa80541
Preserve pro/epi break on comments as doc
Julow Jun 2, 2023
364fc75
Fix regressions on unwrapped comments
Julow Jun 5, 2023
e009001
Fix parsing of asterisk prefixed comments
Julow Jun 5, 2023
7bff959
Restore break before preceeding multi-line comments
Julow Jun 5, 2023
f8719ba
Preserve leading/trailing newlines in unwrapped comments
Julow Jun 5, 2023
69f2a8e
Tests: Remove no longer necessary `--max-iter`
Julow Jun 6, 2023
5a56bf1
Tests: Remove empty .err files
Julow Jun 6, 2023
37bf3f0
Fix parsing and printing of header-like comments
Julow Jun 6, 2023
8bf52f2
Update changes
Julow Jun 6, 2023
cf878da
Fix parsing of asterisk prefixed comments too open
Julow Jun 6, 2023
00a77f3
Merge branch 'main' into cmts-factor
Julow Jun 6, 2023
6e0ae10
Cleanup Cmt
gpetiot Jun 7, 2023
9a5bb99
Don't check the margin to group comments
gpetiot Jun 7, 2023
fe93ffd
Merge pull request #1 from gpetiot/cmts-factor-dont-check-margin
Julow Jun 7, 2023
58e8d0b
Even less open parsing of asterisk prefixed
Julow Jun 7, 2023
f4f64ca
Change the baseline indentation for unwrapped comments
Julow Jun 7, 2023
017935d
Fix interference between f4f64ca5 and 58e8d0b3
Julow Jun 7, 2023
1ee288d
Don't unindent unwrapped comments
Julow Jun 7, 2023
09a9638
Fix last line of asterisk prefixed
Julow Jun 7, 2023
b92c62f
Make Cmt.t abstract
Julow Jun 7, 2023
25aa14c
Don't mix comments and docstrings
Julow Jun 7, 2023
b0fe7eb
Merge branch 'main' into js-ocp-indent
Julow Jun 7, 2023
ef9d230
Merge branch 'cmts-factor' into js-ocp-indent
Julow Jun 7, 2023
cd00fe6
Make Cmt.t abstract
Julow Jun 7, 2023
ef208e9
Don't mix comments and docstrings
Julow Jun 7, 2023
2ef7270
Merge branch 'cmts-docstrings' into cmts-factor
Julow Jun 8, 2023
7633f3e
Merge branch 'main' into cmts-factor
Julow Jun 8, 2023
c37b6ad
Normalize comments inside comments
Julow Jun 9, 2023
8a4e1cf
Add #2372 to changelog
Julow Jun 12, 2023
e000e31
Merge branch 'main' into cmts-factor
Julow Jun 12, 2023
674b07c
Preserve blank lines in docstrings
Julow Jun 22, 2023
61ab7d0
Update CHANGES
Julow Jun 22, 2023
e273379
Merge branch 'main' into cmts-factor
Julow Jun 22, 2023
af03432
Merge branch 'cmts-factor' into js-ocp-indent
Julow Jun 22, 2023
4a542d8
Do not rely on the original source code
Julow Jun 22, 2023
a313c0d
Revert change to Source
Julow Jun 22, 2023
84c945c
Merge branch 'doc-preserve-blank' into js-ocp-indent
Julow Jun 22, 2023
724ac55
Merge branch 'MAIN' into js-ocp-indent
Julow Sep 7, 2023
e70b6db
Merge branch 'MAIN' into js-ocp-indent
Julow Sep 12, 2023
c43a547
Merge branch 'MAIN' into js-ocp-indent
Julow Dec 4, 2023
31a37b1
Format and reduce diff
Julow Dec 4, 2023
561bf5f
Remove extension indent change in other profiles
Julow Dec 5, 2023
344ac2b
Merge branch 'MAIN' into js-ocp-indent
Julow Dec 15, 2023
4e7eb45
Update CHANGES
Julow Dec 15, 2023
5b87a63
Merge branch 'MAIN' into js-ocp-indent
Julow Jan 4, 2024
8347bf6
Don't align module argument types
Julow Jan 5, 2024
7c35657
Update CHANGES
Julow Jan 5, 2024
676ab72
Merge branch 'module_arg_t_align' into js-ocp-indent
Julow Jan 5, 2024
66e2e85
Fix docstring in record regression
Julow Jan 5, 2024
faae8d7
Merge branch 'MAIN' into js-ocp-indent
Julow Jan 8, 2024
5516500
Fix functor argument indent regression
Julow Jan 10, 2024
27bff54
Merge branch 'MAIN' into js-ocp-indent
Julow Jan 10, 2024
1014e82
Merge branch 'MAIN' into js-ocp-indent
Julow Jan 16, 2024
eb2f931
Commit missing test file
Julow Jan 16, 2024
725f148
Changes: Mark as non breaking change
Julow Jan 16, 2024
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
Commit missing test file
Julow committed Jan 16, 2024
commit eb2f931dd3ff4aa17a78224a2d7c0850cfe4d21c
1 change: 1 addition & 0 deletions test/passing/tests/functor.ml.err
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Warning: tests/functor.ml:89 exceeds the margin