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 lots of spelling errors #7751

Merged
merged 10 commits into from
Aug 10, 2020
Merged

Conversation

peternewman
Copy link
Contributor

No description provided.

Copy link
Member

@acozzette acozzette left a comment

Choose a reason for hiding this comment

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

Thanks, @peternewman! I noted a handful of places where I think we might want to keep the original spelling but this is a great cleanup.

@@ -364,7 +364,7 @@ bool BinaryAndJsonConformanceSuite::ParseJsonResponse(

if (!test_message->ParseFromString(binary_protobuf)) {
GOOGLE_LOG(FATAL) << "INTERNAL ERROR: internal JSON->protobuf transcode "
<< "yielded unparseable proto.";
<< "yielded unparsable proto.";
Copy link
Member

Choose a reason for hiding this comment

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

I would say let's leave "unparseable" as it is--both spellings seem to be acceptable, and at least within Google the "unparseable" spelling is somewhat more common.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay will do, going through protobuf I've generated a PR to improve our dictionaries so I'll check this and perhaps make it more rare too codespell-project/codespell#1602

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Out of interest, do you have a source for that? I've tried various dictionary searches and Wiktionary seems to be the only real hit for the ea spelling? There's also this:
https://en.wikipedia.org/wiki/Wikipedia_talk:Lists_of_common_misspellings/P#parseable

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For info I made the whole codebase consistent:
534ecf7

Copy link
Member

Choose a reason for hiding this comment

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

I don't have a good public source, but I found that "parseable" has about 60% more usage in Google's internal monorepo compared to "parsable". It does seem like English dictionaries tend to prefer "parsable", though. Since there's no clear winner, I would say let's just leave the spellings as they are and not try to make them all consistent.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Curiously all the unparsable have no middle e. The pars(e)able's are 6/8 split. Anyway reverted.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Edit, obviously I'd made some of those changes, having reverted it's 18 spellings with an e and just 6 without. src/google/protobuf/compiler/parser_unittest.cc even manages to have both spellings in the same file!

Anyway all unpicked and ready for re-review.

conformance/text_format_conformance_suite.cc Outdated Show resolved Hide resolved
conformance/third_party/jsoncpp/json.h Outdated Show resolved Hide resolved
docs/csharp/proto2.md Outdated Show resolved Hide resolved
php/ext/google/protobuf/php-upb.h Outdated Show resolved Hide resolved
ruby/ext/google/protobuf_c/upb.h Outdated Show resolved Hide resolved
src/google/protobuf/compiler/plugin.cc Outdated Show resolved Hide resolved
src/google/protobuf/compiler/plugin.proto Outdated Show resolved Hide resolved
src/google/protobuf/compiler/subprocess.cc Outdated Show resolved Hide resolved
@peternewman peternewman requested a review from acozzette July 26, 2020 22:21
@acozzette acozzette merged commit e2cc2de into protocolbuffers:master Aug 10, 2020
@acozzette
Copy link
Member

@peternewman Thanks for cleaning up these spelling errors!

@peternewman
Copy link
Contributor Author

@peternewman Thanks for cleaning up these spelling errors!

No worries @acozzette .

#7752 adds an actual codespell action to keep these fixes there, here's some example output:
https://github.com/peternewman/protobuf/actions/runs/203133087

vesavlad pushed a commit to vesavlad/protobuf that referenced this pull request Sep 22, 2020
* Fix a typo

* Fix lots of spelling errors

* Fix a few more spelling mistakes

* s/parsable/parseable/

* Don't touch the third party files

* Cloneable is the preferred C# term

* Copyable is the preferred C++ term

* Revert "s/parsable/parseable/"

This reverts commit 534ecf7.

* Revert unparseable->unparsable corrections
gopherbot pushed a commit to protocolbuffers/protobuf-go that referenced this pull request May 19, 2022
Brought to you by codespell v2.1.0, using the command

	codespell -S .cache,vendor -L ot,ba,fo,unparseable -w

Note that the misspelled "unparseable" comes from the
github.com/protocolbuffers/protobuf, where it is explicitly ignored
(see [1] and some explanation at [2]), so we ignore it here, too.

[1] protocolbuffers/protobuf#7752
[2] protocolbuffers/protobuf#7751 (comment)

Change-Id: Ie1ca705db4f11df8ec8b22fdc22b6a6ee667ae5b
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/406845
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Lasse Folger <lassefolger@google.com>
bithium pushed a commit to bithium/protobuf that referenced this pull request Sep 4, 2023
* Fix a typo

* Fix lots of spelling errors

* Fix a few more spelling mistakes

* s/parsable/parseable/

* Don't touch the third party files

* Cloneable is the preferred C# term

* Copyable is the preferred C++ term

* Revert "s/parsable/parseable/"

This reverts commit 534ecf7.

* Revert unparseable->unparsable corrections
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants