Skip to content

Fix 383 - Formatting AST including @trusted delegate produces inval…#399

Merged
dlang-bot merged 2 commits intodlang-community:masterfrom
MoonlightSentinel:format
May 12, 2020
Merged

Fix 383 - Formatting AST including @trusted delegate produces inval…#399
dlang-bot merged 2 commits intodlang-community:masterfrom
MoonlightSentinel:format

Conversation

@MoonlightSentinel
Copy link
Contributor

…id output

dowas written unconditionally even though hasDo was false.

@codecov
Copy link

codecov bot commented May 2, 2020

Codecov Report

Merging #399 into master will increase coverage by 1.75%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #399      +/-   ##
==========================================
+ Coverage   76.26%   78.02%   +1.75%     
==========================================
  Files           9        9              
  Lines        7168     7181      +13     
==========================================
+ Hits         5467     5603     +136     
+ Misses       1701     1578     -123     
Impacted Files Coverage Δ
src/dparse/formatter.d 37.94% <100.00%> (+7.90%) ⬆️
src/dparse/ast.d 59.87% <0.00%> (+3.99%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 799a96b...6448b28. Read the comment docs.

…id output

`do`was written unconditionally even though `hasDo` was false.
@MoonlightSentinel
Copy link
Contributor Author

MoonlightSentinel commented May 2, 2020

The second commit ensures proper newlines/indentation for do (and also in/out along the way).

Also added a bunch of tests.

@Geod24
Copy link
Member

Geod24 commented May 2, 2020

Thanks! Looks like Travis had a spurious failure tho.

@MoonlightSentinel
Copy link
Contributor Author

Could you have a look @WebFreak001 ?

Copy link
Member

@WebFreak001 WebFreak001 left a comment

Choose a reason for hiding this comment

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

LGTM

@Geod24
Copy link
Member

Geod24 commented May 12, 2020

Can we have a merge & release then ? 👼

@dlang-bot dlang-bot merged commit 60419d8 into dlang-community:master May 12, 2020
@WebFreak001
Copy link
Member

(stable) release will take a little because we have the token trivia changes in right now, which changed how ddoc of tokens was handled, which still needs a little more testing for backwards compatibility

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Formatting AST including @trusted delegate produces invalid output

4 participants