Skip to content

Commit ab96a7f

Browse files
authored
Merge pull request #49 from xuchenhan-tri/update-2022-6-23
Merge google upstream as of 2022-06-23
2 parents 15afd9a + e9e7e92 commit ab96a7f

19 files changed

+3844
-1156
lines changed

.github/issue_template_ignored.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
This repository publishes copies of Google's internal style guides to
2+
assist developers working on Google owned and originated open source
3+
projects. Development on these guides does not take place here.
4+
5+
Substantive changes to the style rules and suggested new rules should
6+
not be submitted as issues in this repository. Material changes must be
7+
proposed, discussed, and approved on the internal forums first.
8+
9+
If an issue points out a simple mistake — a typo, a broken link, etc. —
10+
then a correction might be made. However there is no commitment to do
11+
so. Issues are normally closed without comment.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
These style guides are copies of Google's internal style guides to
2+
assist developers working on Google owned and originated open source
3+
projects. Changes should be made to the internal style guide first and
4+
only then copied here.
5+
6+
Unsolicited pull requests will not be merged and are usually closed
7+
without comment. If a PR points out a simple mistake — a typo, a broken
8+
link, etc. — then the correction can be made internally and copied here
9+
through the usual process.
10+
11+
Substantive changes to the style rules and suggested new rules should
12+
not be submitted as a PR in this repository. Material changes must be
13+
proposed, discussed, and approved on the internal forums first.

CODE_OF_CONDUCT.md

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, caste, color, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Repo maintainers are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Repo maintainers have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Attribution
60+
61+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
62+
version 2.0, available at
63+
[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
64+
65+
Community Impact Guidelines were inspired by
66+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
67+
68+
For answers to common questions about this code of conduct, see the FAQ at
69+
[https://www.contributor-covenant.org/faq][FAQ].
70+
71+
[homepage]: https://www.contributor-covenant.org
72+
[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
73+
[Mozilla CoC]: https://github.com/mozilla/diversity
74+
[FAQ]: https://www.contributor-covenant.org/faq

README.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ style guidelines we use for Google code. If you are modifying a project that
164164
originated at Google, you may be pointed to this page to see the style guides
165165
that apply to that project.
166166

167-
This project holds the [C++ Style Guide][cpp], [C# Style Guide][csharp],
167+
This project holds the [C++ Style Guide][cpp], [C# Style Guide][csharp],
168168
[Swift Style Guide][swift], [Objective-C Style Guide][objc],
169169
[Java Style Guide][java], [Python Style Guide][py], [R Style Guide][r],
170170
[Shell Style Guide][sh], [HTML/CSS Style Guide][htmlcss],
171-
[JavaScript Style Guide][js], [AngularJS Style Guide][angular],
171+
[JavaScript Style Guide][js], [TypeScript Style Guide][ts], [AngularJS Style Guide][angular],
172172
[Common Lisp Style Guide][cl], and [Vimscript Style Guide][vim]. This project
173173
also contains [cpplint][cpplint], a tool to assist with style guide compliance,
174174
and [google-c-style.el][emacs], an Emacs settings file for Google style.
@@ -185,6 +185,19 @@ See [https://creativecommons.org/licenses/by/3.0/][ccl] for more details.
185185
The following Google style guides live outside of this project:
186186
[Go Code Review Comments][go] and [Effective Dart][dart].
187187

188+
189+
## Contributing
190+
191+
With few exceptions, these style guides are copies of Google's internal style guides
192+
to assist developers working on Google owned and originated open source projects.
193+
Changes to the style guides are made to the internal style guides first and
194+
eventually copied into the versions found here. **External contributions are
195+
not accepted.**
196+
Pull requests are regularly closed without comment.
197+
Issues that raise questions, justify changes on technical merits,
198+
or point out obvious mistakes may get some engagement and could in theory lead to changes,
199+
but we are primarily optimizing for Google's internal needs.
200+
188201
<a rel="license" href="https://creativecommons.org/licenses/by/3.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/3.0/88x31.png" /></a>
189202

190203

@@ -198,6 +211,7 @@ The following Google style guides live outside of this project:
198211
[sh]: https://google.github.io/styleguide/shellguide.html
199212
[htmlcss]: https://google.github.io/styleguide/htmlcssguide.html
200213
[js]: https://google.github.io/styleguide/jsguide.html
214+
[ts]: https://google.github.io/styleguide/tsguide.html
201215
[angular]: https://google.github.io/styleguide/angularjs-google-style.html
202216
[cl]: https://google.github.io/styleguide/lispguide.xml
203217
[vim]: https://google.github.io/styleguide/vimscriptguide.xml

0 commit comments

Comments
 (0)