27503 2009-07-21 08:51:06 -0700 Inspector: Should Syntax Highlight JSON 2009-07-24 00:51:48 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 0 joepeck webkit-unassigned abarth oldest_to_newest 133472 0 joepeck 2009-07-21 08:51:06 -0700 JSON syntax is a subset of Javascript and it would be nice if this were syntax highlighted in the SourceView. 133474 1 33179 joepeck 2009-07-21 09:05:52 -0700 Created attachment 33179 patch Most JSON is from an XHR and thus its resource.type is "WebInspector.Resource.Type.XHR". This patch therefore tries to also highlight resources that have a mime type of 'application/json' and even further if the resource ends in the common extension names ".js" or ".json". 133481 2 33180 joepeck 2009-07-21 09:17:48 -0700 Created attachment 33180 Test Page Test Case attached: 1. Test an XHR returned with mime type 'application/json' 2. Test as XHR returned with extensions '.js' or '.json' ignoring query parameters Everything works property with the patch. They are all black/white text in the current release. 133486 3 33182 joepeck 2009-07-21 09:28:40 -0700 Created attachment 33182 Added 'application/javascript' Added 'application/javascript'. Added to the test page. 134432 4 abarth 2009-07-24 00:51:48 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/SourceView.js Committed r46331 M WebCore/ChangeLog M WebCore/inspector/front-end/SourceView.js r46331 = 0b1049da038878886441c4299cc970f791be68d2 (trunk) No changes between current HEAD and refs/remotes/trunk Resetting to the latest refs/remotes/trunk http://trac.webkit.org/changeset/46331 33179 2009-07-21 09:05:52 -0700 2009-07-21 09:28:40 -0700 patch SyntaxHighlightJSON.patch text/plain 1438 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzczNTFhZC4uYzQ0MjBmOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAwOS0wNy0yMSAgSm9zZXBoIFBlY29y YXJvICA8am9lcGVjazAyQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbnNwZWN0b3I6IFNob3VsZCBTeW50YXggSGlnaGxpZ2h0IEpT T04KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3NTAz CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUuX2NvbnRlbnRMb2FkZWQpOgorCiAy MDA5LTA3LTIwICBBZGFtIExhbmdsZXkgIDxhZ2xAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZp ZXcuanMKaW5kZXggNzUxMGM4Yy4uMGI2OWI4OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NvdXJjZVZpZXcuanMKQEAgLTEwNCw4ICsxMDQsMTAgQEAgV2ViSW5zcGVjdG9yLlNvdXJj ZVZpZXcucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgZGVsZXRlIHRoaXMuX2ZyYW1lTmVl ZHNTZXR1cDsKICAgICAgICAgdGhpcy5zb3VyY2VGcmFtZS5yZW1vdmVFdmVudExpc3RlbmVyKCJj b250ZW50IGxvYWRlZCIsIHRoaXMuX2NvbnRlbnRMb2FkZWQsIHRoaXMpOwotCi0gICAgICAgIGlm ICh0aGlzLnJlc291cmNlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLlNjcmlw dCkgeworICAgICAgICAKKyAgICAgICAgaWYgKHRoaXMucmVzb3VyY2UudHlwZSA9PT0gV2ViSW5z cGVjdG9yLlJlc291cmNlLlR5cGUuU2NyaXB0CisgICAgICAgICAgICB8fCB0aGlzLnJlc291cmNl Lm1pbWVUeXBlID09PSAnYXBwbGljYXRpb24vanNvbicKKyAgICAgICAgICAgIHx8IC9cLmpzKG9u KT8kLy50ZXN0KHRoaXMucmVzb3VyY2UubGFzdFBhdGhDb21wb25lbnQpICkgewogICAgICAgICAg ICAgdGhpcy5zb3VyY2VGcmFtZS5hZGRFdmVudExpc3RlbmVyKCJzeW50YXggaGlnaGxpZ2h0aW5n IGNvbXBsZXRlIiwgdGhpcy5fc3ludGF4SGlnaGxpZ2h0aW5nQ29tcGxldGUsIHRoaXMpOwogICAg ICAgICAgICAgdGhpcy5zb3VyY2VGcmFtZS5zeW50YXhIaWdobGlnaHRKYXZhc2NyaXB0KCk7CiAg ICAgICAgIH0gZWxzZQ== 33180 2009-07-21 09:17:48 -0700 2009-07-21 09:17:48 -0700 Test Page url.txt text/plain 38 joepeck aHR0cDovL2JvZ29qb2tlci5jb20veC9qc29uLWhpZ2hsaWdodC8= 33182 2009-07-21 09:28:40 -0700 2009-07-23 11:26:41 -0700 Added 'application/javascript' patch.patch text/plain 1507 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzczNTFhZC4uYzQ0MjBmOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAwOS0wNy0yMSAgSm9zZXBoIFBlY29y YXJvICA8am9lcGVjazAyQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbnNwZWN0b3I6IFNob3VsZCBTeW50YXggSGlnaGxpZ2h0IEpT T04KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3NTAz CisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU291cmNlVmlldy5wcm90b3R5cGUuX2NvbnRlbnRMb2FkZWQpOgorCiAy MDA5LTA3LTIwICBBZGFtIExhbmdsZXkgIDxhZ2xAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Tb3VyY2VWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZVZp ZXcuanMKaW5kZXggNzUxMGM4Yy4uOTdhNWJkNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZVZpZXcuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NvdXJjZVZpZXcuanMKQEAgLTEwNCw4ICsxMDQsMTEgQEAgV2ViSW5zcGVjdG9yLlNvdXJj ZVZpZXcucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgZGVsZXRlIHRoaXMuX2ZyYW1lTmVl ZHNTZXR1cDsKICAgICAgICAgdGhpcy5zb3VyY2VGcmFtZS5yZW1vdmVFdmVudExpc3RlbmVyKCJj b250ZW50IGxvYWRlZCIsIHRoaXMuX2NvbnRlbnRMb2FkZWQsIHRoaXMpOwotCi0gICAgICAgIGlm ICh0aGlzLnJlc291cmNlLnR5cGUgPT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLlNjcmlw dCkgeworICAgICAgICAKKyAgICAgICAgaWYgKHRoaXMucmVzb3VyY2UudHlwZSA9PT0gV2ViSW5z cGVjdG9yLlJlc291cmNlLlR5cGUuU2NyaXB0CisgICAgICAgICAgICB8fCB0aGlzLnJlc291cmNl Lm1pbWVUeXBlID09PSAnYXBwbGljYXRpb24vanNvbicKKyAgICAgICAgICAgIHx8IHRoaXMucmVz b3VyY2UubWltZVR5cGUgPT09ICdhcHBsaWNhdGlvbi9qYXZhc2NyaXB0JworICAgICAgICAgICAg fHwgL1wuanMob24pPyQvLnRlc3QodGhpcy5yZXNvdXJjZS5sYXN0UGF0aENvbXBvbmVudCkgKSB7 CiAgICAgICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoInN5bnRheCBo aWdobGlnaHRpbmcgY29tcGxldGUiLCB0aGlzLl9zeW50YXhIaWdobGlnaHRpbmdDb21wbGV0ZSwg dGhpcyk7CiAgICAgICAgICAgICB0aGlzLnNvdXJjZUZyYW1lLnN5bnRheEhpZ2hsaWdodEphdmFz Y3JpcHQoKTsKICAgICAgICAgfSBlbHNlCg==