@@ -37,7 +37,7 @@ patterns:
3737 name : keyword.gdl.transform
3838
3939# F U N C T I O N S
40- - begin : (?i)(NOT|ABS|CEIL|INT|FRA|ROUND_INT|SGN|ACS|ASN|ATN|COS|SIN|TAN|PI|EXP|LGT|LOG|SQR|MAX|MIN|RND|STR(\{2\})?|SPLIT|STW|STRLEN|STRSTR|STRSUB|STRTOUPPER|STRTOLOWER|VARDIM[12]|DIM| BITTEST|BITSET|REQ((UEST)(\{[23]\})?)?|IND|NTR|VARTYPE)(\()(.*?)
40+ - begin : (?i)(NOT|ABS|CEIL|INT|FRA|ROUND_INT|SGN|ACS|ASN|ATN|COS|SIN|TAN|PI|EXP|LGT|LOG|SQR|MAX|MIN|RND|STR(\{2\})?|SPLIT|STW|STRLEN|STRSTR|STRSUB|STRTOUPPER|STRTOLOWER|VARDIM[12]|BITTEST|BITSET|REQ((UEST)(\{[23]\})?)?|IND|NTR|VARTYPE)(\()(.*?)
4141 beginCaptures :
4242 ' 1 ' :
4343 name : keyword.other.special-method.gdl.functions
@@ -50,22 +50,25 @@ patterns:
5050 patterns :
5151 - include : ' #functions'
5252 - include : $self
53+ # DIM has no ()
54+ - match : (?i)(?<=^|\s)(?<=^|\s)(DIM)(\b)
55+ name : keyword.other.special-method.gdl.functions
5356
5457# 2D
55- - match : (?i)(?<=^|\s)((LINE|RECT|ARC|CIRCLE|WALLINE |WALLARC)2|SPLINE2[A]?|(PICTURE|WALLHOLE|WALLBLOCK)2(\{2\})?|POLY2(_?(A|B(\{[2-5]\})?)?))(?=$|\s)
58+ - match : (?i)(?<=^|\s)((LINE|RECT|ARC|CIRCLE|WALLLINE[2]? |WALLARC)2|SPLINE2[A]?|(PICTURE|WALLHOLE|WALLBLOCK)2(\{2\})?|POLY2(_?(A|B(\{[2-5]\})?)?))(?=$|\s)
5659 name : keyword.gdl.shape.2D
5760
58- - match : (?i)(?<=^|\s)(?<=^|\s)( (TEXT|RICHTEXT)2)(?=$|\s)
61+ - match : (?i)(?<=^|\s)((TEXT|RICHTEXT)2)(?=$|\s)
5962 name : keyword.gdl.text.2D.text
6063
6164# 3D
62- - match : (?i)(?<=^|\s)(BLOCK|CYLIND|CONE|SPHERE|ELLIPS|ELBOW|ARMC|ARME)(?=$|\s)
65+ - match : (?i)(?<=^|\s)(BLOCK|BRICK| CYLIND|CONE|SPHERE|ELLIPS|ELBOW|ARMC|ARME)(?=$|\s)
6366 name : keyword.gdl.shape.3D.basic
6467
6568- match : (?i)(?<=^|\s)((PLANE|POLY)(_?)|ARC|CIRCLE|LIN_|RECT)(?=$|\s)
6669 name : keyword.gdl.shape.3D.planar
6770
68- - match : (?i)(?<=^|\s)(SLAB(_?)|CSLAB_|CROOF_(\{[23 ]\})?|[CB]WALL_|XWALL_(\{[23]\})?|BEAM|MESH|POLYROOF(\{[23 ]\})?)(?=$|\s)
71+ - match : (?i)(?<=^|\s)(SLAB(_?)|CSLAB_|CROOF_(\{[2-4 ]\})?|[CB]WALL_|XWALL_(\{[23]\})?|BEAM|MESH|POLYROOF(\{[2-4 ]\})?)(?=$|\s)
6972 name : keyword.gdl.shape.3D.complex
7073
7174- match : (?i)(?<=^|\s)(BASE|BODY|COOR(\{[23]\})?|EDGE|PGON(\{[23]\})?|PIPG|TEVE|VECT|VERT(\{2\})?)(?=$|\s)
@@ -77,13 +80,13 @@ patterns:
7780- match : (?i)(?<=^|\s)(PRISM_?|[BFH]PRISM_|[CS]PRISM_(\{[234]\})?)(?=$|\s)
7881 name : keyword.gdl.shape.3D.prisms
7982
80- - match : (?i)(?<=^|\s)(PYRAMID|RULED(\{2\})?|EXTRUDE|SWEEP|TUBE[A]?|MASS(\{2\})?|COONS|REVOLVE(\{[2-5]\})?|(EXTRUDED|REVOLVED|RULED)SHELL(\{2 \})?|REVOLVEDSHELLANGULAR(\{2 \})?)(?=$|\s)
83+ - match : (?i)(?<=^|\s)(PYRAMID|RULED(\{2\})?|EXTRUDE|SWEEP|TUBE[A]?|MASS(\{2\})?|COONS|REVOLVE(\{[2-5]\})?|(EXTRUDED|REVOLVED|RULED)SHELL(\{[23] \})?|REVOLVEDSHELLANGULAR(\{[23] \})?)(?=$|\s)
8184 name : keyword.gdl.shape.3D.poly
8285
8386- match : (?i)(?<=^|\s)(CUT(PLANE(\{[23]\})?|POLY[A]?|FORM(\{2\})?|SHAPE|END)|WALL(HOLE|NICHE))(?=$|\s)
8487 name : keyword.gdl.shape.3D.cut
8588
86- - match : (?i)(?<=^|\s)((ISECT|SUB| PLACE|KILL)GROUP|ADDGROUP( \{[23]\})?|SWEEPGROUP(\{[2-4]\})?|ISECTLINES|CREATEGROUPWITHMATERIAL)(?=$|\s)
89+ - match : (?i)(?<=^|\s)((PLACE|KILL)GROUP|(ADD|ISECT|SUB)GROUP( \{[23]\})?|SWEEPGROUP(\{[2-4]\})?|ISECTLINES|CREATEGROUPWITHMATERIAL)(?=$|\s|\( )
8790 name : keyword.gdl.shape.3D.seo
8891
8992- match : (?i)(?<=^|\s)(TEXT|RICHTEXT)(?=$|\s)
@@ -106,7 +109,7 @@ patterns:
106109- match : (?i)(?<=^|\s)(DEFINE|SET|BASED_ON)(?=\s)
107110 name : storage.type.function.gdl
108111
109- - match : (?i)\b(PEN|RESOL|RADIUS|TOLER|MODEL|SHADOW|DRAWINDEX|LINE_(TYPE|PROPERTY)|SYMBOL_(LINE|FILL)|FILL[A]?|(EMPTY|TRANSLUCENT|IMAGE|(LINEAR|RADIAL)_GRADIENT)_FILL|FILLTYPES_MASK|MATERIAL|TEXTURE|STYLE(\{2\})?|PARAGRAPH|TEXTBLOCK |ADDITIONAL_DATA|SECT_(FILL|ATTRS))(?=$|\s|\+|\-|\^|\*{1,2}|\/|\=|<|>|<\=|>\=|<>|\#)
112+ - match : (?i)\b(PEN|RESOL|RADIUS|TOLER|MODEL|SHADOW|DRAWINDEX|LINE_(TYPE|PROPERTY)|SYMBOL_(LINE|FILL)|FILL[A]?|(EMPTY|TRANSLUCENT|IMAGE|(LINEAR|RADIAL)_GRADIENT)_FILL|FILLTYPES_MASK|MATERIAL|TEXTURE|STYLE(\{2\})?|(END)? PARAGRAPH|TEXTBLOCK_? |ADDITIONAL_DATA|SECT_(FILL|ATTRS))(?=$|\s|\+|\-|\^|\*{1,2}|\/|\=|<|>|<\=|>\=|<>|\#|, )
110113 name : support.type.gdl.attribute
111114
112115- match : (?i)\b(SOLID|SURFACE|WIRE)\b
@@ -124,15 +127,18 @@ patterns:
124127- match : (?i)(?<=^|\s)(COMPONENT|DESCRIPTOR|BINARYPROP|DATABASE_SET|POSITION|REF_(COMPONENT|DESCRIPTOR)|(SURFACE|VOLUME)3D|DRAWING[2]?)(?=$|\s)
125128 name : keyword.gdl.nongeo.properties
126129
127- - match : (?i)(?<=^|\s)(UI_(DIALOG|(CURRENT_)?PAGE|BUTTON|SEPARATOR|GROUPBOX|PICT|STYLE|OUTFIELD|INFIELD(\{[2-4]\})?|RADIOBUTTON(\{[2]\})?|TOOLTIP|LISTFIELD|LISTITEM(\{2\})?|COLORPICKER(\{2\})?|SLIDER(\{2\})?)|( CUSTOM_POPUP_(INFIELD|LISTITEM)(\{2\})?))(?=$|\s)
130+ - match : (?i)(?<=^|\s)(UI_(DIALOG|(CURRENT_)?PAGE|BUTTON|SEPARATOR|GROUPBOX|PICT(_BUTTON)? |STYLE|OUTFIELD|INFIELD(\{[2-4]\})?|RADIOBUTTON(\{[2]\})?|TOOLTIP|LISTFIELD|LISTITEM(\{2\})?|COLORPICKER(\{2\})?|SLIDER(\{2\})?| CUSTOM_POPUP_(INFIELD|LISTITEM)(\{2\})?))(?=$|\s)
128131 name : keyword.gdl.nongeo.ui
129132
130- - match : (?! )(?<=^|\s)(MIGRATIONWARNING|NEWPARAMETER|SETMIGRATIONGUID|DELETED_PAR_VALUE|STORED_PAR_VALUE)
133+ - match : (?i )(?<=^|\s)(MIGRATIONWARNING|NEWPARAMETER|SETMIGRATIONGUID|DELETED_PAR_VALUE|STORED_PAR_VALUE)(?=$|\s|\( )
131134 name : keyword.gdl.nongeo.migration
132135
133136- match : (?i)(?<=^|\s)(PRINT|OPEN|INPUT|OUTPUT|CLOSE|CALL|FILE_DEPENDENCE)(?=$|\s|\()
134137 name : keyword.gdl.extern
135138
139+ - match : (?i)(?<=^|\s)((INIT|CLOSE)ADDONSCOPE|(CALL|PREPARE)FUNCTION)(?=$|\s|\()
140+ name : keyword.gdl.addon
141+
136142# G L O B A L S
137143- match : (?i)(?<=^|\s|\+|\-|\^|\*|\*\*|\/|\=|<|>|<\=|>\=|<>|\#)(APPLICATION_QUERY|LIBRARYGLOBAL)(?=$|\s|\+|\-|\^|\*{1,2}|\/|\=|<|>|<\=|>\=|<>|\#|\()
138144 name : keyword.gdl.request
@@ -223,7 +229,7 @@ patterns:
223229
224230repository :
225231 functions :
226- begin : (?i)(NOT|ABS|CEIL|INT|FRA|ROUND_INT|SGN|ACS|ASN|ATN|COS|SIN|TAN|PI|EXP|LGT|LOG|SQR|MAX|MIN|RND|STR(\{2\})?|SPLIT|STW|STRLEN|STRSTR|STRSUB|STRTOUPPER|STRTOLOWER|VARDIM[12]|DIM| BITTEST|BITSET|REQ((UEST)(\{[23]\})?)?|IND|NTR|VARTYPE)(\()(.*?)
232+ begin : (?i)(NOT|ABS|CEIL|INT|FRA|ROUND_INT|SGN|ACS|ASN|ATN|COS|SIN|TAN|PI|EXP|LGT|LOG|SQR|MAX|MIN|RND|STR(\{2\})?|SPLIT|STW|STRLEN|STRSTR|STRSUB|STRTOUPPER|STRTOLOWER|VARDIM[12]|BITTEST|BITSET|REQ((UEST)(\{[23]\})?)?|IND|NTR|VARTYPE)(\()(.*?)
227233 beginCaptures :
228234 ' 1 ' :
229235 name : keyword.other.special-method.gdl.functions
0 commit comments