36573 2010-03-24 19:24:07 -0700 check-webkit-style should restore the original file name if it is used from Emacs's flymake so that it can get an correct header guard name 2010-03-29 23:08:45 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 hayato webkit-unassigned commit-queue oldest_to_newest 203733 0 hayato 2010-03-24 19:24:07 -0700 If users run check-webkit-style against header file (*.h) from Emacs's flymake, the file name might contain '_flymake' suffix in the end of the basename. So we have to restore original file name to get a correct header guard name. A similar change has already been committed to original cpplint.py. So I'd like to sync cpplint.py and cpp.py. 203806 1 51596 hayato 2010-03-24 22:31:10 -0700 Created attachment 51596 fix-header-guard-name-for-flymake 203823 2 51596 hamaji 2010-03-24 23:21:56 -0700 Comment on attachment 51596 fix-header-guard-name-for-flymake > - emacs_flymake_suffix = '_flymake.cpp' > - if abs_filename.endswith(emacs_flymake_suffix): > - abs_filename = abs_filename[:-len(emacs_flymake_suffix)] + '.cpp' > + abs_filename = re.sub(r'_flymake\.cpp$', '.cpp', abs_filename) Let me confirm, is this just a refactoring? > + # Special case for flymake > + error_collector = ErrorCollector(self.assert_) > + self.process_file_data('mydir/Foo_flymake.h', 'h', [], error_collector) > + self.assertEquals( > + 1, > + error_collector.result_list().count( > + 'No #ifndef header guard found, suggested CPP variable is: %s' > + ' [build/header_guard] [5]' % expected_guard), > + error_collector.result_list()) > + I guess what we want to ensure is "#ifndef Foo_h_" won't be warned when it is put in "Foo_flymake.h" ? If so, please add a test case for this case. By the way, I think putting your elisp to use check-webkit-style with flymake may help someone. Could you show it? 203932 3 51609 hayato 2010-03-25 01:51:57 -0700 Created attachment 51609 fix-header-guard-name-for-flymake 203938 4 hayato 2010-03-25 01:56:41 -0700 Thank you for the review. (In reply to comment #2) > (From update of attachment 51596 [details]) > > - emacs_flymake_suffix = '_flymake.cpp' > > - if abs_filename.endswith(emacs_flymake_suffix): > > - abs_filename = abs_filename[:-len(emacs_flymake_suffix)] + '.cpp' > > + abs_filename = re.sub(r'_flymake\.cpp$', '.cpp', abs_filename) > > Let me confirm, is this just a refactoring? Yes, it is just a refactoring. > > + # Special case for flymake > > + error_collector = ErrorCollector(self.assert_) > > + self.process_file_data('mydir/Foo_flymake.h', 'h', [], error_collector) > > + self.assertEquals( > > + 1, > > + error_collector.result_list().count( > > + 'No #ifndef header guard found, suggested CPP variable is: %s' > > + ' [build/header_guard] [5]' % expected_guard), > > + error_collector.result_list()) > > + > > I guess what we want to ensure is "#ifndef Foo_h_" won't be warned when it is > put in "Foo_flymake.h" ? If so, please add a test case for this case. I've add a test case. Thank you! > By the way, I think putting your elisp to use check-webkit-style with flymake > may help someone. Could you show it? Sure. It should be something like: (require 'flymake) (defun flymake-check-webkit-style-init () (list "check-webkit-style" (list (flymake-init-create-temp-buffer-copy 'flymake-create-temp-inplace)))) (add-to-list 'flymake-allowed-file-name-masks '("WebKit/.*\\.cpp\\'" flymake-check-webkit-style-init)) (add-to-list 'flymake-allowed-file-name-masks '("WebKit/.*\\.h\\'" flymake-check-webkit-style-init)) After evaluating the above elisp, just doing M-x flymake. 203956 5 51609 hamaji 2010-03-25 02:46:57 -0700 Comment on attachment 51609 fix-header-guard-name-for-flymake Looks good! Thanks for adding the test and showing your elisp-fu. 205863 6 51609 commit-queue 2010-03-29 23:08:41 -0700 Comment on attachment 51609 fix-header-guard-name-for-flymake Clearing flags on attachment: 51609 Committed r56763: <http://trac.webkit.org/changeset/56763> 205864 7 commit-queue 2010-03-29 23:08:45 -0700 All reviewed patches have been landed. Closing bug. 51596 2010-03-24 22:31:10 -0700 2010-03-25 01:51:52 -0700 fix-header-guard-name-for-flymake bug-36573-20100325143108.patch text/plain 2908 hayato ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4NDM2ZmUxLi4yOWM2OWNkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMt MjQgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSAnX2ZseW1ha2UnIHN1ZmZpeCBm cm9tIGJhc2UgcGFydCBvZiBmaWxlIG5hbWUgc28gdGhhdAorICAgICAgICBjaGVjay13ZWJraXQt c3R5bGUgdXNlcyBhIGNvcnJlY3QgaGVhZGVyIGd1YXJkIG5hbWUgd2hlbiBpdCBpcyBjYWxsZWQg ZnJvbSBFbWFjcydzIGZseW1ha2UuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM2NTczCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxl L3Byb2Nlc3NvcnMvY3BwLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvcHJv Y2Vzc29ycy9jcHBfdW5pdHRlc3QucHk6CisKIDIwMTAtMDMtMjMgIEVyaWMgU2VpZGVsICA8ZXJp Y0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL3Byb2Nlc3NvcnMvY3BwLnB5 IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9wcm9jZXNzb3JzL2NwcC5weQpv bGQgbW9kZSAxMDA2NDQKbmV3IG1vZGUgMTAwNzU1CmluZGV4IDgxNGI2MDcuLjAzMjQ2ZGEKLS0t IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9wcm9jZXNzb3JzL2NwcC5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL3Byb2Nlc3NvcnMvY3BwLnB5 CkBAIC02NDIsNiArNjQyLDEwIEBAIGRlZiBnZXRfaGVhZGVyX2d1YXJkX2NwcF92YXJpYWJsZShm aWxlbmFtZSk6CiAKICAgICAiIiIKIAorICAgICMgUmVzdG9yZXMgb3JpZ2luYWwgZmlsZW5hbWUg aW4gY2FzZSB0aGF0IHN0eWxlIGNoZWNrZXIgaXMgaW52b2tlZCBmcm9tIEVtYWNzJ3MKKyAgICAj IGZseW1ha2UuCisgICAgZmlsZW5hbWUgPSByZS5zdWIocidfZmx5bWFrZVwuaCQnLCAnLmgnLCBm aWxlbmFtZSkKKwogICAgIHJldHVybiBzdWIocidbLS5cc10nLCAnXycsIG9zLnBhdGguYmFzZW5h bWUoZmlsZW5hbWUpKQogCiAKQEAgLTI3NjksOSArMjc3Myw3IEBAIGRlZiBjaGVja19mb3JfaW5j bHVkZV93aGF0X3lvdV91c2UoZmlsZW5hbWUsIGNsZWFuX2xpbmVzLCBpbmNsdWRlX3N0YXRlLCBl cnJvciwKICAgICAjIGZvdW5kLgogICAgICMgZS5nLiBJZiB0aGUgZmlsZSBuYW1lIGlzICdmb29f Zmx5bWFrZS5jcHAnLCB3ZSBzaG91bGQgc2VhcmNoIGZvciAnZm9vLmgnCiAgICAgIyBpbnN0ZWFk IG9mICdmb29fZmx5bWFrZS5oJwotICAgIGVtYWNzX2ZseW1ha2Vfc3VmZml4ID0gJ19mbHltYWtl LmNwcCcKLSAgICBpZiBhYnNfZmlsZW5hbWUuZW5kc3dpdGgoZW1hY3NfZmx5bWFrZV9zdWZmaXgp OgotICAgICAgICBhYnNfZmlsZW5hbWUgPSBhYnNfZmlsZW5hbWVbOi1sZW4oZW1hY3NfZmx5bWFr ZV9zdWZmaXgpXSArICcuY3BwJworICAgIGFic19maWxlbmFtZSA9IHJlLnN1YihyJ19mbHltYWtl XC5jcHAkJywgJy5jcHAnLCBhYnNfZmlsZW5hbWUpCiAKICAgICAjIGluY2x1ZGVfc3RhdGUgaXMg bW9kaWZpZWQgZHVyaW5nIGl0ZXJhdGlvbiwgc28gd2UgaXRlcmF0ZSBvdmVyIGEgY29weSBvZgog ICAgICMgdGhlIGtleXMuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL3Byb2Nlc3NvcnMvY3BwX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9wcm9jZXNzb3JzL2NwcF91bml0dGVzdC5weQpvbGQgbW9kZSAxMDA2NDQK bmV3IG1vZGUgMTAwNzU1CmluZGV4IGM0NzM4ZjkuLmQ1NTFkYjMKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9wcm9jZXNzb3JzL2NwcF91bml0dGVzdC5weQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL3Byb2Nlc3NvcnMvY3BwX3VuaXR0ZXN0 LnB5CkBAIC0xNzM1LDYgKzE3MzUsMTYgQEAgY2xhc3MgQ3BwU3R5bGVUZXN0KENwcFN0eWxlVGVz dEJhc2UpOgogICAgICAgICAgICAgICAgICcgIFtidWlsZC9oZWFkZXJfZ3VhcmRdIFs1XScgJSBl eHBlY3RlZF9ndWFyZCksCiAgICAgICAgICAgICBlcnJvcl9jb2xsZWN0b3IucmVzdWx0X2xpc3Qo KSkKIAorICAgICAgICAjIFNwZWNpYWwgY2FzZSBmb3IgZmx5bWFrZQorICAgICAgICBlcnJvcl9j b2xsZWN0b3IgPSBFcnJvckNvbGxlY3RvcihzZWxmLmFzc2VydF8pCisgICAgICAgIHNlbGYucHJv Y2Vzc19maWxlX2RhdGEoJ215ZGlyL0Zvb19mbHltYWtlLmgnLCAnaCcsIFtdLCBlcnJvcl9jb2xs ZWN0b3IpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKAorICAgICAgICAgICAgMSwKKyAgICAg ICAgICAgIGVycm9yX2NvbGxlY3Rvci5yZXN1bHRfbGlzdCgpLmNvdW50KAorICAgICAgICAgICAg ICAgICdObyAjaWZuZGVmIGhlYWRlciBndWFyZCBmb3VuZCwgc3VnZ2VzdGVkIENQUCB2YXJpYWJs ZSBpczogJXMnCisgICAgICAgICAgICAgICAgJyAgW2J1aWxkL2hlYWRlcl9ndWFyZF0gWzVdJyAl IGV4cGVjdGVkX2d1YXJkKSwKKyAgICAgICAgICAgIGVycm9yX2NvbGxlY3Rvci5yZXN1bHRfbGlz dCgpKQorCiAgICAgZGVmIHRlc3RfYnVpbGRfcHJpbnRmX2Zvcm1hdChzZWxmKToKICAgICAgICAg c2VsZi5hc3NlcnRfbGludCgKICAgICAgICAgICAgIHIncHJpbnRmKCJcJSVkIiwgdmFsdWUpOycs Cg== 51609 2010-03-25 01:51:57 -0700 2010-03-29 23:08:41 -0700 fix-header-guard-name-for-flymake bug-36573-20100325175155.patch text/plain 3435 hayato ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4NDM2ZmUxLi4yOWM2OWNkIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMt MjQgIEhheWF0byBJdG8gIDxoYXlhdG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSAnX2ZseW1ha2UnIHN1ZmZpeCBm cm9tIGJhc2UgcGFydCBvZiBmaWxlIG5hbWUgc28gdGhhdAorICAgICAgICBjaGVjay13ZWJraXQt c3R5bGUgdXNlcyBhIGNvcnJlY3QgaGVhZGVyIGd1YXJkIG5hbWUgd2hlbiBpdCBpcyBjYWxsZWQg ZnJvbSBFbWFjcydzIGZseW1ha2UuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM2NTczCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxl L3Byb2Nlc3NvcnMvY3BwLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvcHJv Y2Vzc29ycy9jcHBfdW5pdHRlc3QucHk6CisKIDIwMTAtMDMtMjMgIEVyaWMgU2VpZGVsICA8ZXJp Y0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL3Byb2Nlc3NvcnMvY3BwLnB5 IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9wcm9jZXNzb3JzL2NwcC5weQpv bGQgbW9kZSAxMDA2NDQKbmV3IG1vZGUgMTAwNzU1CmluZGV4IDgxNGI2MDcuLjAzMjQ2ZGEKLS0t IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9wcm9jZXNzb3JzL2NwcC5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL3Byb2Nlc3NvcnMvY3BwLnB5 CkBAIC02NDIsNiArNjQyLDEwIEBAIGRlZiBnZXRfaGVhZGVyX2d1YXJkX2NwcF92YXJpYWJsZShm aWxlbmFtZSk6CiAKICAgICAiIiIKIAorICAgICMgUmVzdG9yZXMgb3JpZ2luYWwgZmlsZW5hbWUg aW4gY2FzZSB0aGF0IHN0eWxlIGNoZWNrZXIgaXMgaW52b2tlZCBmcm9tIEVtYWNzJ3MKKyAgICAj IGZseW1ha2UuCisgICAgZmlsZW5hbWUgPSByZS5zdWIocidfZmx5bWFrZVwuaCQnLCAnLmgnLCBm aWxlbmFtZSkKKwogICAgIHJldHVybiBzdWIocidbLS5cc10nLCAnXycsIG9zLnBhdGguYmFzZW5h bWUoZmlsZW5hbWUpKQogCiAKQEAgLTI3NjksOSArMjc3Myw3IEBAIGRlZiBjaGVja19mb3JfaW5j bHVkZV93aGF0X3lvdV91c2UoZmlsZW5hbWUsIGNsZWFuX2xpbmVzLCBpbmNsdWRlX3N0YXRlLCBl cnJvciwKICAgICAjIGZvdW5kLgogICAgICMgZS5nLiBJZiB0aGUgZmlsZSBuYW1lIGlzICdmb29f Zmx5bWFrZS5jcHAnLCB3ZSBzaG91bGQgc2VhcmNoIGZvciAnZm9vLmgnCiAgICAgIyBpbnN0ZWFk IG9mICdmb29fZmx5bWFrZS5oJwotICAgIGVtYWNzX2ZseW1ha2Vfc3VmZml4ID0gJ19mbHltYWtl LmNwcCcKLSAgICBpZiBhYnNfZmlsZW5hbWUuZW5kc3dpdGgoZW1hY3NfZmx5bWFrZV9zdWZmaXgp OgotICAgICAgICBhYnNfZmlsZW5hbWUgPSBhYnNfZmlsZW5hbWVbOi1sZW4oZW1hY3NfZmx5bWFr ZV9zdWZmaXgpXSArICcuY3BwJworICAgIGFic19maWxlbmFtZSA9IHJlLnN1YihyJ19mbHltYWtl XC5jcHAkJywgJy5jcHAnLCBhYnNfZmlsZW5hbWUpCiAKICAgICAjIGluY2x1ZGVfc3RhdGUgaXMg bW9kaWZpZWQgZHVyaW5nIGl0ZXJhdGlvbiwgc28gd2UgaXRlcmF0ZSBvdmVyIGEgY29weSBvZgog ICAgICMgdGhlIGtleXMuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL3Byb2Nlc3NvcnMvY3BwX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9wcm9jZXNzb3JzL2NwcF91bml0dGVzdC5weQpvbGQgbW9kZSAxMDA2NDQK bmV3IG1vZGUgMTAwNzU1CmluZGV4IGM0NzM4ZjkuLjcyMjU0OTMKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9wcm9jZXNzb3JzL2NwcF91bml0dGVzdC5weQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL3Byb2Nlc3NvcnMvY3BwX3VuaXR0ZXN0 LnB5CkBAIC0xNzM1LDYgKzE3MzUsMjYgQEAgY2xhc3MgQ3BwU3R5bGVUZXN0KENwcFN0eWxlVGVz dEJhc2UpOgogICAgICAgICAgICAgICAgICcgIFtidWlsZC9oZWFkZXJfZ3VhcmRdIFs1XScgJSBl eHBlY3RlZF9ndWFyZCksCiAgICAgICAgICAgICBlcnJvcl9jb2xsZWN0b3IucmVzdWx0X2xpc3Qo KSkKIAorICAgICAgICAjIFNwZWNpYWwgY2FzZSBmb3IgZmx5bWFrZQorICAgICAgICBlcnJvcl9j b2xsZWN0b3IgPSBFcnJvckNvbGxlY3RvcihzZWxmLmFzc2VydF8pCisgICAgICAgIHNlbGYucHJv Y2Vzc19maWxlX2RhdGEoJ215ZGlyL0Zvb19mbHltYWtlLmgnLCAnaCcsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgWycjaWZuZGVmICVzJyAlIGV4cGVjdGVkX2d1YXJkLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAnI2RlZmluZSAlcycgJSBleHBlY3RlZF9ndWFyZCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJyNlbmRpZiAvLyAlcycgJSBleHBlY3Rl ZF9ndWFyZF0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZXJyb3JfY29sbGVjdG9y KQorICAgICAgICBmb3IgbGluZSBpbiBlcnJvcl9jb2xsZWN0b3IucmVzdWx0X2xpc3QoKToKKyAg ICAgICAgICAgIGlmIGxpbmUuZmluZCgnYnVpbGQvaGVhZGVyX2d1YXJkJykgIT0gLTE6CisgICAg ICAgICAgICAgICAgc2VsZi5mYWlsKCdVbmV4cGVjdGVkIGVycm9yOiAlcycgJSBsaW5lKQorCisg ICAgICAgIGVycm9yX2NvbGxlY3RvciA9IEVycm9yQ29sbGVjdG9yKHNlbGYuYXNzZXJ0XykKKyAg ICAgICAgc2VsZi5wcm9jZXNzX2ZpbGVfZGF0YSgnbXlkaXIvRm9vX2ZseW1ha2UuaCcsICdoJywg W10sIGVycm9yX2NvbGxlY3RvcikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoCisgICAgICAg ICAgICAxLAorICAgICAgICAgICAgZXJyb3JfY29sbGVjdG9yLnJlc3VsdF9saXN0KCkuY291bnQo CisgICAgICAgICAgICAgICAgJ05vICNpZm5kZWYgaGVhZGVyIGd1YXJkIGZvdW5kLCBzdWdnZXN0 ZWQgQ1BQIHZhcmlhYmxlIGlzOiAlcycKKyAgICAgICAgICAgICAgICAnICBbYnVpbGQvaGVhZGVy X2d1YXJkXSBbNV0nICUgZXhwZWN0ZWRfZ3VhcmQpLAorICAgICAgICAgICAgZXJyb3JfY29sbGVj dG9yLnJlc3VsdF9saXN0KCkpCisKICAgICBkZWYgdGVzdF9idWlsZF9wcmludGZfZm9ybWF0KHNl bGYpOgogICAgICAgICBzZWxmLmFzc2VydF9saW50KAogICAgICAgICAgICAgcidwcmludGYoIlwl JWQiLCB2YWx1ZSk7JywK