udxcms 1.0.1 → 1.0.3

package/dist/components/cmsComponents/wiki/lib/highlight/lib/languages/llvm.js

@@ -2,27 +2,25 @@
  * @param {string} value
  * @returns {RegExp}
  * */
-
 /**
  * @param {RegExp | string } re
  * @returns {string}
  */
 function source(re) {
-  if (!re) return null;
-  if (typeof re === "string") return re;
-
-  return re.source;
+    if (!re)
+        return null;
+    if (typeof re === "string")
+        return re;
+    return re.source;
 }
-
 /**
  * @param {...(RegExp | string) } args
  * @returns {string}
  */
 function concat(...args) {
-  const joined = args.map((x) => source(x)).join("");
-  return joined;
+    const joined = args.map((x) => source(x)).join("");
+    return joined;
 }
-
 /*
 Language: LLVM IR
 Author: Michael Rodler <contact@f0rki.at>
@@ -31,124 +29,120 @@ Website: https://llvm.org/docs/LangRef.html
 Category: assembler
 Audit: 2020
 */
-
 /** @type LanguageFn */
 function llvm(hljs) {
-  const IDENT_RE = /([-a-zA-Z$._][\w$.-]*)/;
-  const TYPE = {
-    className: 'type',
-    begin: /\bi\d+(?=\s|\b)/
-  };
-  const OPERATOR = {
-    className: 'operator',
-    relevance: 0,
-    begin: /=/
-  };
-  const PUNCTUATION = {
-    className: 'punctuation',
-    relevance: 0,
-    begin: /,/
-  };
-  const NUMBER = {
-    className: 'number',
-    variants: [
-        { begin: /0[xX][a-fA-F0-9]+/ },
-        { begin: /-?\d+(?:[.]\d+)?(?:[eE][-+]?\d+(?:[.]\d+)?)?/ }
-    ],
-    relevance: 0
-  };
-  const LABEL = {
-    className: 'symbol',
-    variants: [
-        { begin: /^\s*[a-z]+:/ }, // labels
-    ],
-    relevance: 0
-  };
-  const VARIABLE = {
-    className: 'variable',
-    variants: [
-      { begin: concat(/%/, IDENT_RE) },
-      { begin: /%\d+/ },
-      { begin: /#\d+/ },
-    ]
-  };
-  const FUNCTION = {
-    className: 'title',
-    variants: [
-      { begin: concat(/@/, IDENT_RE) },
-      { begin: /@\d+/ },
-      { begin: concat(/!/, IDENT_RE) },
-      { begin: concat(/!\d+/, IDENT_RE) },
-      // https://llvm.org/docs/LangRef.html#namedmetadatastructure
-      // obviously a single digit can also be used in this fashion
-      { begin: /!\d+/ }
-    ]
-  };
-
-  return {
-    name: 'LLVM IR',
-    // TODO: split into different categories of keywords
-    keywords:
-      'begin end true false declare define global ' +
-      'constant private linker_private internal ' +
-      'available_externally linkonce linkonce_odr weak ' +
-      'weak_odr appending dllimport dllexport common ' +
-      'default hidden protected extern_weak external ' +
-      'thread_local zeroinitializer undef null to tail ' +
-      'target triple datalayout volatile nuw nsw nnan ' +
-      'ninf nsz arcp fast exact inbounds align ' +
-      'addrspace section alias module asm sideeffect ' +
-      'gc dbg linker_private_weak attributes blockaddress ' +
-      'initialexec localdynamic localexec prefix unnamed_addr ' +
-      'ccc fastcc coldcc x86_stdcallcc x86_fastcallcc ' +
-      'arm_apcscc arm_aapcscc arm_aapcs_vfpcc ptx_device ' +
-      'ptx_kernel intel_ocl_bicc msp430_intrcc spir_func ' +
-      'spir_kernel x86_64_sysvcc x86_64_win64cc x86_thiscallcc ' +
-      'cc c signext zeroext inreg sret nounwind ' +
-      'noreturn noalias nocapture byval nest readnone ' +
-      'readonly inlinehint noinline alwaysinline optsize ssp ' +
-      'sspreq noredzone noimplicitfloat naked builtin cold ' +
-      'nobuiltin noduplicate nonlazybind optnone returns_twice ' +
-      'sanitize_address sanitize_memory sanitize_thread sspstrong ' +
-      'uwtable returned type opaque eq ne slt sgt ' +
-      'sle sge ult ugt ule uge oeq one olt ogt ' +
-      'ole oge ord uno ueq une x acq_rel acquire ' +
-      'alignstack atomic catch cleanup filter inteldialect ' +
-      'max min monotonic nand personality release seq_cst ' +
-      'singlethread umax umin unordered xchg add fadd ' +
-      'sub fsub mul fmul udiv sdiv fdiv urem srem ' +
-      'frem shl lshr ashr and or xor icmp fcmp ' +
-      'phi call trunc zext sext fptrunc fpext uitofp ' +
-      'sitofp fptoui fptosi inttoptr ptrtoint bitcast ' +
-      'addrspacecast select va_arg ret br switch invoke ' +
-      'unwind unreachable indirectbr landingpad resume ' +
-      'malloc alloca free load store getelementptr ' +
-      'extractelement insertelement shufflevector getresult ' +
-      'extractvalue insertvalue atomicrmw cmpxchg fence ' +
-      'argmemonly double',
-    contains: [
-      TYPE,
-      // this matches "empty comments"...
-      // ...because it's far more likely this is a statement terminator in
-      // another language than an actual comment
-      hljs.COMMENT(/;\s*$/, null, { relevance: 0 }),
-      hljs.COMMENT(/;/, /$/),
-      hljs.QUOTE_STRING_MODE,
-      {
-        className: 'string',
+    const IDENT_RE = /([-a-zA-Z$._][\w$.-]*)/;
+    const TYPE = {
+        className: 'type',
+        begin: /\bi\d+(?=\s|\b)/
+    };
+    const OPERATOR = {
+        className: 'operator',
+        relevance: 0,
+        begin: /=/
+    };
+    const PUNCTUATION = {
+        className: 'punctuation',
+        relevance: 0,
+        begin: /,/
+    };
+    const NUMBER = {
+        className: 'number',
         variants: [
-          // Double-quoted string
-          { begin: /"/, end: /[^\\]"/ },
+            { begin: /0[xX][a-fA-F0-9]+/ },
+            { begin: /-?\d+(?:[.]\d+)?(?:[eE][-+]?\d+(?:[.]\d+)?)?/ }
+        ],
+        relevance: 0
+    };
+    const LABEL = {
+        className: 'symbol',
+        variants: [
+            { begin: /^\s*[a-z]+:/ }, // labels
+        ],
+        relevance: 0
+    };
+    const VARIABLE = {
+        className: 'variable',
+        variants: [
+            { begin: concat(/%/, IDENT_RE) },
+            { begin: /%\d+/ },
+            { begin: /#\d+/ },
+        ]
+    };
+    const FUNCTION = {
+        className: 'title',
+        variants: [
+            { begin: concat(/@/, IDENT_RE) },
+            { begin: /@\d+/ },
+            { begin: concat(/!/, IDENT_RE) },
+            { begin: concat(/!\d+/, IDENT_RE) },
+            // https://llvm.org/docs/LangRef.html#namedmetadatastructure
+            // obviously a single digit can also be used in this fashion
+            { begin: /!\d+/ }
+        ]
+    };
+    return {
+        name: 'LLVM IR',
+        // TODO: split into different categories of keywords
+        keywords: 'begin end true false declare define global ' +
+            'constant private linker_private internal ' +
+            'available_externally linkonce linkonce_odr weak ' +
+            'weak_odr appending dllimport dllexport common ' +
+            'default hidden protected extern_weak external ' +
+            'thread_local zeroinitializer undef null to tail ' +
+            'target triple datalayout volatile nuw nsw nnan ' +
+            'ninf nsz arcp fast exact inbounds align ' +
+            'addrspace section alias module asm sideeffect ' +
+            'gc dbg linker_private_weak attributes blockaddress ' +
+            'initialexec localdynamic localexec prefix unnamed_addr ' +
+            'ccc fastcc coldcc x86_stdcallcc x86_fastcallcc ' +
+            'arm_apcscc arm_aapcscc arm_aapcs_vfpcc ptx_device ' +
+            'ptx_kernel intel_ocl_bicc msp430_intrcc spir_func ' +
+            'spir_kernel x86_64_sysvcc x86_64_win64cc x86_thiscallcc ' +
+            'cc c signext zeroext inreg sret nounwind ' +
+            'noreturn noalias nocapture byval nest readnone ' +
+            'readonly inlinehint noinline alwaysinline optsize ssp ' +
+            'sspreq noredzone noimplicitfloat naked builtin cold ' +
+            'nobuiltin noduplicate nonlazybind optnone returns_twice ' +
+            'sanitize_address sanitize_memory sanitize_thread sspstrong ' +
+            'uwtable returned type opaque eq ne slt sgt ' +
+            'sle sge ult ugt ule uge oeq one olt ogt ' +
+            'ole oge ord uno ueq une x acq_rel acquire ' +
+            'alignstack atomic catch cleanup filter inteldialect ' +
+            'max min monotonic nand personality release seq_cst ' +
+            'singlethread umax umin unordered xchg add fadd ' +
+            'sub fsub mul fmul udiv sdiv fdiv urem srem ' +
+            'frem shl lshr ashr and or xor icmp fcmp ' +
+            'phi call trunc zext sext fptrunc fpext uitofp ' +
+            'sitofp fptoui fptosi inttoptr ptrtoint bitcast ' +
+            'addrspacecast select va_arg ret br switch invoke ' +
+            'unwind unreachable indirectbr landingpad resume ' +
+            'malloc alloca free load store getelementptr ' +
+            'extractelement insertelement shufflevector getresult ' +
+            'extractvalue insertvalue atomicrmw cmpxchg fence ' +
+            'argmemonly double',
+        contains: [
+            TYPE,
+            // this matches "empty comments"...
+            // ...because it's far more likely this is a statement terminator in
+            // another language than an actual comment
+            hljs.COMMENT(/;\s*$/, null, { relevance: 0 }),
+            hljs.COMMENT(/;/, /$/),
+            hljs.QUOTE_STRING_MODE,
+            {
+                className: 'string',
+                variants: [
+                    // Double-quoted string
+                    { begin: /"/, end: /[^\\]"/ },
+                ]
+            },
+            FUNCTION,
+            PUNCTUATION,
+            OPERATOR,
+            VARIABLE,
+            LABEL,
+            NUMBER
         ]
-      },
-      FUNCTION,
-      PUNCTUATION,
-      OPERATOR,
-      VARIABLE,
-      LABEL,
-      NUMBER
-    ]
-  };
+    };
 }
-
 module.exports = llvm;

package/dist/components/cmsComponents/wiki/lib/highlight/lib/languages/lsl.js

@@ -5,14 +5,11 @@ Author: Builder's Brewery <buildersbrewery@gmail.com>
 Website: http://wiki.secondlife.com/wiki/LSL_Portal
 Category: scripting
 */
-
 function lsl(hljs) {
-
     var LSL_STRING_ESCAPE_CHARS = {
         className: 'subst',
         begin: /\\[tn"\\]/
     };
-
     var LSL_STRINGS = {
         className: 'string',
         begin: '"',
@@ -21,13 +18,11 @@ function lsl(hljs) {
             LSL_STRING_ESCAPE_CHARS
         ]
     };
-
     var LSL_NUMBERS = {
         className: 'number',
-        relevance:0,
+        relevance: 0,
         begin: hljs.C_NUMBER_RE
     };
-
     var LSL_CONSTANTS = {
         className: 'literal',
         variants: [
@@ -51,12 +46,10 @@ function lsl(hljs) {
             }
         ]
     };
-
     var LSL_FUNCTIONS = {
         className: 'built_in',
         begin: '\\b(ll(AgentInExperience|(Create|DataSize|Delete|KeyCount|Keys|Read|Update)KeyValue|GetExperience(Details|ErrorMessage)|ReturnObjectsBy(ID|Owner)|Json(2List|[GS]etValue|ValueType)|Sin|Cos|Tan|Atan2|Sqrt|Pow|Abs|Fabs|Frand|Floor|Ceil|Round|Vec(Mag|Norm|Dist)|Rot(Between|2(Euler|Fwd|Left|Up))|(Euler|Axes)2Rot|Whisper|(Region|Owner)?Say|Shout|Listen(Control|Remove)?|Sensor(Repeat|Remove)?|Detected(Name|Key|Owner|Type|Pos|Vel|Grab|Rot|Group|LinkNumber)|Die|Ground|Wind|([GS]et)(AnimationOverride|MemoryLimit|PrimMediaParams|ParcelMusicURL|Object(Desc|Name)|PhysicsMaterial|Status|Scale|Color|Alpha|Texture|Pos|Rot|Force|Torque)|ResetAnimationOverride|(Scale|Offset|Rotate)Texture|(Rot)?Target(Remove)?|(Stop)?MoveToTarget|Apply(Rotational)?Impulse|Set(KeyframedMotion|ContentType|RegionPos|(Angular)?Velocity|Buoyancy|HoverHeight|ForceAndTorque|TimerEvent|ScriptState|Damage|TextureAnim|Sound(Queueing|Radius)|Vehicle(Type|(Float|Vector|Rotation)Param)|(Touch|Sit)?Text|Camera(Eye|At)Offset|PrimitiveParams|ClickAction|Link(Alpha|Color|PrimitiveParams(Fast)?|Texture(Anim)?|Camera|Media)|RemoteScriptAccessPin|PayPrice|LocalRot)|ScaleByFactor|Get((Max|Min)ScaleFactor|ClosestNavPoint|StaticPath|SimStats|Env|PrimitiveParams|Link(PrimitiveParams|Number(OfSides)?|Key|Name|Media)|HTTPHeader|FreeURLs|Object(Details|PermMask|PrimCount)|Parcel(MaxPrims|Details|Prim(Count|Owners))|Attached(List)?|(SPMax|Free|Used)Memory|Region(Name|TimeDilation|FPS|Corner|AgentCount)|Root(Position|Rotation)|UnixTime|(Parcel|Region)Flags|(Wall|GMT)clock|SimulatorHostname|BoundingBox|GeometricCenter|Creator|NumberOf(Prims|NotecardLines|Sides)|Animation(List)?|(Camera|Local)(Pos|Rot)|Vel|Accel|Omega|Time(stamp|OfDay)|(Object|CenterOf)?Mass|MassMKS|Energy|Owner|(Owner)?Key|SunDirection|Texture(Offset|Scale|Rot)|Inventory(Number|Name|Key|Type|Creator|PermMask)|Permissions(Key)?|StartParameter|List(Length|EntryType)|Date|Agent(Size|Info|Language|List)|LandOwnerAt|NotecardLine|Script(Name|State))|(Get|Reset|GetAndReset)Time|PlaySound(Slave)?|LoopSound(Master|Slave)?|(Trigger|Stop|Preload)Sound|((Get|Delete)Sub|Insert)String|To(Upper|Lower)|Give(InventoryList|Money)|RezObject|(Stop)?LookAt|Sleep|CollisionFilter|(Take|Release)Controls|DetachFromAvatar|AttachToAvatar(Temp)?|InstantMessage|(GetNext)?Email|StopHover|MinEventDelay|RotLookAt|String(Length|Trim)|(Start|Stop)Animation|TargetOmega|Request(Experience)?Permissions|(Create|Break)Link|BreakAllLinks|(Give|Remove)Inventory|Water|PassTouches|Request(Agent|Inventory)Data|TeleportAgent(Home|GlobalCoords)?|ModifyLand|CollisionSound|ResetScript|MessageLinked|PushObject|PassCollisions|AxisAngle2Rot|Rot2(Axis|Angle)|A(cos|sin)|AngleBetween|AllowInventoryDrop|SubStringIndex|List2(CSV|Integer|Json|Float|String|Key|Vector|Rot|List(Strided)?)|DeleteSubList|List(Statistics|Sort|Randomize|(Insert|Find|Replace)List)|EdgeOfWorld|AdjustSoundVolume|Key2Name|TriggerSoundLimited|EjectFromLand|(CSV|ParseString)2List|OverMyLand|SameGroup|UnSit|Ground(Slope|Normal|Contour)|GroundRepel|(Set|Remove)VehicleFlags|SitOnLink|(AvatarOn)?(Link)?SitTarget|Script(Danger|Profiler)|Dialog|VolumeDetect|ResetOtherScript|RemoteLoadScriptPin|(Open|Close)RemoteDataChannel|SendRemoteData|RemoteDataReply|(Integer|String)ToBase64|XorBase64|Log(10)?|Base64To(String|Integer)|ParseStringKeepNulls|RezAtRoot|RequestSimulatorData|ForceMouselook|(Load|Release|(E|Une)scape)URL|ParcelMedia(CommandList|Query)|ModPow|MapDestination|(RemoveFrom|AddTo|Reset)Land(Pass|Ban)List|(Set|Clear)CameraParams|HTTP(Request|Response)|TextBox|DetectedTouch(UV|Face|Pos|(N|Bin)ormal|ST)|(MD5|SHA1|DumpList2)String|Request(Secure)?URL|Clear(Prim|Link)Media|(Link)?ParticleSystem|(Get|Request)(Username|DisplayName)|RegionSayTo|CastRay|GenerateKey|TransferLindenDollars|ManageEstateAccess|(Create|Delete)Character|ExecCharacterCmd|Evade|FleeFrom|NavigateTo|PatrolPoints|Pursue|UpdateCharacter|WanderWithin))\\b'
     };
-
     return {
         name: 'LSL (Linden Scripting Language)',
         illegal: ':',
@@ -91,5 +84,4 @@ function lsl(hljs) {
         ]
     };
 }
-
 module.exports = lsl;

package/dist/components/cmsComponents/wiki/lib/highlight/lib/languages/lua.js

@@ -5,78 +5,72 @@ Author: Andrew Fedorov <dmmdrs@mail.ru>
 Category: common, scripting
 Website: https://www.lua.org
 */
-
 function lua(hljs) {
-  const OPENING_LONG_BRACKET = '\\[=*\\[';
-  const CLOSING_LONG_BRACKET = '\\]=*\\]';
-  const LONG_BRACKETS = {
-    begin: OPENING_LONG_BRACKET,
-    end: CLOSING_LONG_BRACKET,
-    contains: ['self']
-  };
-  const COMMENTS = [
-    hljs.COMMENT('--(?!' + OPENING_LONG_BRACKET + ')', '$'),
-    hljs.COMMENT(
-      '--' + OPENING_LONG_BRACKET,
-      CLOSING_LONG_BRACKET,
-      {
-        contains: [LONG_BRACKETS],
-        relevance: 10
-      }
-    )
-  ];
-  return {
-    name: 'Lua',
-    keywords: {
-      $pattern: hljs.UNDERSCORE_IDENT_RE,
-      literal: "true false nil",
-      keyword: "and break do else elseif end for goto if in local not or repeat return then until while",
-      built_in:
-        // Metatags and globals:
-        '_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len ' +
-        '__gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert ' +
-        // Standard methods and properties:
-        'collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring ' +
-        'module next pairs pcall print rawequal rawget rawset require select setfenv ' +
-        'setmetatable tonumber tostring type unpack xpcall arg self ' +
-        // Library methods and properties (one line per library):
-        'coroutine resume yield status wrap create running debug getupvalue ' +
-        'debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv ' +
-        'io lines write close flush open output type read stderr stdin input stdout popen tmpfile ' +
-        'math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan ' +
-        'os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall ' +
-        'string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower ' +
-        'table setn insert getn foreachi maxn foreach concat sort remove'
-    },
-    contains: COMMENTS.concat([
-      {
-        className: 'function',
-        beginKeywords: 'function',
-        end: '\\)',
-        contains: [
-          hljs.inherit(hljs.TITLE_MODE, {
-            begin: '([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*'
-          }),
-          {
-            className: 'params',
-            begin: '\\(',
-            endsWithParent: true,
-            contains: COMMENTS
-          }
-        ].concat(COMMENTS)
-      },
-      hljs.C_NUMBER_MODE,
-      hljs.APOS_STRING_MODE,
-      hljs.QUOTE_STRING_MODE,
-      {
-        className: 'string',
+    const OPENING_LONG_BRACKET = '\\[=*\\[';
+    const CLOSING_LONG_BRACKET = '\\]=*\\]';
+    const LONG_BRACKETS = {
         begin: OPENING_LONG_BRACKET,
         end: CLOSING_LONG_BRACKET,
-        contains: [LONG_BRACKETS],
-        relevance: 5
-      }
-    ])
-  };
+        contains: ['self']
+    };
+    const COMMENTS = [
+        hljs.COMMENT('--(?!' + OPENING_LONG_BRACKET + ')', '$'),
+        hljs.COMMENT('--' + OPENING_LONG_BRACKET, CLOSING_LONG_BRACKET, {
+            contains: [LONG_BRACKETS],
+            relevance: 10
+        })
+    ];
+    return {
+        name: 'Lua',
+        keywords: {
+            $pattern: hljs.UNDERSCORE_IDENT_RE,
+            literal: "true false nil",
+            keyword: "and break do else elseif end for goto if in local not or repeat return then until while",
+            built_in: 
+            // Metatags and globals:
+            '_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len ' +
+                '__gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert ' +
+                // Standard methods and properties:
+                'collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring ' +
+                'module next pairs pcall print rawequal rawget rawset require select setfenv ' +
+                'setmetatable tonumber tostring type unpack xpcall arg self ' +
+                // Library methods and properties (one line per library):
+                'coroutine resume yield status wrap create running debug getupvalue ' +
+                'debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv ' +
+                'io lines write close flush open output type read stderr stdin input stdout popen tmpfile ' +
+                'math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan ' +
+                'os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall ' +
+                'string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower ' +
+                'table setn insert getn foreachi maxn foreach concat sort remove'
+        },
+        contains: COMMENTS.concat([
+            {
+                className: 'function',
+                beginKeywords: 'function',
+                end: '\\)',
+                contains: [
+                    hljs.inherit(hljs.TITLE_MODE, {
+                        begin: '([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*'
+                    }),
+                    {
+                        className: 'params',
+                        begin: '\\(',
+                        endsWithParent: true,
+                        contains: COMMENTS
+                    }
+                ].concat(COMMENTS)
+            },
+            hljs.C_NUMBER_MODE,
+            hljs.APOS_STRING_MODE,
+            hljs.QUOTE_STRING_MODE,
+            {
+                className: 'string',
+                begin: OPENING_LONG_BRACKET,
+                end: CLOSING_LONG_BRACKET,
+                contains: [LONG_BRACKETS],
+                relevance: 5
+            }
+        ])
+    };
 }
-
 module.exports = lua;

package/dist/components/cmsComponents/wiki/lib/highlight/lib/languages/makefile.js

@@ -5,88 +5,85 @@ Contributors: Joël Porquet <joel@porquet.org>
 Website: https://www.gnu.org/software/make/manual/html_node/Introduction.html
 Category: common
 */
-
 function makefile(hljs) {
-  /* Variables: simple (eg $(var)) and special (eg $@) */
-  const VARIABLE = {
-    className: 'variable',
-    variants: [
-      {
-        begin: '\\$\\(' + hljs.UNDERSCORE_IDENT_RE + '\\)',
-        contains: [ hljs.BACKSLASH_ESCAPE ]
-      },
-      {
-        begin: /\$[@%<?\^\+\*]/
-      }
-    ]
-  };
-  /* Quoted string with variables inside */
-  const QUOTE_STRING = {
-    className: 'string',
-    begin: /"/,
-    end: /"/,
-    contains: [
-      hljs.BACKSLASH_ESCAPE,
-      VARIABLE
-    ]
-  };
-  /* Function: $(func arg,...) */
-  const FUNC = {
-    className: 'variable',
-    begin: /\$\([\w-]+\s/,
-    end: /\)/,
-    keywords: {
-      built_in:
-        'subst patsubst strip findstring filter filter-out sort ' +
-        'word wordlist firstword lastword dir notdir suffix basename ' +
-        'addsuffix addprefix join wildcard realpath abspath error warning ' +
-        'shell origin flavor foreach if or and call eval file value'
-    },
-    contains: [ VARIABLE ]
-  };
-  /* Variable assignment */
-  const ASSIGNMENT = {
-    begin: '^' + hljs.UNDERSCORE_IDENT_RE + '\\s*(?=[:+?]?=)'
-  };
-  /* Meta targets (.PHONY) */
-  const META = {
-    className: 'meta',
-    begin: /^\.PHONY:/,
-    end: /$/,
-    keywords: {
-      $pattern: /[\.\w]+/,
-      'meta-keyword': '.PHONY'
-    }
-  };
-  /* Targets */
-  const TARGET = {
-    className: 'section',
-    begin: /^[^\s]+:/,
-    end: /$/,
-    contains: [ VARIABLE ]
-  };
-  return {
-    name: 'Makefile',
-    aliases: [
-      'mk',
-      'mak',
-      'make',
-    ],
-    keywords: {
-      $pattern: /[\w-]+/,
-      keyword: 'define endef undefine ifdef ifndef ifeq ifneq else endif ' +
-      'include -include sinclude override export unexport private vpath'
-    },
-    contains: [
-      hljs.HASH_COMMENT_MODE,
-      VARIABLE,
-      QUOTE_STRING,
-      FUNC,
-      ASSIGNMENT,
-      META,
-      TARGET
-    ]
-  };
+    /* Variables: simple (eg $(var)) and special (eg $@) */
+    const VARIABLE = {
+        className: 'variable',
+        variants: [
+            {
+                begin: '\\$\\(' + hljs.UNDERSCORE_IDENT_RE + '\\)',
+                contains: [hljs.BACKSLASH_ESCAPE]
+            },
+            {
+                begin: /\$[@%<?\^\+\*]/
+            }
+        ]
+    };
+    /* Quoted string with variables inside */
+    const QUOTE_STRING = {
+        className: 'string',
+        begin: /"/,
+        end: /"/,
+        contains: [
+            hljs.BACKSLASH_ESCAPE,
+            VARIABLE
+        ]
+    };
+    /* Function: $(func arg,...) */
+    const FUNC = {
+        className: 'variable',
+        begin: /\$\([\w-]+\s/,
+        end: /\)/,
+        keywords: {
+            built_in: 'subst patsubst strip findstring filter filter-out sort ' +
+                'word wordlist firstword lastword dir notdir suffix basename ' +
+                'addsuffix addprefix join wildcard realpath abspath error warning ' +
+                'shell origin flavor foreach if or and call eval file value'
+        },
+        contains: [VARIABLE]
+    };
+    /* Variable assignment */
+    const ASSIGNMENT = {
+        begin: '^' + hljs.UNDERSCORE_IDENT_RE + '\\s*(?=[:+?]?=)'
+    };
+    /* Meta targets (.PHONY) */
+    const META = {
+        className: 'meta',
+        begin: /^\.PHONY:/,
+        end: /$/,
+        keywords: {
+            $pattern: /[\.\w]+/,
+            'meta-keyword': '.PHONY'
+        }
+    };
+    /* Targets */
+    const TARGET = {
+        className: 'section',
+        begin: /^[^\s]+:/,
+        end: /$/,
+        contains: [VARIABLE]
+    };
+    return {
+        name: 'Makefile',
+        aliases: [
+            'mk',
+            'mak',
+            'make',
+        ],
+        keywords: {
+            $pattern: /[\w-]+/,
+            keyword: 'define endef undefine ifdef ifndef ifeq ifneq else endif ' +
+                'include -include sinclude override export unexport private vpath'
+        },
+        contains: [
+            hljs.HASH_COMMENT_MODE,
+            VARIABLE,
+            QUOTE_STRING,
+            FUNC,
+            ASSIGNMENT,
+            META,
+            TARGET
+        ]
+    };
 }
-
 module.exports = makefile;