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

Fix indentation #2680

Merged
merged 5 commits into from
Nov 24, 2021
Merged

Fix indentation #2680

merged 5 commits into from
Nov 24, 2021

Conversation

reyang
Copy link
Member

@reyang reyang commented Nov 24, 2021

No description provided.

@reyang reyang requested a review from a team November 24, 2021 08:03
@codecov
Copy link

codecov bot commented Nov 24, 2021

Codecov Report

Merging #2680 (664a745) into main (f4915ea) will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2680      +/-   ##
==========================================
- Coverage   82.93%   82.92%   -0.02%     
==========================================
  Files         249      249              
  Lines        8691     8691              
==========================================
- Hits         7208     7207       -1     
- Misses       1483     1484       +1     
Impacted Files Coverage Δ
src/OpenTelemetry/Metrics/AggregatorStore.cs 86.30% <0.00%> (-0.69%) ⬇️

@cijothomas
Copy link
Member

@reyang There is a markdownlint failure to be fixed before merge

.editorconfig Outdated
indent_style = space
indent_size = 4
Copy link
Member

Choose a reason for hiding this comment

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

We've got a few yml, xml, and json files that are normally indent_size = 2. I think this will affect those.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch, fixed.

@cijothomas cijothomas merged commit f7c718e into open-telemetry:main Nov 24, 2021
@reyang reyang deleted the reyang/indent branch November 24, 2021 21:55
retval += sanitycheck('**/*.csproj', allow_utf8 = True, allow_eol = (LF,))
retval += sanitycheck('**/*.htm', allow_eol = (LF,))
retval += sanitycheck('**/*.html', allow_eol = (LF,))
retval += sanitycheck('**/*.cshtml', allow_utf8 = True, allow_eol = (LF,), indent = 4)
Copy link
Contributor

Choose a reason for hiding this comment

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

Will indent = 4 be the default taken from .editorconfig?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants