Improve editor config for two indentation files #1661
+6
−36
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -19,57 +19,27 @@ charset = utf-8 | |||||||||
| # File Extension Settings | ||||||||||
| ########################################## | ||||||||||
|
|
||||||||||
| [*.{xaml,xml,yml,yaml,slnf,sln,csproj,proj,projitems,shproj,props,targets,appxmanifest,json,html,cshtml,webmanifest,manifest,css,vsconfig,sh,md,markdown}] | ||||||||||
| indent_size = 2 | ||||||||||
| indent_style = space | ||||||||||
|
|
||||||||||
| [.{vsconfig,csproj,proj,projitems,sh,shproj,props,targets,json,slnf,css,webmanifest,manifest,plist}] | ||||||||||
DevTKSS marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||||||
| end_of_line = lf | ||||||||||
|
|
||||||||||
| [*.xaml] | ||||||||||
| charset = utf-8-bom | ||||||||||
|
|
||||||||||
| [*.plist] | ||||||||||
| indent_size = 4 | ||||||||||
| indent_style = tab | ||||||||||
|
Comment on lines
33
to
34
There was a problem hiding this comment. The plist file configuration conflicts with the consolidated rule above. Plist files are included in the consolidated rule with 2-space indentation, but this specific rule sets 4 spaces, creating inconsistent behavior.
Suggested change
Contributor
Author
There was a problem hiding this comment. not seeing conflict. above is only group set, that all of them are getting the lf eol, but the size and styling are only set for plist down here. |
||||||||||
|
|
||||||||||
| [web.config] | ||||||||||
| indent_size = 4 | ||||||||||
| end_of_line = lf | ||||||||||
|
|
||||||||||
| [*.{xml,xaml,json}] | ||||||||||
| # EOL should be normalized by Git. Setting to lf seems to mess up on Windows Hosts sometimes. See https://github.com/unoplatform/uno.templates/issues/1501 | ||||||||||
| end_of_line = unset | ||||||||||
|
|
||||||||||
| [*.cs] | ||||||||||
| # EOL should be normalized by Git. See https://github.com/dotnet/format/issues/1099 | ||||||||||
|
|
||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The PR title contains a spelling error: 'intendation' should be 'indentation'. This same terminology issue appears to be reflected in the configuration grouping.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in the configuration grouping I would not see this wrong spelled. Updated the title either way. rewording the branch would cancel the whole PR, which seems like unrequired trouble.