Changeset 143440 in webkit
- Timestamp:
- Feb 20, 2013 1:44:37 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r143439 r143440 1 2013-02-20 Andrey Lushnikov <lushnikov@chromium.org> 2 3 Web Inspector: highlight undefined word in JavaScript 4 https://bugs.webkit.org/show_bug.cgi?id=109585 5 6 Reviewed by Vsevolod Vlasov. 7 8 Enhance layout test to verify highlighting of global object value properties. 9 10 * inspector/syntax-highlight-javascript-expected.txt: 11 * inspector/syntax-highlight-javascript.html: 12 1 13 2013-02-20 Mike West <mkwst@chromium.org> 2 14 -
trunk/LayoutTests/inspector/syntax-highlight-javascript-expected.txt
r141987 r143440 18 18 {0: true}: webkit-block-start,webkit-javascript-number,*,webkit-whitespace,webkit-javascript-keyword,webkit-block-end 19 19 var toString;: webkit-javascript-keyword,webkit-whitespace,webkit-javascript-ident,* 20 var foo = undefined;: webkit-javascript-keyword,webkit-whitespace,webkit-javascript-ident,webkit-whitespace,*,webkit-whitespace,webkit-javascript-undef,* 21 var foo = Infinity;: webkit-javascript-keyword,webkit-whitespace,webkit-javascript-ident,webkit-whitespace,*,webkit-whitespace,webkit-javascript-inf,* 22 var foo = NaN;: webkit-javascript-keyword,webkit-whitespace,webkit-javascript-ident,webkit-whitespace,*,webkit-whitespace,webkit-javascript-nan,* 20 23 -
trunk/LayoutTests/inspector/syntax-highlight-javascript.html
r86554 r143440 25 25 dumpSyntaxHighlightJS("{0: true}"); 26 26 dumpSyntaxHighlightJS("var toString;"); 27 dumpSyntaxHighlightJS("var foo = undefined;"); 28 dumpSyntaxHighlightJS("var foo = Infinity;"); 29 dumpSyntaxHighlightJS("var foo = NaN;"); 27 30 28 31 InspectorTest.completeTest(); -
trunk/Source/WebCore/ChangeLog
r143439 r143440 1 2013-02-20 Andrey Lushnikov <lushnikov@chromium.org> 2 3 Web Inspector: highlight undefined word in JavaScript 4 https://bugs.webkit.org/show_bug.cgi?id=109585 5 6 Reviewed by Vsevolod Vlasov. 7 8 Test enhancement: inspector/syntax-highlight-javascript.html 9 10 Add global object value properties to tokenizer and add a css style 11 class to highlight "undefined" with gray color. 12 13 * inspector/front-end/SourceJavaScriptTokenizer.js: 14 (WebInspector.SourceJavaScriptTokenizer.prototype.nextToken): 15 * inspector/front-end/SourceJavaScriptTokenizer.re2js: 16 * inspector/front-end/inspectorSyntaxHighlight.css: 17 (.webkit-javascript-undef): 18 1 19 2013-02-20 Mike West <mkwst@chromium.org> 2 20 -
trunk/Source/WebCore/inspector/front-end/SourceJavaScriptTokenizer.js
r141987 r143440 1 /* Generated by re2c 0.13.5 on Wed Feb 6 13:24:522013 */1 /* Generated by re2c 0.13.5 on Tue Feb 19 16:16:47 2013 */ 2 2 /* 3 3 * Copyright (C) 2009 Google Inc. All rights reserved. … … 78 78 ].keySet(); 79 79 80 WebInspector.SourceJavaScriptTokenizer.GlobalObjectValueProperties = { 81 "NaN": "javascript-nan", 82 "undefined": "javascript-undef", 83 "Infinity": "javascript-inf" 84 }; 85 80 86 WebInspector.SourceJavaScriptTokenizer.prototype = { 81 87 createInitialCondition: function() … … 279 285 { 280 286 var token = this._line.substring(cursorOnEnter, cursor); 281 if (WebInspector.SourceJavaScriptTokenizer.Keywords[token] === true && token !== "__proto__") 287 if (WebInspector.SourceJavaScriptTokenizer.GlobalObjectValueProperties.hasOwnProperty(token)) 288 this.tokenType = WebInspector.SourceJavaScriptTokenizer.GlobalObjectValueProperties[token]; 289 else if (WebInspector.SourceJavaScriptTokenizer.Keywords[token] === true && token !== "__proto__") 282 290 this.tokenType = "javascript-keyword"; 283 291 else … … 1237 1245 { 1238 1246 var token = this._line.substring(cursorOnEnter, cursor); 1239 if (WebInspector.SourceJavaScriptTokenizer.Keywords[token] === true && token !== "__proto__") 1247 if (WebInspector.SourceJavaScriptTokenizer.GlobalObjectValueProperties.hasOwnProperty(token)) 1248 this.tokenType = WebInspector.SourceJavaScriptTokenizer.GlobalObjectValueProperties[token]; 1249 else if (WebInspector.SourceJavaScriptTokenizer.Keywords[token] === true && token !== "__proto__") 1240 1250 this.tokenType = "javascript-keyword"; 1241 1251 else -
trunk/Source/WebCore/inspector/front-end/SourceJavaScriptTokenizer.re2js
r141987 r143440 77 77 ].keySet(); 78 78 79 WebInspector.SourceJavaScriptTokenizer.GlobalObjectValueProperties = { 80 "NaN": "javascript-nan", 81 "undefined": "javascript-undef", 82 "Infinity": "javascript-inf" 83 }; 84 79 85 WebInspector.SourceJavaScriptTokenizer.prototype = { 80 86 createInitialCondition: function() … … 174 180 { 175 181 var token = this._line.substring(cursorOnEnter, cursor); 176 if (WebInspector.SourceJavaScriptTokenizer.Keywords[token] === true && token !== "__proto__") 182 if (WebInspector.SourceJavaScriptTokenizer.GlobalObjectValueProperties.hasOwnProperty(token)) 183 this.tokenType = WebInspector.SourceJavaScriptTokenizer.GlobalObjectValueProperties[token]; 184 else if (WebInspector.SourceJavaScriptTokenizer.Keywords[token] === true && token !== "__proto__") 177 185 this.tokenType = "javascript-keyword"; 178 186 else -
trunk/Source/WebCore/inspector/front-end/inspectorSyntaxHighlight.css
r142447 r143440 49 49 .webkit-css-bang-keyword { 50 50 color: rgb(200, 0, 180); 51 } 52 53 .webkit-javascript-undef { 54 color: rgb(123, 123, 123); 51 55 } 52 56
Note: See TracChangeset
for help on using the changeset viewer.