Skip to content

Commit c7c054e

Browse files
authored
Add .toml and .cff rules to .editorconfig, and clean up file comments (#7994)
This adds a missing indentation rule for `.toml` files, and adds `.cff` to the YAML section. Also, this PR removes needless comments and comment verbosity.
1 parent cd63aad commit c7c054e

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

.editorconfig

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,13 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16-
# Common editor configurations for this project.
17-
#
18-
# EditorConfig is a file format for specifying some common style parameters.
19-
# Many IDEs & editors read .editorconfig files, either natively or via plugins.
20-
# We mostly follow Google's style guides (https://google.github.io/styleguide/)
21-
# with only a few deviations for line length and indentation in some files.
22-
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
23-
2415
root = true
2516

17+
# We mostly follow Google style guides (https://google.github.io/styleguide/)
18+
# with only a few deviations for line length and indentation in some files.
19+
20+
# IMPORTANT: some of the other config files (.clang-format, etc.) also have
21+
# the same settings and need to be updated if changes are made to this file.
2622
[*]
2723
charset = utf-8
2824
indent_style = space
@@ -32,21 +28,19 @@ trim_trailing_whitespace = true
3228
max_line_length = 100
3329

3430
[{*.ts,*.js}]
35-
# Google style guidelines use 2.
3631
indent_size = 2
3732

3833
[*.json]
39-
# Not stated explicitly in Google's guidelines, but the examples use 2.
4034
indent_size = 2
4135

4236
[*.py]
43-
# Google style guidelines use 4.
4437
indent_size = 4
4538

4639
[*.sh]
47-
# Google style guidelines use 2.
4840
indent_size = 4
4941

50-
[{*.yaml,*.yml}]
51-
# Google doesn't have style guidelines for YAML. Most people use indent = 2.
42+
[*.toml]
43+
indent_size = 4
44+
45+
[{*.yaml,*.yml,*.cff}]
5246
indent_size = 2

0 commit comments

Comments
 (0)