Skip to content

Commit 75745a8

Browse files
runxelrunxel
committed
Globals styling fix
1 parent aa3d42f commit 75745a8

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎GDL.sublime-syntax‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ contexts:
372372
(?ix)\b(GLOB_(SCRIPT_TYPE|CONTEXT|SCALE|DRAWING_BGD_PEN|MODPAR_NAME|WORLD_ORIGO_OFFSET_[XY]
373373
|FRAME_NR|(FIRST|LAST)_FRAME|(EYE|TARG)POS_[XYZ]|SUN_A(ZIMUTH|LTITUDE)|UI_BUTTON_ID|CUTPLANES_INFO
374374
|STRUCTURE_DISPLAY|VIEW_TYPE|(PREVIEW|FEEDBACK|SEO_TOOL)_MODE))
375-
(?=$|\s)
375+
\b
376376
scope: keyword.gdl.globals.general
377377
378378
- match: (?i)\b(GLOB_([HC]STORY_(ELEV|HEIGHT)|CH_STORY_DIST))\b
@@ -381,19 +381,19 @@ contexts:
381381
- match: (?i)\b(GLOB_(LAYER|ID|INTGUID|ELEVATION|ELEM_TYPE))\b
382382
scope: keyword.gdl.globals.elementparameters
383383

384-
- match: (?i)\b(SYMB_((LINETYPE|FILL(_PEN)?)|(FBGD|SECT|VIEW)+_PEN|MAT|POS_[XYZ]|ROTANGLE|MIRRORED|[ABZ]+_SIZE))(?=$|\s)
384+
- match: (?i)\b(SYMB_((LINETYPE|FILL(_PEN)?)|(FBGD|SECT|VIEW)+_PEN|MAT|POS_[XYZ]|ROTANGLE|MIRRORED|[ABZ]+_SIZE))\b
385385
scope: keyword.gdl.globals.objectparameters
386386

387387
- match: |-
388388
(?ix)\b(WIDO_(REVEAL_(ON|SIDE)|SILL(_HEIGHT)?|(R|OPR)SIDE_SILL_HEIGHT|(RIGHT|LEFT)_JAMB|(THRES|HEAD)_DEPTH|((R|OPR)SIDE_)?HEAD_HEIGHT
389389
|(FRAME|SUBFL)_THICKNESS|POSITION|ORIENTATION|MARKER_TXT|PREFIX|CUSTOM_MARKER|ORIG_DIST|PWALL_INSET|(N_)?(R|OPR)SIDE_(WIDTH|HEIGHT|SURF)|VOLUME|GROSS_(SURFACE|VOLUME)))
390-
(?=$|\s)
390+
\b
391391
scope: keyword.gdl.globals.window
392392
393393
- match: |-
394394
(?ix)\b(LABEL_(POSITION|CUSTOM_ARROW|ARROW((HEAD)?_PEN|LINETYPE)|FONT_(NAME|STYLE(2)?)|TEXT_(SIZE|(BG_)?PEN|ALIGN|LEADING|WIDTH_FACT|WRAP|CHARSPACE_FACT)
395395
|CHARSPACE_FACT|FRAME_(ON|OFFSET)|ANCHOR_POS|ROTANGLE|ALWAYS_READABLE|ASSOC_ELEM_ORIENTATION))
396-
(?=$|\s)
396+
\b
397397
scope: keyword.gdl.globals.label
398398
399399
- match: |-
@@ -407,7 +407,7 @@ contexts:
407407
(?ix)\b(COLU_(CORE(_(X|Y|FILL(_PEN)?|FBGD_PEN|((GROSS|TOP|BOT)_)?SURF|(GROSS_)?VOL|GROSS_TOPBOT_SURF|BMAT(_NAME)?))?
408408
|VENEER_(FILL(_PEN)?|FBGD_PEN|WIDTH|VOL|(TOP_|BOT_)?SURF|GROSS_((TOPBOT_)?SURF|VOL)|BMAT(_NAME)?)|((MIN|MAX)_)?HEIGHT|DIM[12]|MAT|LINETYPE|(SECT|VIEW)_PEN
409409
|PERIMETER|AREA|(GROSS_)?VOLUME|CROSSSECTION_TYPE|PROFILE_NAME))
410-
(?=$|\s)
410+
\b
411411
scope: keyword.gdl.globals.column
412412
413413
- match: |-
@@ -419,14 +419,14 @@ contexts:
419419
- match: |-
420420
(?ix)\b(SLAB_(THICKNESS|MAT_(TOP|EDGE|BOTT)|LINETYPE|FILL(_PEN)?|ELEVATION_(TOP|BOTTOM)|BMAT(_NAME)?|(FBGD|SECT|VIEW)+_PEN|COMPS_NAME|SKINS_(NUMBER|PARAMS|BMAT_NAMES)
421421
|PERIMETER|(GROSS_)?(TOP|BOT|EDGE)_SURF|(TOP|BOT)_SURF_CON|VOLUME(_CON)?|GROSS_VOLUME|GROSS_((TOP|BOT|EDGE)_SURF|VOLUME)_WITH_HOLES|SEGMENTS_NR|HOLES_(NR|AREA|PRM)))
422-
(?=$|\s)
422+
\b
423423
scope: keyword.gdl.globals.slab
424424
425425
- match: |-
426426
(?ix)\b(ROOF_(THICKNESS|ANGLE|MAT_(TOP|EDGE|BOTT)|LINETYPE|FILL(_PEN)?|BMAT(_NAME)?|(FBGD|SECT|VIEW)+_PEN|COMPS_NAME|SKINS_(NUMBER|PARAMS|BMAT_NAMES)
427427
|(GROSS_)?(TOP|BOTTOM|EDGE)_SURF|(TOP|BOTTOM)_SURF_CON|PERIMETER|VOLUME(_CON)?|GROSS_VOLUME|SEGMENTS_NR|HOLES_(NR|AREA|PRM)|CONTOUR_AREA|INSU_THICKNESS
428428
|RIDGE|VALLEY|GABLE|HIP|EAVES|PEAK|(SIDE|END)_WALL|TRANSITION_(DOME|HOLLOW)))
429-
(?=$|\s)
429+
\b
430430
scope: keyword.gdl.globals.roof
431431
432432
- match: (?i)\b(FILL_(LINETYPE|FILL(_PEN|_CATEGORY)?|PEN|BMAT_NAME|FBGD_PEN|SURF|PERIMETER|SEGMENT_NR|HOLES_(NR|AREA|PRM)))\b
@@ -450,7 +450,7 @@ contexts:
450450
- match: |-
451451
(?ix)\b(STAIR2D_((FULL|LOWER|MIDDLE|UPPER)_((TPOLYGON|RPOLYLINE|WALKLINE)_(GEOM|FLAGS)|BOUNDARY_GEOM)|BREAKMARK_(GEOM|FLAGS|ANGLE)
452452
|(EXT_(TPOLYGON|RPOLYLINE)|DRAIN_TPOLYGON|POLYLINES)_(GEOM|FLAGS)|STRUCT_ATTRIBUTES|LAYOUT_TYPES|DESCRIPTION_POSITION|CURRSTORY_LOCATION|VISIBILITY|CUSTOMDISPLAY))
453-
(?=$|\s)
453+
\b
454454
scope: keyword.gdl.globals.stair.2D
455455
456456
- match: (?i)\b(RAILING_(HEIGHT|(3D|HORIZONTAL_)LENGTH|VOLUME|NR_OF_(SEGMENTS|POSTS|BALUSTERS|PANELS|RAILS)))\b
@@ -459,7 +459,7 @@ contexts:
459459
- match: |-
460460
(?ix)(RAIL(_(CONNECTING_POSTS(_NUM)?|TYPE|POLYLINE_GEOMETRY|SEGMENT_FLAGS|CUTS|COMPONENTS|SLANT_ANGLE)|ING(_REFLINE_DISTANCE|PANEL_(TYPE|(UNCUT_)?GEOMETRY|FLAGS|SIDE_OFFSETS
461461
|(SLANT|SKEW)_ANGLE)|POST_(TYPE|TOP_COORD|(SEGMENT_)?CUTS)|END_DIRECTION_AND_ANGLE)))
462-
(?=$|\s)
462+
\b
463463
scope: keyword.gdl.globals.railing.3D
464464
465465
- match: (?i)\b(RAIL2D_((FULL|LOWER|MIDDLE|UPPER)_((POLY(LINE|GON)_(GEOM|FLAGS))|VISIBILITY)|CUSTOMDISPLAY)|RAILPOST2D_VISIBILITY)\b
@@ -478,7 +478,7 @@ contexts:
478478
(?ix)\b(SHELLBASE_(THICKNESS|MAT_(REFERENCE|EDGE|OPPOSITE)|LINETYPE|FILL(_PEN)?|FBGD_PEN|(COMPS|BMAT)_NAME|BMAT|SKINS_(NUMBER|PARAMS|BMAT_NAMES)|(SECT|VIEW)_PEN
479479
|(COND_|GROSS_)?(REFERENCE|OPPOSITE)_SURF|(GROSS_)?EDGE_SURF|PERIMETER|(GROSS_|COND_)?VOLUME|HOLES_(NR|SURF|PRM)|OPENINGS_(NR|SURF)|INSU_THICKNESS
480480
|RIDGE|VALLEY|GABLE|HIP|EAVES|PEAK|(END|SIDE)_WALL|TRANSITION_(DOME|HOLLOW)))
481-
(?=$|\s)
481+
\b
482482
scope: keyword.gdl.globals.shell
483483
484484
- match: (?i)\b(MORPH_(LINETYPE|FILL(_PEN)?|BMAT(_NAME)?|FBGD_PEN|SECT_LINETYPE|(SECT|VIEW)_PEN|SOLID|MAT_DEFAULT|(CASTS|RECEIVES)_SHADOW|SURFACE|VOLUME|FLOOR_PERIMETER))\b
@@ -504,12 +504,12 @@ contexts:
504504

505505
request-param:
506506
- match: |-
507-
(?ix)(?<=")((BLUE|RED|GREEN)_OF_(PEN|MATERIAL)|GDL_VERSION|MODEL_SIZE|PEN_OF_RGB|PROGRAM|SERIAL_NUMBER|ANCESTRY_INFO|(ANGULAR_(LENGTH_)?|AREA_|RADIAL_|SILL_HEIGHT_)DIMENSION
507+
(?ix)\b((BLUE|RED|GREEN)_OF_(PEN|MATERIAL)|GDL_VERSION|MODEL_SIZE|PEN_OF_RGB|PROGRAM|SERIAL_NUMBER|ANCESTRY_INFO|(ANGULAR_(LENGTH_)?|AREA_|RADIAL_|SILL_HEIGHT_)DIMENSION
508508
|(ASSOCEL|MATCHING)_PROPERTIES|ASSOCLP_(NAME|PARVALUE)|CALC_(ANGLE|AREA|LENGTH|VOLUME)_UNIT|CLEAN_INTERSECTIONS|CONSTR_FILLS_DISPLAY|CUSTOM_AUTO_LABEL|DATETIME|DOOR_SHOW_DIM
509509
|(ELEVATION|LEVEL|LINEAR)_DIMENSION|FONTNAMES_LIST|HEIGHT_OF_STYLE|HOME(_STORY|DB_INFO)|ID_OF_MAIN|INTERNAL_ID|Full_ID_of_parent|NAME_OF_(FILL|LINE_TYPE|LISTED|MACRO|MAIN|MATERIAL|PLAN|PROGRAM|STYLE)
510510
|REFERENCE_DATA_LEVEL|RGB_OF_(MATERIAL|PEN)|STORY(_INFO)?|(STYLE|TEXTBLOCK)_INFO|WINDOW_(DOOR_(DIMENSION|SHOW_DIM|ZONE_RELEV)|SHOW_DIM)|WORKING_(ANGLE|LENGTH)_UNIT|ZONE_(CATEGORY|COLUS_AREA|RELATIONS)
511511
|MATERIAL_INFO|COMPONENT_(PROJECTED_AREA|VOLUME))
512-
(?="|\s)
512+
\b
513513
scope: keyword.gdl.globals.request
514514
515515
################# Buffer ##################

‎Preferences/GDL.sublime-completions‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
{ "trigger": "ADDGROUP{2}", "contents": "ADDGROUP{2} (\"${1:g_expr1}\", \"${2:g_expr2}\", ${3:edgeColor}, ${4:materialId}, ${5:materialColor})" },
1010
{ "trigger": "ADDGROUP{3}", "contents": "ADDGROUP{3} (\"${1:g_expr1}\", \"${2:g_expr2}\", ${3:edgeColor}, ${4:materialId}, ${5:materialColor})" },
1111
"ADDITIONAL_DATA",
12-
{ "trigger": "ADDX", "contents": "ADDX ${1:dx}" },
13-
{ "trigger": "ADDY", "contents": "ADDY ${1:dy}" },
14-
{ "trigger": "ADDZ", "contents": "ADDZ ${1:dz}" },
12+
{ "trigger": "ADDx", "contents": "ADDx ${1:dx}" },
13+
{ "trigger": "ADDy", "contents": "ADDy ${1:dy}" },
14+
{ "trigger": "ADDz", "contents": "ADDz ${1:dz}" },
1515
"ALL",
1616
"AND",
1717
{ "trigger": "APPLICATION_QUERY", "contents": "APPLICATION_QUERY (${1:values})" },
@@ -161,13 +161,13 @@
161161
"MODEL",
162162
{ "trigger": "MUL", "contents": "MUL ${1:mx}, ${2:my}, ${3:mz}" },
163163
{ "trigger": "MUL2", "contents": "MUL2 ${1:x}, ${2:y}" },
164-
{ "trigger": "MULX", "contents": "MULX ${1:mx}" },
165-
{ "trigger": "MULY", "contents": "MULY ${1:my}" },
166-
{ "trigger": "MULZ", "contents": "MULZ ${1:mz}" },
164+
{ "trigger": "MULx", "contents": "MULx ${1:mx}" },
165+
{ "trigger": "MULy", "contents": "MULy ${1:my}" },
166+
{ "trigger": "MULz", "contents": "MULz ${1:mz}" },
167167
{ "trigger": "NEWPARAMETER", "contents": "NEWPARAMETER ${1:name}, ${2:type}" },
168168
{ "trigger": "NOT", "contents": "NOT(${1:x})" },
169169
"NSP",
170-
{ "trigger": "NTR", "contents": "NTR(${1:x})" },
170+
{ "trigger": "NTR", "contents": "NTR()" },
171171
"OBJECTS",
172172
{ "trigger": "OPEN", "contents": "OPEN (${1:filter}, ${2:filename}, ${3:parameter})" },
173173
{ "trigger": "OUTPUT", "contents": "OUTPUT ${1:channel}, ${2:recordID}, ${3:fieldID}, ${4:expression}" },
@@ -243,9 +243,9 @@
243243
"ROOMS",
244244
{ "trigger": "ROT", "contents": "ROT ${1:x}, ${2:y}, ${3:z}, ${4:alpha}" },
245245
{ "trigger": "ROT2", "contents": "ROT2 ${1:alpha}" },
246-
{ "trigger": "ROTX", "contents": "ROTX ${1:alphaX}" },
247-
{ "trigger": "ROTY", "contents": "ROTY ${1:alphaY}" },
248-
{ "trigger": "ROTZ", "contents": "ROTZ ${1:alphaZ}" },
246+
{ "trigger": "ROTx", "contents": "ROTx ${1:alphaX}" },
247+
{ "trigger": "ROTy", "contents": "ROTy ${1:alphaY}" },
248+
{ "trigger": "ROTz", "contents": "ROTz ${1:alphaZ}" },
249249
{ "trigger": "ROUND_INT", "contents": "ROUND_INT(${1:x})" },
250250
"RULED",
251251
"RULED{2}",

0 commit comments

Comments
 (0)