145954 2015-06-12 19:33:07 -0700 Web Inspector: Improve some cases of "Object?" Type Annotations 2015-06-15 12:17:35 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck jonowells mattbaker nvasilyev saam timothy webkit-bug-importer oldest_to_newest 1101783 0 joepeck 2015-06-12 19:33:07 -0700 * SUMMARY Improve some cases of "Object?" Type Annotations. If a type is (Object | NullOrUndefined) and no other primitives just show an "Object?" annotation instead of a nice "LeastCommonAncestor?" annotation. * TEST <script> class Person {}; function personOrNullAndUndefined(person) {} // Person? personOrNullAndUndefined(new Person); personOrNullAndUndefined(null); personOrNullAndUndefined(undefined); function personOrStringOrNullAndUndefined(thing) {} // Object? personOrStringOrNullAndUndefined(new Person); personOrStringOrNullAndUndefined(null); personOrStringOrNullAndUndefined(undefined); personOrStringOrNullAndUndefined("string"); function personOrBooleanOrNullAndUndefined(thing) {} // (many) personOrStringOrNullAndUndefined(new Person); personOrStringOrNullAndUndefined(null); personOrStringOrNullAndUndefined(undefined); personOrStringOrNullAndUndefined(false); </script> 1101784 1 joepeck 2015-06-12 19:35:45 -0700 > function personOrBooleanOrNullAndUndefined(thing) {} // (many) > personOrStringOrNullAndUndefined(new Person); > personOrStringOrNullAndUndefined(null); > personOrStringOrNullAndUndefined(undefined); > personOrStringOrNullAndUndefined(false); Err, these should obviously be calling the right function. heh 1101785 2 254848 joepeck 2015-06-12 19:38:08 -0700 Created attachment 254848 [PATCH] Proposed Fix 1101786 3 joepeck 2015-06-12 19:39:57 -0700 Noticed this by looking at PropertyPath's constructor. Parameters with: "PropertyPath | Undefined" showed "Object?" expected "PropertyPath?" "RemoteObject | Null" showed "Object?" expected "RemoteObject?" After the path this looks as expected. 1101797 4 saam 2015-06-12 23:12:16 -0700 Looks good to me. I'd r+ if I could. 1101798 5 254848 saam 2015-06-12 23:13:56 -0700 Comment on attachment 254848 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=254848&action=review > Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js:135 > + if (this._typeDescription.leastCommonAncestor) { This is a good catch. > Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js:138 > if (typeSet.isContainedIn(WebInspector.TypeSet.TypeBit.Object | WebInspector.TypeSet.NullOrUndefinedTypeBits)) This branch doesn't even make sense given the above branch above will preclude things that primitive types from coming through. 1101799 6 saam 2015-06-12 23:14:37 -0700 (In reply to comment #5) > Comment on attachment 254848 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=254848&action=review > > > Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js:135 > > + if (this._typeDescription.leastCommonAncestor) { > > This is a good catch. > > > Source/WebInspectorUI/UserInterface/Views/TypeTokenView.js:138 > > if (typeSet.isContainedIn(WebInspector.TypeSet.TypeBit.Object | WebInspector.TypeSet.NullOrUndefinedTypeBits)) > > This branch doesn't even make sense given the above branch above will > preclude things that primitive types from coming through. Err: This should be past tense. It didn't make sense before. It makes sense now. 1101995 7 254848 commit-queue 2015-06-15 12:17:30 -0700 Comment on attachment 254848 [PATCH] Proposed Fix Clearing flags on attachment: 254848 Committed r185562: <http://trac.webkit.org/changeset/185562> 1101996 8 commit-queue 2015-06-15 12:17:35 -0700 All reviewed patches have been landed. Closing bug. 254848 2015-06-12 19:38:08 -0700 2015-06-15 12:17:30 -0700 [PATCH] Proposed Fix types.patch text/plain 1935 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDY2MDk4YTcuLmY0YmRmMzEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE1LTA2LTEyICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wcm92 ZSBzb21lIGNhc2VzIG9mICJPYmplY3Q/IiBUeXBlIEFubm90YXRpb25zCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU5NTQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv VHlwZVRva2VuVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UeXBlVG9rZW5WaWV3LnBy b3RvdHlwZS5fZGlzcGxheVR5cGVOYW1lKToKKyAgICAgICAgVGhlIFR5cGVTZXQgaW5jbHVzaW9u cyBjb3ZlciBhbGwgdHlwZXMsIHNvIHdlIGNhbiB1c2UgdGhlIGxlYXN0Q29tbW9uQW5jZXN0b3IK KyAgICAgICAgbmFtZSBhcyBsb25nIGFzIHRoZSB0eXBlIHNldCBpcyBqdXN0IG9iamVjdCBvciBv YmplY3QgYW5kIG51bGwvdW5kZWZpbmVkLgorICAgICAgICBJZiB0aGUgdHlwZXNldCBpbmNsdWRl cyBvdGhlciBwcmltaXRpdmVzIHRoZW4gaXQgd2lsbCBncmFjZWZ1bGx5IGdvIGRvd24KKyAgICAg ICAgYmVsb3cgdG8gYmVjb21lIHNvbWV0aGluZyBsaWtlIE9iamVjdCBvciAobWFueSkuIAorCisy MDE1LTA2LTEyICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAg ICAgV2ViIEluc3BlY3RvcjogY29uc29sZS50YWJsZSgpIHdpdGggYSBsaXN0IG9mIG9iamVjdHMg bm8gbG9uZ2VyIHdvcmtzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDU5NTIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVHlwZVRva2VuVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1R5cGVUb2tlblZpZXcuanMKaW5kZXggNzRjNzQyZS4uYmEzYjFi NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VHlwZVRva2VuVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9UeXBlVG9rZW5WaWV3LmpzCkBAIC0xMzIsNyArMTMyLDcgQEAgV2ViSW5zcGVjdG9y LlR5cGVUb2tlblZpZXcgPSBjbGFzcyBUeXBlVG9rZW5WaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9y Lk9iamVjdAogCiAgICAgICAgIHZhciB0eXBlU2V0ID0gdGhpcy5fdHlwZURlc2NyaXB0aW9uLnR5 cGVTZXQ7CiAKLSAgICAgICAgaWYgKHRoaXMuX3R5cGVEZXNjcmlwdGlvbi5sZWFzdENvbW1vbkFu Y2VzdG9yICYmICF0aGlzLl90eXBlRGVzY3JpcHRpb24udHlwZVNldC5wcmltaXRpdmVUeXBlTmFt ZXMubGVuZ3RoKSB7CisgICAgICAgIGlmICh0aGlzLl90eXBlRGVzY3JpcHRpb24ubGVhc3RDb21t b25BbmNlc3RvcikgewogICAgICAgICAgICAgaWYgKHR5cGVTZXQuaXNDb250YWluZWRJbihXZWJJ bnNwZWN0b3IuVHlwZVNldC5UeXBlQml0Lk9iamVjdCkpCiAgICAgICAgICAgICAgICAgcmV0dXJu IHRoaXMuX3R5cGVEZXNjcmlwdGlvbi5sZWFzdENvbW1vbkFuY2VzdG9yOwogICAgICAgICAgICAg aWYgKHR5cGVTZXQuaXNDb250YWluZWRJbihXZWJJbnNwZWN0b3IuVHlwZVNldC5UeXBlQml0Lk9i amVjdCB8IFdlYkluc3BlY3Rvci5UeXBlU2V0Lk51bGxPclVuZGVmaW5lZFR5cGVCaXRzKSkK