210979 2020-04-24 10:55:50 -0700 check-webkit-style should recognize *Internal.h and *Private.h as primary headers 2020-04-24 11:43:13 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=210724 https://bugs.webkit.org/show_bug.cgi?id=210974 InRadar P2 Normal --- 1 ddkilzer ddkilzer darin ews-watchlist glenn jbedard webkit-bug-importer oldest_to_newest 1645270 0 ddkilzer 2020-04-24 10:55:50 -0700 check-webkit-style should recognize *Internal.h and *Private.h as primary headers. For example, see style bot results from Bug 210974, Attachment #397471: ERROR: Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm:29: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebKit/UIProcess/API/Cocoa/_WKActivatedElementInfo.mm:29: Alphabetical sorting problem. [build/include_order] [4] <https://ews-build.webkit.org/#/builders/6/builds/19650> 1645278 1 397472 ddkilzer 2020-04-24 11:07:37 -0700 Created attachment 397472 Patch v1 1645282 2 397472 darin 2020-04-24 11:09:35 -0700 Comment on attachment 397472 Patch v1 When making changes like this I like the idea of running check-webkit-style across the whole source tree, but there are probably *so* many messages when doing that, it’s not a great thing. 1645283 3 ddkilzer 2020-04-24 11:16:00 -0700 (In reply to Darin Adler from comment #2) > Comment on attachment 397472 [details] > Patch v1 > > When making changes like this I like the idea of running check-webkit-style > across the whole source tree, but there are probably *so* many messages when > doing that, it’s not a great thing. You can do that by only running the checker you care about like this: $ ./Tools/Scripts/check-webkit-style --filter=-,+build/include_order Source Tools But there still might be^H^H^Hare a lot of build/include_order warnings. (Too many "WARNING: File exempt from style guide. Skipping: ..." warnings as well.) For example, just running on Source/WebKit: $ ./Tools/Scripts/check-webkit-style --filter=-,+build/include_order Source/WebKit [...] Total errors found: 291 in 3961 files We probably need to break out "build/include_order" warnings into subcategories like build/include_order/alphabetical_sorting and build/include_order/missing_config_h eventually. 1645287 4 397472 ddkilzer 2020-04-24 11:18:14 -0700 Comment on attachment 397472 Patch v1 Adding cq+ early since webkitpy tests passed, and this is a change that only affects check-webkit-style. 1645298 5 ews-feeder 2020-04-24 11:42:58 -0700 Committed r260659: <https://trac.webkit.org/changeset/260659> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397472. 1645299 6 webkit-bug-importer 2020-04-24 11:43:13 -0700 <rdar://problem/62328013> 397472 2020-04-24 11:07:37 -0700 2020-04-24 11:42:58 -0700 Patch v1 bug-210979-20200424110939.patch text/plain 3177 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTk2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTJmZWM1MTk2NjYwMzNjMDc4MTQyZDQxMGI5Y2Q1OWIx OWQ5MDMwOS4uMzhmZjM2OTdmNzJlYTQ3NDJkYjk4YTdlYmE4ODAyNzcxZmQ0Mzk1ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDIwLTA0LTI0ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgY2hlY2std2Via2l0LXN0eWxlIHNob3VsZCByZWNvZ25pemUgKkludGVybmFsLmggYW5k ICpQcml2YXRlLmggYXMgcHJpbWFyeSBoZWFkZXJzCisgICAgICAgIDxodHRwczovL3dlYmtpdC5v cmcvYi8yMTA5Nzk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weToKKyAgICAgICAg KF9jbGFzc2lmeV9pbmNsdWRlKTogSWYgYSBoZWFkZXIgaGFzIGFuICJJbnRlcm5hbC5oIiBvciBh CisgICAgICAgICJQcml2YXRlLmgiIHN1ZmZpeCB3aXRoIHRoZSBzYW1lIGJhc2UgbmFtZSBhcyB0 aGUgc291cmNlIGZpbGUsCisgICAgICAgIGNvbnNpZGVyIGl0IGEgcHJpbWFyeSBoZWFkZXItLXRo ZSBoZWFkZXIgdGhhdCBjb21lcyBhZnRlcgorICAgICAgICAiY29uZmlnLmgiLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5OgorICAgICAg ICAoT3JkZXJPZkluY2x1ZGVzVGVzdC50ZXN0X2NsYXNzaWZ5X2luY2x1ZGUpOiBBZGQgdGVzdHMu CisKIDIwMjAtMDQtMjMgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+ CiAKICAgICAgICAgQWxsIElUUCBkYXRhYmFzZSB0YWJsZXMgc2hvdWxkIHJlZmVyZW5jZSB0aGUg T2JzZXJ2ZWREb21haW5zIHRhYmxlIG9uIERFTEVURSBDQVNDQURFCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CmluZGV4IDEzNmE4YjNjMDMwODljNzkwYzFl ZGE5YTE2ODEwZDk2NWNjYTdmNjUuLjA5ZGNhMWM3ZDBjMGVhNjk0YmQzNTNhYmI3OGE1OGFiM2Q0 NDY1MzkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMv Y3BwLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5 CkBAIC0zMjI1LDYgKzMyMjUsOCBAQCBkZWYgX2NsYXNzaWZ5X2luY2x1ZGUoZmlsZW5hbWUsIGlu Y2x1ZGUsIGlzX3N5c3RlbSwgaW5jbHVkZV9zdGF0ZSk6CiAgICAgaWYgbm90IGluY2x1ZGVfc3Rh dGUudmlzaXRlZF9wcmltYXJ5X3NlY3Rpb24oKToKICAgICAgICAgaWYgdGFyZ2V0X2Jhc2UuZmlu ZChpbmNsdWRlX2Jhc2UpICE9IC0xOgogICAgICAgICAgICAgcmV0dXJuIF9QUklNQVJZX0hFQURF UgorICAgICAgICBpZiBpbmNsdWRlX2Jhc2UgaW4gWyd7fUludGVybmFsJy5mb3JtYXQodGFyZ2V0 X2Jhc2UpLCAne31Qcml2YXRlJy5mb3JtYXQodGFyZ2V0X2Jhc2UpXToKKyAgICAgICAgICAgIHJl dHVybiBfUFJJTUFSWV9IRUFERVIKIAogICAgICMgSWYgd2UgYWxyZWFkeSBlbmNvdW50ZXJlZCBh IHByaW1hcnkgaGVhZGVyLCBwZXJmb3JtIGEgc3RyaWN0IGNvbXBhcmlzb24uCiAgICAgIyBJbiBj YXNlIHRoZSB0d28gZmlsZW5hbWUgYmFzZXMgYXJlIHRoZSBzYW1lIHRoZW4gdGhlIGFib3ZlIGxl bmllbnQgY2hlY2sKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hl Y2tlcnMvY3BwX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2Vycy9jcHBfdW5pdHRlc3QucHkKaW5kZXggYmRmNzA3YWJmYjliNzBmMDg1MTNiN2U4MGE1NDdm ZTU0ZTZjN2I0Yy4uODRjMjU4ZmU2ZjQ4MmFhZmViZDMyNzNlZjJlZTVkNGU5ZTIzNjkwZCAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRl c3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5p dHRlc3QucHkKQEAgLTM1NTcsNiArMzU1NywxNSBAQCBjbGFzcyBPcmRlck9mSW5jbHVkZXNUZXN0 KENwcFN0eWxlVGVzdEJhc2UpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAnXG4nCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcjaW5j bHVkZSAiUmVzb3VyY2VIYW5kbGVXaW4uaCJcbicsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICcnKQorICAgICAgICAjIEludGVybmFsLmggYW5kIFByaXZhdGUuaCBo ZWFkZXJzIGFyZSBwcmltYXJ5IGhlYWRlcnMuCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY3Bw X3N0eWxlLl9QUklNQVJZX0hFQURFUiwKKyAgICAgICAgICAgICAgICAgICAgICAgICBjbGFzc2lm eV9pbmNsdWRlKCdXS1dlYlByb2Nlc3NQbHVnSW5Ob2RlSGFuZGxlLm1tJywKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdXS1dlYlByb2Nlc3NQbHVnSW5Ob2RlSGFu ZGxlSW50ZXJuYWwuaCcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBGYWxzZSwgaW5jbHVkZV9zdGF0ZSkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY3BwX3N0 eWxlLl9QUklNQVJZX0hFQURFUiwKKyAgICAgICAgICAgICAgICAgICAgICAgICBjbGFzc2lmeV9p bmNsdWRlKCdXS1dlYlByb2Nlc3NQbHVnSW5Ob2RlSGFuZGxlLm1tJywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICdXS1dlYlByb2Nlc3NQbHVnSW5Ob2RlSGFuZGxl UHJpdmF0ZS5oJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEZh bHNlLCBpbmNsdWRlX3N0YXRlKSkKIAogICAgIGRlZiB0ZXN0X3RyeV9kcm9wX2NvbW1vbl9zdWZm aXhlcyhzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnZm9vL2ZvbycsIGNwcF9zdHls ZS5fZHJvcF9jb21tb25fc3VmZml4ZXMoJ2Zvby9mb28taW5sLmgnKSkK