Skip to content

Commit dc4414b

Browse files
authored
Update code_style_guidelines.rst
add visual studio power tools, grammar fixes
1 parent 5b41f5e commit dc4414b

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

contributing/development/code_style_guidelines.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ file of the Godot repository.
3131

3232
As long as you ensure that your style matches the surrounding code and that you
3333
not introducing trailing whitespace or space-based indentation, you should be
34-
fine. If you plan to contribute regularly however, we strongly advise that you
35-
setup clang-format locally to check and automatically fix all your commits.
34+
fine. If you plan to contribute regularly, however, we strongly advise that you
35+
set up clang-format locally to check and automatically fix all your commits.
3636

3737
.. warning:: Godot's code style should *not* be applied to third-party code,
3838
i.e. that is included in Godot's source tree but was not written
39-
specifically for our project. Such code usually come from
39+
specifically for our project. Such code usually comes from
4040
different upstream projects with their own style guides (or lack
4141
thereof), and don't want to introduce differences that would make
4242
syncing with upstream repositories harder.
@@ -81,7 +81,7 @@ You then have different possibilities to apply clang-format to your changes:
8181
Manual usage
8282
^^^^^^^^^^^^
8383

84-
You can apply clang-format manually one or more files with the following
84+
You can apply clang-format manually for one or more files with the following
8585
command:
8686

8787
::
@@ -102,7 +102,7 @@ For ease of use, we provide a pre-commit hook for Git that will run
102102
clang-format automatically on all your commits to check them, and let you apply
103103
its changes in the final commit.
104104

105-
This "hook" is a script which can be found in ``misc/hooks``, refer to that
105+
This "hook" is a script that can be found in ``misc/hooks``, refer to that
106106
folder's README.md for installation instructions.
107107

108108
If your clang-format is not in the ``PATH``, you may have to edit the
@@ -114,18 +114,18 @@ IDE plugin
114114
^^^^^^^^^^
115115

116116
Most IDEs or code editors have beautifier plugins that can be configured to run
117-
clang-format automatically, for example each time you save a file.
117+
clang-format automatically, for example, each time you save a file.
118118

119119
Here is a non-exhaustive list of beautifier plugins for some IDEs:
120120

121121
- Qt Creator: `Beautifier plugin <https://doc.qt.io/qtcreator/creator-beautifier.html>`__
122122
- Visual Studio Code: `Clang-Format <https://marketplace.visualstudio.com/items?itemName=xaver.clang-format>`__
123-
- Visual Studio: `ClangFormat <https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.ClangFormat>`__
123+
- Visual Studio: `Clang Power Tools 2022 <https://marketplace.visualstudio.com/items?itemName=caphyon.ClangPowerTools2022>`__
124124
- vim: `vim-clang-format <https://github.com/rhysd/vim-clang-format>`__
125125
- CLion: Starting from version ``2019.1``, no plugin is required. Instead, enable
126126
`ClangFormat <https://www.jetbrains.com/help/clion/clangformat-as-alternative-formatter.html#clion-support>`__
127127

128-
(Pull requests welcome to extend this list with tested plugins.)
128+
(Pull requests are welcome to extend this list with tested plugins.)
129129

130130
.. _doc_code_style_guidelines_header_includes:
131131

@@ -307,7 +307,7 @@ Editor integration
307307
^^^^^^^^^^^^^^^^^^
308308

309309
Many IDEs or code editors have beautifier plugins that can be configured to run
310-
black automatically, for example each time you save a file. For details you can
310+
black automatically, for example, each time you save a file. For details, you can
311311
check `Black editor integration <https://github.com/psf/black#editor-integration>`__.
312312

313313
Comment style guide

0 commit comments

Comments
 (0)