Skip to content

Commit 1ef90c9

Browse files
REASREAS
committed
For color coding FUNCTION3 changes added
1 parent 0ff484b commit 1ef90c9

File tree

3 files changed

+34
-21
lines changed

3 files changed

+34
-21
lines changed

‎app/src/processing/app/syntax/Token.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ public class Token {
4848
/** Fields [variables within a class] */
4949
public static final byte KEYWORD2 = 7;
5050

51-
/** Processing variables (width, height, focused, etc.) */
51+
/** Loop/function-like blocks (for, while, etc.) */
5252
public static final byte KEYWORD3 = 8;
5353

54-
/** Flow structures (if, else, while, for, etc.) */
54+
/** Processing variables (width, height, focused, etc.) */
5555
public static final byte KEYWORD4 = 9;
5656

5757
/** Datatypes (int, boolean, etc.) */

‎java/keywords.txt‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,16 @@ synchronized KEYWORD4
243243
while KEYWORD4 while
244244
try KEYWORD4 try
245245

246+
catch FUNCTION3 catch
247+
do FUNCTION3
248+
for FUNCTION3 for
249+
if FUNCTION3 if
250+
#else FUNCTION3 else
251+
switch FUNCTION3 switch
252+
synchronized FUNCTION3
253+
while FUNCTION3 while
254+
try FUNCTION3 try
255+
246256

247257
# These items are a part of Processing but, but pages don't generate
248258

@@ -403,8 +413,8 @@ curveVertex FUNCTION1 curveVertex_
403413
day FUNCTION1 day_
404414
degrees FUNCTION1 degrees_
405415
directionalLight FUNCTION1 directionalLight_
406-
displayHeight KEYWORD3 displayHeight
407-
displayWidth KEYWORD3 displayWidth
416+
displayHeight KEYWORD4 displayHeight
417+
displayWidth KEYWORD4 displayWidth
408418
dist FUNCTION1 dist_
409419
draw FUNCTION1 draw_
410420
ellipse FUNCTION1 ellipse_
@@ -421,9 +431,9 @@ expand FUNCTION1 expand_
421431
fill FUNCTION1 fill_
422432
filter FUNCTION1 filter_
423433
floor FUNCTION1 floor_
424-
focused KEYWORD3 focused
425-
frameCount KEYWORD3 frameCount
426-
frameRate KEYWORD3 frameRate
434+
focused KEYWORD4 focused
435+
frameCount KEYWORD4 frameCount
436+
frameRate KEYWORD4 frameRate
427437
frameRate FUNCTION1 frameRate_
428438
frustum FUNCTION1 frustum_
429439
get FUNCTION1 get_
@@ -436,10 +446,10 @@ hue FUNCTION1 hue_
436446
image FUNCTION1 image_
437447
imageMode FUNCTION1 imageMode_
438448
join FUNCTION1 join_
439-
key KEYWORD3 key
440-
keyCode KEYWORD3 keyCode
449+
key KEYWORD4 key
450+
keyCode KEYWORD4 keyCode
441451
keyPressed FUNCTION1 keyPressed_
442-
keyPressed KEYWORD3 keyPressed
452+
keyPressed KEYWORD4 keyPressed
443453
keyReleased FUNCTION1 keyReleased_
444454
keyTyped FUNCTION1 keyTyped_
445455
lerp FUNCTION1 lerp_
@@ -471,15 +481,15 @@ modelX FUNCTION1 modelX_
471481
modelY FUNCTION1 modelY_
472482
modelZ FUNCTION1 modelZ_
473483
month FUNCTION1 month_
474-
mouseButton KEYWORD3 mouseButton
484+
mouseButton KEYWORD4 mouseButton
475485
mouseClicked FUNCTION1 mouseClicked_
476486
mouseDragged FUNCTION1 mouseDragged_
477487
mouseMoved FUNCTION1 mouseMoved_
478488
mousePressed FUNCTION1 mousePressed_
479-
mousePressed KEYWORD3 mousePressed
489+
mousePressed KEYWORD4 mousePressed
480490
mouseReleased FUNCTION1 mouseReleased_
481-
mouseX KEYWORD3 mouseX
482-
mouseY KEYWORD3 mouseY
491+
mouseX KEYWORD4 mouseX
492+
mouseY KEYWORD4 mouseY
483493
nf FUNCTION1 nf_
484494
nfc FUNCTION1 nfc_
485495
nfp FUNCTION1 nfp_
@@ -519,9 +529,9 @@ resize FUNCTION2 PImage_resize_
519529
save FUNCTION2 PImage_save_
520530
set FUNCTION2 PImage_set_
521531
updatePixels FUNCTION2 PImage_updatePixels_
522-
pixels KEYWORD3 pixels
523-
pmouseX KEYWORD3 pmouseX
524-
pmouseY KEYWORD3 pmouseY
532+
pixels KEYWORD4 pixels
533+
pmouseX KEYWORD4 pmouseX
534+
pmouseY KEYWORD4 pmouseY
525535
point FUNCTION1 point_
526536
pointLight FUNCTION1 pointLight_
527537
popMatrix FUNCTION1 popMatrix_
@@ -599,8 +609,8 @@ saveFrame FUNCTION1 saveFrame_
599609
saveStream FUNCTION1 saveStream_
600610
saveStrings FUNCTION1 saveStrings_
601611
scale FUNCTION1 scale_
602-
screenHeight KEYWORD3 screenHeight
603-
screenWidth KEYWORD3 screenWidth
612+
screenHeight KEYWORD4 screenHeight
613+
screenWidth KEYWORD4 screenWidth
604614
screenX FUNCTION1 screenX_
605615
screenY FUNCTION1 screenY_
606616
screenZ FUNCTION1 screenZ_

‎java/theme/theme.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,14 @@ editor.brackethighlight.color = #006699
7777

7878
editor.function1.style = #006699,plain
7979
editor.function2.style = #006699,plain
80+
editor.function3.style = #FF0000,plain
8081
editor.keyword1.style = #D86736,plain
8182
editor.keyword2.style = #EE3C96,plain
82-
editor.keyword3.style = #EE3C96,plain
83+
#editor.keyword3.style = #EE3C96,plain
84+
editor.keyword3.style = #FF0000,plain
8385
editor.keyword4.style = #669933,plain
84-
editor.keyword5.style = #D86736,plain
86+
#editor.keyword5.style = #D86736,plain
87+
editor.keyword5.style = #00FF00,plain
8588
editor.literal1.style = #7D4793,plain
8689
editor.literal2.style = #669933,plain
8790

0 commit comments

Comments
 (0)