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

Jump to bottom

[WIP] Implement SA1138: Indent elements correctly #2034

Open
wants to merge 47 commits into
base: master
Choose a base branch
from
Open

[WIP] Implement SA1138: Indent elements correctly #2034

wants to merge 47 commits into from

Conversation

sharwell
Copy link
Member

@sharwell sharwell commented Jan 9, 2016

Fixes #2025

@sharwell sharwell self-assigned this Jan 9, 2016
@sharwell sharwell force-pushed the fix-2025 branch 2 times, most recently from 1757562 to 789b06d Compare January 9, 2016 22:16
@codecov-io
Copy link

Current coverage is 93.38%

Merging #2034 into master will decrease coverage by -0.03% as of f3bbcd4

@@            master   #2034   diff @@
======================================
  Files          564     568      +4
  Stmts        35663   37234   +1571
  Branches      2292    2389     +97
  Methods                           
======================================
+ Hit          33313   34770   +1457
- Partial        752     777     +25
- Missed        1598    1687     +89

Review entire Coverage Diff as of f3bbcd4

Powered by Codecov. Updated on successful CI builds.

@sharwell
Copy link
Member Author

sharwell commented Jan 9, 2016

📝 Currently SA1138UnitTests.TestAttributeListAsync demonstrates an incorrect indentation behavior that should be fixed.

@sharwell
Copy link
Member Author

Note for myself: things noticed during testing that need to be fixed:

  • Attributes are indented too far
  • Contents of nested using indented "strangely"
  • Contents of nested if / else if indented too far
  • Indentation of while token of a do statement isn't checked if body is not a block

This was referenced Jan 11, 2016
Closed
Closed
Merged
sharwell added 18 commits January 13, 2016 05:07
@sharwell
Implement SA1137 (ElementsShouldHaveTheSameIndentation)
6485abc
@sharwell
Add handlers for field declarations and initializer expressions
196a70e
@sharwell
Expand SA1137 support for additional syntax kinds
0281a31
@sharwell
Add IndentationCodeFixProvider
0cdf3ec 
Currently this code fix only corrects SA1137, but the implementation is
general enough to support other types of indentation corrections in the
future.
@sharwell
Add test for block statements and fix bugs
505b920 
* Fix handling of consecutive labels
* Fix analysis of nodes which are not indented
* Fix logic error in code fix
@sharwell
Add test for switch statements
20ac696
@sharwell
Add tests for initializer expressions
a0967d0
@sharwell
Additional tests for valid initializer expressions and fix bugs
b4610a1 
* Fix misuse of immutable collections API
@sharwell
Add tests for base type declarations and fix bugs
0b976ba 
* Ignore leading attribute lists when analyzing other element kinds
@sharwell
Add tests for constraint clauses in type declarations
f5f7d2d
@sharwell
Add edge cases and fix bugs
38ab7d3 
* Attribute lists are now evaluated along with siblings of their parents
@sharwell
Avoid mutations if the result will match the input
c3ae121
@sharwell
Implement support for anonymous object creation expressions
b84892b
@sharwell
Add tests for type parameter lists
c19a1fe
@sharwell
Add test for enum declarations
2e34ba2
@sharwell
Add tests for method declarations
26ee139
@sharwell
Test field, event field, and variable declarations
18d33e4
@sharwell
Add tests for attribute lists
b879caf
@sharwell sharwell mentioned this pull request Jan 14, 2016
Merged
19 tasks
sharwell added 20 commits January 14, 2016 17:45
@sharwell
For SA1137, first in line means whitespace only
990b6bd
@sharwell
Initial implementation of SA1138 (Indent elements correctly)
aac8844
@sharwell
Fix indentation handling of base method and property declarations
5f33d62
@sharwell
Fix indentation handling for blocks inside else clauses
9860c7e
@sharwell
Fix handling of curly braces and statements without braces
23417d6
@sharwell
Fix errors running the SA1137 unit tests
3549add
@sharwell
Add tests for SA1138
4082322 
Also fixes a bug where some lines would get duplicate diagnostics
@sharwell
Add tests for additional method and statement kinds
a50fe42
@sharwell
Add tests for assembly attribute lists
b221643
@sharwell
Fix indentation of attributes in an attribute list
6ed11d0
@sharwell
Add tests for control flow statements with expressions
deefc6f
@sharwell
Expand test cases for nested statements
2e04003
@sharwell
Remove unnecessary null checks
77a1416
@sharwell
Refactor a bunch of test cases to properties
398f25a 
This change will make it much easier to run a complete set of tests using
different indentation configurations.
@sharwell
Check while token of do statement with a non-block body
ce0ee05
@sharwell
Fix indentation of 'else if'
0a08feb
@sharwell
Fix indentation of consecutive using statements
aa57c35
@sharwell
Make sure token alignment considers non-whitespace leading trivia
2dac7e2
@sharwell
Rename GenerateIndentationString to GenerateIndentationStringForSteps
2bd4822 
This method doesn't produce an indentation string for an arbitrary width,
which makes it not suitable for general indentation adjustments. Renaming
the method allows for the creation of a more general GenerateIndentationString
method later.
@sharwell
Update indentation code fix provider to adjust an entire element
d95082a 
This change allows for for accurate indentation adjustments of single
code elements which span multiple lines. Since the fix all provider has
not been updated to account for the new behavior, it is disabled for now.
@sharwell sharwell mentioned this pull request Jan 20, 2016
Merged
@janaagaard75
Copy link

What's the status of this pull request? I can see that there are a bunch of conflicting files, but is there anything else that needs to be done, beside resolving these conflicts? (I have no idea how easy of difficult it would be to resolve these conflicts.)

@zvonimir
Copy link

Hi. Any updates on this pull request? It would be great to land this one since it is really important for code readability. Thanks!

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

@sharwell sharwell

Labels
in progress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement SA1138: Indent elements correctly
4 participants
@sharwell @codecov-io @janaagaard75 @zvonimir