From 57604c3742a1189658b279294254e8173e8dfd17 Mon Sep 17 00:00:00 2001
From: David Schach <636977+dschach@users.noreply.github.com>
Date: Thu, 9 Oct 2025 15:27:07 -0700
Subject: [PATCH 1/2] feat: implement ApexDoc

---
 demo/samplecode.txt                 | 678 ++++++++++++++++++++++++++++
 dist/apex.es.min.js                 | 170 +++----
 dist/apex.min.js                    | 170 +++----
 package-lock.json                   | 106 +++--
 src/languages/apex.js               | 203 ++++++---
 src/styles/monokai-sublime-apex.css |   4 +-
 6 files changed, 1086 insertions(+), 245 deletions(-)
 create mode 100644 demo/samplecode.txt

diff --git a/demo/samplecode.txt b/demo/samplecode.txt
new file mode 100644
index 0000000..f8e13b9
--- /dev/null
+++ b/demo/samplecode.txt
@@ -0,0 +1,678 @@
+/**
+  * Provides services for geolocation and address conversion.
+  * @author Dennis Smith
+  * @version 0.3.0-beta4
+  * {@hidden this is a 
+  * hidden comment}
+  * This string might contain malicious or unexpected characters,
+  * like a {@literal <script>} tag or a backslash {@literal \}.
+  * @since 4/11/2000
+  * {@link class#member}
+  * {@link class}
+  * {@link "text-string"}
+  * {@link <a href="URL">label</a>}
+  * @throws AccountManager.AccountException if 
+  * accountName is invalid or if DML operation fails.
+  * {@code
+  * try {
+  *   GeolocationService.Coordinates coords = GeolocationService.geocodeAddress(
+  *     '415 Mission St',
+  *     'San Francisco',
+  *     'CA',
+  *     '94105',
+  *     'USA'
+  *   );
+  * } 
+  * catch (GeolocationService.GeocodingException e) {
+  *   // handle failure
+  * }
+
+  * RecordTypes.getAvailableRecordTypesForSelectList('Account')
+  * <br><br>
+  * System.SelectOption[value='<SFID>', label='Available', disabled='false']
+  * System.SelectOption[value='<SFID>', label='Default', disabled='false']
+  * System.SelectOption[value='<SFID>', label='Inactive', disabled='true']
+  * }
+  * @example
+  * {@code
+  * Account a;
+  * try {
+  *  a = new AccountManager().createAccount('Acme', 'Agriculture');
+  * } catch (AccountManager.AccountException caught) {
+  *   LOGGER.log(caught);
+  *   // further exception handling
+  * }
+  * }
+  */
+/**
+ * Provides services for geolocation and address conversion.
+ * @author Dennis Smith
+ * @version 0.3.0
+ * @since 0.1.0
+ */
+global with sharing class GeolocationService {
+  /**
+   * Represents geographic coordinates (latitude and longitude).
+   */
+  global class Coordinates {
+    @AuraEnabled
+    public Decimal latitude;
+    @AuraEnabled
+    public Decimal longitude;
+
+    global Coordinates(Decimal lat, Decimal lon) {
+      this.latitude = lat;
+      this.longitude = lon;
+    }
+  }
+
+  /**
+   * Converts a full address string to approximate latitude
+   * and longitude coordinates. This method is deprecated and should no
+   * longer be used due to its reliance on an older, less accurate geocoding 
+   * service and simpler parsing logic. It may not handle all address formats
+   * correctly and has a lower success rate.
+   * @param fullAddress The complete address string
+   * (e.g., "123 Main St, Anytown, CA 90210, USA").
+   * @return A `Coordinates` object representing the approximate latitude and longitude.
+   * @throws DeprecatedMethodCalledException If this method is invoked,
+   * informing the user to migrate to the newer, more robust `geocodeAddress` method.
+   * @deprecated in 0.2.0. Use {@link #geocodeAddress(
+   * String street,
+   * String city,
+   * String state,
+   * String postalCode,
+   * String country)} instead.
+   * @since 0.1.0
+   */
+  @Deprecated
+  global static Coordinates convertAddressToCoordinates(String fullAddress) {
+    throw new DeprecatedMethodCalledException(
+      'The method `GeolocationService.convertAddressToCoordinates(String fullAddress)` is deprecated. ' +
+        'Please use `GeolocationService.geocodeAddress(String street, String city, String state, String postalCode, String country)` ' +
+        'for all new and existing address-to-coordinate conversions to ensure better accuracy and reliability.'
+    );
+  }
+
+  /**
+   * Geocodes a structured address into precise latitude and longitude coordinates
+   * using a robust external geocoding service.
+   * This method provides higher accuracy and better handling of diverse address formats.
+   * @param street The street address (e.g., "123 Main St").
+   * @param city The city (e.g., "Anytown").
+   * @param state The state or province abbreviation (e.g., "CA").
+   * @param postalCode The postal or ZIP code (e.g., "90210").
+   * @param country The country name or code (e.g., "USA").
+   * @return A Coordinates object containing the latitude and longitude.
+   * @throws GeocodingException If the address cannot be geocoded, 
+   * if the external service is unavailable, or if required address
+   * components are missing.
+   * @example
+   * {@code
+   * try {
+   *   GeolocationService.Coordinates coords = GeolocationService.geocodeAddress(
+   *     '415 Mission St',
+   *     'San Francisco',
+   *     'CA',
+   *     '94105',
+   *     'USA'
+   *   );
+   * } catch (GeolocationService.GeocodingException e) {
+   *   // handle failure
+   * }
+   * }
+   * @since 0.2.0
+   */
+  global static Coordinates geocodeAddress(
+    String street,
+    String city,
+    String state,
+    String postalCode,
+    String country
+  ) {
+    // Implement actual geocoding logic
+    return new Coordinates(0, 0);
+  }
+
+  /**
+   * Exception thrown when a deprecated method is called.
+   * This indicates that the caller should migrate to the recommended alternative.
+   */
+  global class DeprecatedMethodCalledException extends Exception {
+  }
+
+  /**
+   * Exception thrown when a geocoding operation fails.
+   * This provides specific context for issues during address-to-coordinate conversion.
+   */
+  global class GeocodingException extends Exception {
+  }
+}
+
+@InvocableMethod
+    (label='Create Action Plan From Template' description='Takes a Template Name/Id and Record Id and makes an Action Plan for that record.' category=77)
+    global static List<Id> makeActionPlanFromTemplate(List<CreateActionPlanRequest>; requests) {
+      List<Id> resultIDs = new List&lt;Id&gt;();
+
+      Set<String> templateNamesOrIDs = new Set<String>();
+      for (CreateActionPlanRequest r : requests) {
+        templateNamesOrIDs.add(r.templateNameOrID);
+      }
+
+    }
+}
+/**
+	 * @description Given an sObject and `RecordType` DeveloperName, return the `RecordType` Name
+	 * @author {@link [David Schach](https://github.com/dschach)}
+	 * @param  objectName     SObject name (with __c if custom, etc)
+	 * @param  recordTypeDevName `RecordType.DeveloperName` (cannot include spaces)
+	 * @return                RecordType Name
+	 * @example
+	 * RecordTypes.getRecordTypeNameFromDevName('Account','Person_Account')
+	 */
+Map<Id, CustomObject__c> myMap = new Map<Id, CustomObject__c>(
+[SELECT Id, AccountId, MAX(Amount) FROM CustomObject__c WHERE Id NOT IN :newRecordsMap?.keySet()]);
+    Map<Id, String> myMap = new Map<Id, String>{a => b, c => d};
+
+    delete myAccount;
+    Account a;
+    String s;
+    delete [SELECT Id FROM Account];
+
+    Integer myInt = 8 - 7++;
+
+    public List<String> myString { get; set; }
+
+    List<Opportunity> opps = [SELECT Id FROM Opportunity WHERE Id NOT IN :newRecordsMap.keySet()];
+    List<Opportunity> opps = [SELECT Id FROM Opportunity WHERE Id NOT IN :myMethod()];
+
+    
+    String queryText = 'SELECT Id, Name, ';
+    acctid = System.currentPageReference().getParameters().get('Id');
+    System.assert(true);
+    System.requestVersion();
+
+    @IsTest
+    private without sharing class myTestClass {
+      myMap?.get('Id');
+    }
+    System.URL.getCurrentRequestUrl();
+    URL.getCurrentRequestUrl();
+
+    public List<SelectOption> recordTypes { get; private set; }
+
+    Database.insert(myAccounts, false, AccessLevel.USER_MODE);
+    delete myAccount;
+    delete [SELECT Id FROM Account];
+    myAcct = (Account)myacct;
+
+    public String myString { get; set; }
+
+    List<SObject> mylist = [SELECT Name, StreetAddress__c, COUNT(),
+      (SELECT Id FROM Contacts)
+      FROM Warehouse__c.Contacts__r
+      WHERE DISTANCE(Location__c, GEOLOCATION(37.775,-122.418), 'mi') < 20 
+      AND Date__kav NOT IN LAST_N_DAYS:80
+      ORDER BY DISTANCE(Location__c, GEOLOCATION(37.775,-122.418), 'mi')
+      LIMIT 10];
+
+    String queryText = 'SELECT Id, Name, AccountId, FirstName, LastName, mailingcountry, ' +
+				'FROM Contact WHERE AccountId = :acctid ORDER BY ' +
+				String.escapeSingleQuotes(SortFullExp) +
+				' NULLS LAST LIMIT 1000';
+
+    /**
+     * @author {@link [David Schach](https://github.com/dschach)} test@email.com
+     * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
+     * @group Visualforce
+     * @since 2022
+     */
+    public with sharing class ActionPlanDetailController {
+
+      public enum Season {WINTER, SPRING, SUMMER, FALL}
+     
+      public ActionPlanDetailController(ApexPages.StandardController stdController, Integer x, Double y) {
+        Map<Id, Map<String, Wrapper>> renew = new Map<Id, Map<String, SObject>>();
+        if (!Test.isRunningTest() && false) {
+          stdController.addFields(ActionPlansUtilities.getCustomRelationshipFields());
+        }
+        for(Account a : [SELECT Id FROM Account WHERE Id = :a.Id ORDER BY CreatedDate ASC] ){}
+        actionPlan = (ActionPlan__c) stdController.getRecord();
+        truestory = req.setHeader('X-Password', '{!$Credential.Password}');
+      }
+    }
+    
+      /**
+      * @description Constructor using passed-in class name constructor for faster performance
+      * <br>We cast all four trigger collections
+      * @param className The name of this class. Pass in the string to make the handler run faster
+      * @return PageReference Page to go to after deleting ActionPlan__c
+      * Display ControllingTasks column only if there are controlling tasks
+      * @author {@link [David Schach](https://github.com/dschach)}
+      * @return   Boolean is the Controller__c field populated for any Action Plan Tasks?
+      */
+      public PageReference onLoad() {
+        ActionPlansUtilities.onPageLoad();
+        return null;
+      }
+
+      public PageReference deletePlan() {
+        this(DEFAULT_SIZE);
+        //delete ap, which will also delete apts via master-detail relationship
+        try {
+          delete actionPlan;
+        } catch (DMLException e) {
+          ApexPages.addMessages(e);
+          throw new CustomException('my error');
+          return i++;
+        }
+    
+        String retURL = '/' + ActionPlansUtilities.getObjectKeyPrefix(ActionPlansUtilities.namespacePrefix + 'ActionPlan__c') + '/o';
+    
+        Pagereference newPage = new PageReference('' + retURL);
+        newPage.setRedirect(true);
+    
+        return newPage;
+      }
+    
+      public Custom__c hasControllingTasks {
+        get {
+          hasControllingTasks = false;
+          for (TaskWrapper tw : getActionPlanTasks()) {
+            if (tw.apt.Controller__c != null) {
+              hasControllingTasks = true;
+              break;
+            }
+          }
+          return hasControllingTasks;
+        }
+        set;
+      }
+    
+      /**
+       * Memoized TaskWrappers for display on the page
+       */
+      private List<TaskWrapper> apTaskWrapperList;
+      /**
+       * Collect and return all TaskWrappers
+       * @return List<TaskWrapper> List of TaskWrapper for this Action Plan
+       */
+      public List<TaskWrapper> getActionPlanTasks() {
+        if (apTaskWrapperList == null) {
+          apTaskWrapperList = new List<TaskWrapper>();
+          Map<Id, APTask__c> apTaskMap = new Map<Id, APTask__c>(
+            [
+              SELECT
+                Id,
+                User__r.Name
+              FROM APTask__c
+              WHERE Action_Plan__c = :actionPlan.Id
+              ORDER BY TaskIndex__c ASC
+            ]
+          );
+          Map<Id, Id> taskTaskMap = new Map<Id, Id>();
+          for (Task t : [SELECT 
+            Id, 
+            TaskAPTask__c 
+            FROM Task WHERE TaskAPTask__c IN :apTaskMap.keyset()]) {
+            taskTaskMap.put(t.TaskAPTask__c, t.Id);
+          }
+          for (APTask__c a : apTaskMap.values()) {
+            TaskWrapper tw;
+            Id relatedTaskId = taskTaskMap.get(a.Id);
+            tw = new TaskWrapper(a, relatedTaskId);
+            apTaskWrapperList.add(tw);
+          }
+        }
+        return apTaskWrapperList;
+      }
+    
+      public class TaskWrapper {
+        /**
+         * The (standard) Task Id
+         */
+        public Id taskId { get; private set; }
+    
+        public TaskWrapper(APTask__c aptParam, Id taskIdParam) {
+          this.apt = aptParam;
+          this.taskId = taskIdParam;
+        }
+      }
+    
+      public Boolean getVersion() {
+        if (actionPlan.Action_Plan_Template__c != null) {
+          ActionPlanTemplate__c tempApt = [SELECT LastModifiedDate FROM ActionPlanTemplate__c WHERE Id = :actionPlan.Action_Plan_Template__c];
+          if (tempApt.LastModifiedDate > actionPlan.createdDate) {
+            return true;
+          }
+        }
+        return false;
+      }
+    
+      /**
+       * The name of the parent record - show a different field based on SObject Type
+       * @return  String name of the object related to this Action Plan
+       */
+      public String getrelatedRecordName() {
+        String objName = '';
+        Id objId;
+    
+        for (String f : ActionPlansUtilities.getCustomRelationshipFields()) {
+          if (actionPlan.get(f) != null) {
+            objId = (Id) actionPlan.get(f);
+            Schema.DescribeSObjectResult dsr = objId.getSObjectType().getDescribe();
+            objName = dsr.getName();
+            break;
+          }
+        }
+    
+        switch on objName {
+          when 'Case' {
+            Case c = [SELECT Id, Subject, CaseNumber FROM Case WHERE Id = :objId LIMIT 1];
+            return c.CaseNumber + ': ' + c.Subject;
+          }
+          when 'Contract' {
+            Contract c = [SELECT Id, ContractNumber FROM Contract WHERE Id = :objId LIMIT 1];
+            return c.ContractNumber;
+          }
+          when else {
+            String relNameQuery = 'SELECT Id, Name FROM ' + objName + ' WHERE Id = \'' + objId + '\'';
+            SObject so = Database.query(relNameQuery)[0];
+            return (String) so.get('Name');
+          }
+        }
+      }
+    
+      /**
+       * Convert AP Task Record Type Id to Record Type Name
+       * @return Record Type Name
+       */
+      public String getRecordTypeName() {
+        String toReturn = '';
+        if (ActionPlansUtilities.taskUsesRecordTypes) {
+          Map<Id, Schema.RecordTypeInfo> rtMapById = Task.SObjectType.getDescribe().getRecordTypeInfosById();
+          if (!rtMapById.isEmpty() && rtMapById.containsKey(actionPlan.TaskRecordTypeID__c)) {
+            return rtMapById.get(actionPlan.TaskRecordTypeID__c).getName();
+          }
+        }
+        return toReturn;
+      }
+    
+      public Boolean getCanShare() {
+        return ActionPlansUtilities.canShareRecord(actionPlan.Id, actionPlan.OwnerId);
+      }
+
+  global without sharing class ActionPlanCreateInvocable {
+    @InvocableMethod
+    (label='Create Action Plan From Template' description='Takes a Template Name/Id and Record Id and makes an Action Plan for that record.' category=77)
+    global static List<Id> makeActionPlanFromTemplate(List<CreateActionPlanRequest> requests) {
+      List<Id> resultIDs = new List<Id>();
+
+      Set<String> templateNamesOrIDs = new Set<String>();
+      for (CreateActionPlanRequest r : requests) {
+        templateNamesOrIDs.add(r.templateNameOrID);
+      }
+
+      Map<String, ActionPlanTemplate__c> templateNameOrIdToTemplate = new Map<String, ActionPlanTemplate__c>();
+
+      List<ActionPlanTemplate__c> possibleTemplates = [
+        SELECT
+          Id,
+          Description__c,
+          TaskRecordTypeID__c,
+          (
+            SELECT
+              Type__c,
+              Action_Plan_Template__r.TaskRecordTypeID__c
+            FROM aptTasks__r
+            ORDER BY TaskIndex__c ASC
+          )
+        FROM ActionPlanTemplate__c
+        WHERE Name IN :templateNamesOrIDs OR Id IN :templateNamesOrIDs
+      ];
+
+      if (possibleTemplates.isEmpty()) {
+        return resultIDs;
+      }
+
+      for (ActionPlanTemplate__c apt : possibleTemplates) {
+        templateNameOrIdToTemplate.put(apt.Id, apt);
+      }
+
+      for (CreateActionPlanRequest r : requests) {
+        relatedIDs.add(r.relatedRecordID);
+      }
+
+      Map<Id, ActionPlan__c> actionPlansToInsert = new Map<Id, ActionPlan__c>();
+
+      insert actionPlansToInsert.values();
+
+      Map<String, APTask__c> planTaskIndexToTask = new Map<String, APTask__c>();
+
+      for (CreateActionPlanRequest r : requests) {
+        if (!actionPlansToInsert.containsKey(r.relatedRecordID)) {
+          continue;
+        }
+
+        ActionPlan__c ap = actionPlansToInsert.get(r.relatedRecordID);
+
+        for (APTemplateTask__c aptTask : actionPlanTemplate.aptTasks__r) {
+          APTask__c apTask = new APTask__c();
+          apTask.User__c = ActionPlansBuilderUtilities.getAPTaskTemplateUser(ap, relObjectOwners, aptTask.User__c);
+          apTask.SendEmail__c = aptTask.SendEmail__c;
+
+          apTask.Status__c = ActionPlansUtilities.getTaskRecordTypeStatusDefaultValues().get(ActionPlansUtilities.getDefaultTaskRecordTypeId());
+
+          // create due date, calculate the due date of the tasks for skip weekends feature
+          if (ap.SkipWeekends__c == true && ap.SkipDay__c != null) {
+            apTask.ActivityDate__c = ActionPlansUtilities.adjustTaskDueDate(ap.StartDate__c, apTask.DaysFromStart__c.intValue(), ap.SkipDay__c);
+          } else {
+            apTask.ActivityDate__c = ap.StartDate__c.addDays(apTask.DaysFromStart__c.intValue());
+          }
+          planTaskIndexToTask.put(ap.Id + '' + apTask.TaskIndex__c, apTask);
+        }
+      }
+
+      Database.insert(new planTaskIndexToTask.values());
+
+      Database.update(dependentTasksToUpdate);
+
+      List<Task> myTasksWithOutEmail = new List<Task>();
+
+      Map<Id, APTask__c> mapAP = new Map<Id, APTask__c>();
+      for (APTask__c a : planTaskIndexToTask.values()) {
+        mapAP.put(a.Id, a);
+      }
+
+      Map<Id, ActionPlan__c> insertedActionPlans = new Map<Id, ActionPlan__c>();
+      for (ActionPlan__c ap : actionPlansToInsert.values()) {
+        insertedActionPlans.put(ap.Id, ap);
+      }
+
+      for (APTask__c apTask : planTaskIndexToTask.values()) {
+        ActionPlan__c insertedAP;
+        // check if task exists already
+        Task t = new Task();
+        t.OwnerId = apTask.User__c;
+        t.TaskAPTask__c = apTask.Id;
+
+        if (apTask.Comments__c != null) {
+          t.Description = apTask.Comments__c;
+        }
+
+        //set reminder based on user's default reminder setting
+        if (apTask.Reminder__c == true && apTask.ActivityDate__c != null) {
+          t.isReminderSet = true;
+          t.ReminderDateTime = Datetime.newInstance(apTask.ActivityDate__c.year(), apTask.ActivityDate__c.month(), apTask.ActivityDate__c.day(), 0, 0, 0);
+          t.ReminderDateTime = t.ReminderDateTime.addMinutes(Integer.valueOf(apTask.Minutes_Reminder__c));
+        } else {
+          t.isReminderSet = false;
+        }
+
+        APTask__c apt = mapAP.get(apTask.Id);
+
+        if (apt != null) {
+          insertedAP = insertedActionPlans.get(apt.Action_Plan__c);
+        }
+
+        //link to Action Plan's Related To Object
+        for (String s : ActionPlansUtilities.getCustomRelationshipFields()) {
+          String f = s;
+          if (
+            !f.equalsIgnoreCase(ActionPlansUtilities.namespacePrefix + 'Contact__c') &&
+            insertedAP.get(f) != null
+          ) {
+            t.WhatId = (Id) insertedAP.get(f);
+            break;
+          }
+        }
+      }
+
+      Database.DMLOptions dmlo1 = new Database.DMLOptions();
+      dmlo1.EmailHeader.triggerUserEmail = true;
+
+      Set<Id> relObjectIDs = new Set<Id>();
+      for (ActionPlan__c ap : actionPlansToInsert.values()) {
+        relObjectIDs.add(ap.Id);
+      }
+
+      if (mySettings != null && mySettings.Chatter_Object_Brag__c) {
+        ActionPlansBuilderUtilities.generateObjectFeeds(relObjectIDs);
+      }
+
+      for (CreateActionPlanRequest request : requests) {
+        resultIDs.add(actionPlansToInsert.get(request.relatedRecordID).Id);
+      }
+
+      return resultIDs;
+    }
+
+    global class CreateActionPlanRequest {
+      @InvocableVariable(required=true label='The parent Record ID' description=55)
+      global Id relatedRecordID;
+    }
+  }
+
+  trigger APAccount on Account(before delete, after undelete) {
+    ActionPlansTriggerHandlers.triggerhandlerActionPlanAccount(Trigger.new, Trigger.old, Trigger.newMap, Trigger.oldMap, Trigger.operationType);
+      ActionPlansTriggerHandlers.actionPlansSObjectTriggerHandler('Account');
+  }
+
+
+  public without sharing class AccountSampleTriggerHandler extends TriggerHandler, Database.schedulable, Batchable<SObject> {
+    private List<Account> newRecords;
+    private List<Account> oldRecords;
+    private Map<Id, Account> newRecordsMap;
+    private Map<Id, Account> oldRecordsMap;
+
+    switch on context {
+      when 'BEFORE_INSERT' {
+        this.triggerEvent = System.TriggerOperation.BEFORE_INSERT;
+      }
+      when else {
+        // we are not in trigger context
+        this.isTriggerExecuting = false;
+      }
+    }
+
+    public AccountSampleTriggerHandler(CustomType a, String className) {
+      this.newRecords = (List<Account>) Trigger.new;
+      this.newRecordsMap = (Map<Id, Account>) Trigger.newMap;
+    }
+
+    public override sobject beforeInsert() {
+      method1();
+    }
+
+    //public override void afterUpdate(){}
+
+    private void method1() {
+      for (Account a : newRecords) {
+        a.Name = a.Name.toUpperCase();
+        a.Name = new FooBar();
+      }
+    }
+    
+    @TestVisible
+    (SeeAllData=true)
+    private void method2() {
+      for (Account a : newRecords) {
+        a.Name = a.Name.toLowerCase();
+      }
+    }
+    
+    @future
+    (label = true)
+    private void method3() {
+      Contact[] acctContacts = [SELECT Id FROM Contact WHERE AccountId IN :newRecordsMap.keyset() WITH SECURITY_ENFORCED];
+      List<Contact> acctContacts2 = [SELECT Id FROM Contact WHERE ID = '012000000' AND CreatedDate = :LAST_N_DAYS:90 WITH SECURITY_ENFORCED];
+      if (Contact.getSObjectType().getDescribe().isUpdateable()) {
+        update as user acctContacts; //NOPMD
+      }
+      // do things here
+    }
+  }
+
+  public without sharing class AccountSampleTriggerHandler extends Database.schedulable, Batchable<SObject> {
+    @isTest
+    private testMethod void testme(){
+      Assert.isTrue(true);
+    }
+
+    @testVisible2
+    private List<SelectOption> recordTypes { get; private set; }
+  }
+
+  public virtual class Marker {
+    public virtual void write() {
+        System.debug('Writing some text.');
+    }
+
+    public virtual Double discount() {
+        return .05;
+    }
+  }
+
+  @IsTest(Seealldata=true)
+  public with sharing class L2Char implements Database.batchable {
+    public static final String ERROR = 0x0001;
+
+    @InvocableMethod(label='my invocable')
+    public void moveTo(
+      integer x, 
+      integer y, 
+      integer z
+    ) {
+      
+      Account a = new Account();
+      a.Custom__c = 'stringvalue';
+      insert a;
+      Boolean ai = (Boolean) false;
+      System.debug('Should not be called');
+      if (1 > 5) { // wtf!?
+        Database.insert(myAccounts);
+      }
+    }
+
+    @InvocableMethod
+    (label='my invocable')
+    public void doThis(){
+    }
+  }
+
+    @TestSetup
+    (TRUEKING=trueking)
+    private static void makeData(Boolean a){
+      Custom__c c = new Custom__c();
+      
+      for(Account a : acctLis ){
+        ConnectApi.insert a;
+      }
+    }
+
+  trigger CTrig on Custom__c (before insert){
+    System.debug('inserting a record');
+    upsert myRecord__c;
+  }
+
+    
\ No newline at end of file
diff --git a/dist/apex.es.min.js b/dist/apex.es.min.js
index e31f913..62ab9e9 100644
--- a/dist/apex.es.min.js
+++ b/dist/apex.es.min.js
@@ -1,97 +1,115 @@
 /*! `apex` grammar compiled for Highlight.js 11.11.1 */
 var hljsGrammar=(()=>{"use strict";return e=>{
-const t=e.regex,a="[a-zA-Z][a-zA-Z_0-9]*",c="\\b"+a+"\\b",n="@"+a,s=/(?=\s*\()/,o=/\s+/,r=/\?\./,i=[{
-match:/(?<!\?)\./,scope:"punctuation",relevance:0},{match:r,scope:"operator",
-relevance:0}];function l(...e){return t.concat("(?!",e.join("|"),")")}const p={
-scope:"number",
+const t=e.regex,n="[a-zA-Z][a-zA-Z_0-9]*",a="\\b"+n+"\\b",c="@"+n,s=/(?=\s*\()/,o=/\s+/,i=/(?<!\?)\./,r=/\?\./,l=[{
+match:i,scope:"punctuation",relevance:0},{match:r,scope:"operator",relevance:0
+}],p={match:/(?<!\.)\bId\b/,scope:"type",relevance:8};function b(...e){
+return t.concat("(?!",e.join("|"),")")}const u={scope:"number",
 match:t.either(/\b(\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(\.\d{1,3})?(\-|\+)\d{2}\:\d{2})\b/,/\b(\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(\.\d{1,3})?(Z)?)\b/,/\b(\d{4}\-\d{2}\-\d{2})\b/,/\b0(x|X)[0-9a-fA-F_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/\b0(b|B)[01_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/\b([0-9]+)?\.[0-9]+((e|E)[0-9]+)?(F|f|D|d|M|m)?\b/,/(-?)\b[0-9]+(e|E)[0-9]+(F|f|D|d|M|m)?\b/,/(-?)\b[0-9]+(F|f|D|d|M|m)\b/,/(-?)\b[0-9]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/(-?)(\b0[0-9]+|(\b\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?)/),
 relevance:0
-},b=["try","catch","finally","get","set","put","if","for","else","do","while","continue","break","implements","extends","return","throw","when","new"],u=["instanceof","super","this"],d=["abstract","final","global","override","private","protected","public","static","testMethod","transient","virtual","webservice"],m=["anytype|0","blob|0","boolean|0","byte|0","currency|0","date|0","datetime|0","decimal|0","double|0","enum|0","float|0","integer|0","long|0","object|0","pagereference|8","selectoption|8","short|0","sobject|10","string|0","time|0","void|0","float|0"],E=["insert","update","upsert","delete","undelete","merge","convertLead"],h=["AppLauncher","Approval","Auth","Cache","Canvas","ChatterAnswers","CommerceOrders","fsccashflow","CommercePayments","ConnectApi","Context","Database","Datacloud","DataRetrieval","DataSource","Dataweave","Dom","EventBus","ExternalService","Flow","FormulaEval","Functions","id_verification","industriesDigitalLending","Invocable","KbManagement","LxScheduler","Messaging","Metadata","Pref_center","Process","QuickAction","Reports","RichMessageing","Schema","Search","Sfc","Sfdc_Checkout","IndustriesNlpSvc","PlaceQuote","Sfdc_Enablement","sfdc_surveys","Site","Slack","Support","System","TerritoryMgmt","TxnSecurity","UserProvisioning","VisualEditor","Wave"],v=["Address","Answers","ApexPages","Approval","Assert","AsyncInfo","AsyncOptions","BusinessHours","Cases","Collator","Compression","Continuation","Cookie","Crypto","Database","Date","Datetime","Decimal","Domain","DomainCreator","DomainParser","EmailMessages","EncodingUtil","EventBus","Exception","FeatureManagement","FlexQueue","Formula","FormulaRecalcFieldError","FormulaRecalcResult","Http","HttpRequest","HttpResponse","Ideas","IsvPartners","JSON","JSONGenerator","JSONParser","Label","Limits","Location","Matcher","Math","Messaging","MultiStaticResourceCalloutMock","Network","OrgLimit","OrgLimits","Packaging","PageReference","Pattern","QueueableDuplicateSignature","QueueableDuplicateSignature.Builder","QuickAction","Request","ResetPasswordResult","RestContext","RestRequest","RestResponse","Search","Security","SelectOption","Site","SObject","SObjectAccessDecision","StaticResourceCalloutMock","Test","TimeZone","Type","URL","UserInfo","UserManagement","UUID","Version","WebServiceCallout","XmlStreamReader","XmlStreamWriter"],A=["AccessType","AccessLevel","CallbackStatus","DomainType","JSONToken","LoggingLevel","Quiddity","TriggerOperation","operationType"],S=["false","true","null"],R={
+},d=["try","catch","finally","get","set","put","if","for","else","do","while","continue","break","implements","extends","return","throw","when","new"],m=["instanceof","super","this"],E=["abstract","final","global","override","private","protected","public","static","testMethod","transient","virtual","webservice"],h=["anytype|0","blob|0","boolean|0","byte|0","currency|0","date|0","datetime|0","decimal|0","double|0","enum|0","float|0","integer|0","long|0","object|0","pagereference|8","selectoption|8","short|0","sobject|10","string|0","time|0","void|0","float|0"],g=["insert","update","upsert","delete","undelete","merge","convertLead"],v=["AppLauncher","Approval","Auth","Cache","Canvas","ChatterAnswers","CommerceOrders","fsccashflow","CommercePayments","ConnectApi","Context","Database","Datacloud","DataRetrieval","DataSource","Dataweave","Dom","EventBus","ExternalService","Flow","FormulaEval","Functions","id_verification","industriesDigitalLending","Invocable","KbManagement","LxScheduler","Messaging","Metadata","Pref_center","Process","QuickAction","Reports","RichMessageing","Schema","Search","Sfc","Sfdc_Checkout","IndustriesNlpSvc","PlaceQuote","Sfdc_Enablement","Sfdc_surveys","Site","Slack","Support","System","TerritoryMgmt","TxnSecurity","UserProvisioning","VisualEditor","Wave"],S=["Address","Answers","ApexPages","Approval","Assert","AsyncInfo","AsyncOptions","BusinessHours","Cases","Collator","Compression","Continuation","Cookie","Crypto","Database","Date","Datetime","Decimal","Domain","DomainCreator","DomainParser","EmailMessages","EncodingUtil","EventBus","Exception","FeatureManagement","FlexQueue","Formula","FormulaRecalcFieldError","FormulaRecalcResult","Http","HttpRequest","HttpResponse","Ideas","IsvPartners","JSON","JSONGenerator","JSONParser","Label","Limits","Location","Matcher","Math","Messaging","MultiStaticResourceCalloutMock","Network","OrgLimit","OrgLimits","Packaging","PageReference","Pattern","QueueableDuplicateSignature","QueueableDuplicateSignature.Builder","QuickAction","Request","ResetPasswordResult","RestContext","RestRequest","RestResponse","Search","Security","SelectOption","Site","SObject","SObjectAccessDecision","StaticResourceCalloutMock","Test","TimeZone","Type","URL","UserInfo","UserManagement","UUID","Version","WebServiceCallout","XmlStreamReader","XmlStreamWriter"],A=["AccessType","AccessLevel","CallbackStatus","DomainType","JSONToken","LoggingLevel","Quiddity","TriggerOperation","operationType"],R=["false","true","null"],T={
 match:/,/,scope:"punctuation",relevance:0
-},g=[/--/,/\+\+/,/\&\&|\|\|/,/\*\=|\/\=|\%\=|\+\=|-\=/,/\&\=|\^\=|<<\=|>>\=|>>>\=|\|\=/,/\&|~|\^|\|/,/<<|>>/,/<\=|>\=|\s(<|>)\s/,/\=\=|!\=/,/\=>/,/!(?=\w)/,/(?<=\s)(\?|:)(?=\s)/,r,/(?<=\s)(\?\?)(?=\s)/,/(?<!\?)\?(?!\?|\.|\[)/,/%[^%]|\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/(?<!\=|!)\=(?!\=|>)/],T=h.concat(...v),y={
-$pattern:t.concat(/(?<!\.)\b/,a,/\b/),keyword:[...b,...d,...E],type:m,literal:S
-},O=[...S,...b,...d,...h,...v,...A,...u,...E],N={
-match:t.concat(/\b/,t.either(...u),/\b/),scope:"variable.language",relevance:0
-},L=[{match:[t.concat(/\b/,t.either(...A)),/\./,a,/\b\s*(?![\.\(])/],scope:{
+},y=[/--/,/\+\+/,/\&\&|\|\|/,/\*\=|\/\=|\%\=|\+\=|-\=/,/\&\=|\^\=|<<\=|>>\=|>>>\=|\|\=/,/\&|~|\^|\|/,/<<|>>/,/<\=|>\=|\s(<|>)\s/,/\=\=|!\=/,/\=>/,/!(?=\w)/,/(?<=\s)(\?|:)(?=\s)/,r,/(?<=\s)(\?\?)(?=\s)/,/(?<!\?)\?(?!\?|\.|\[)/,/%[^%]|(?<!\n\s+)\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/(?<!\=|!)\=(?!\=|>)/],L=v.concat(...S),O={
+$pattern:t.concat(/(?<!\.)\b/,n,/\b/),keyword:[...d,...E,...g],type:h,literal:R
+},N=[...R,...d,...E,...v,...S,...A,...m,...g],C={
+match:t.concat(/\b/,t.either(...m),/\b/),scope:"variable.language",relevance:0
+},w=[{match:[t.concat(/\b/,t.either(...A)),/\./,n,/\b\s*(?![\.\(])/],scope:{
 1:"built_in",2:"punctuation",3:"variable"},relevance:0},{
-match:[t.concat(/\b/,t.either(...v)),/\./,a,/\b\s*(?![\.\(])/],scope:{
+match:[t.concat(/\b/,t.either(...S)),/\./,n,/\b\s*(?![\.\(])/],scope:{
 1:"built_in",2:"punctuation",3:"type"},relevance:0},{
-match:[t.concat(/\b/,t.either(...h)),/\./,c,/\b(?=\.)/],scope:{1:"built_in",
+match:[t.concat(/\b/,t.either(...v)),/\./,a,/\b(?=\.)/],scope:{1:"built_in",
 2:"punctuation",3:"type"}},{
-match:[t.concat(/\b/,t.either(...h,...v)),/\./,c,/\b(?!\.)/],scope:{
+match:[t.concat(/\b/,t.either(...v,...S)),/\./,a,/\b(?!\.)/],scope:{
 1:"built_in",2:"punctuation",3:"keyword"}},{
 match:[/\bTrigger\b/,/\./,/(isExecuting|isInsert|isUpdate|isDelete|isBefore|isAfter|isUndelete|new|newMap|old|oldMap|size|operationType)\b(?!\.)/],
 scope:{1:"built_in",2:"punctuation",3:"type"},relevance:10},{
-match:[/\btrigger\b/,/\./,"operationtype",/\./,t.concat(c,/\b/)],scope:{
+match:[/\btrigger\b/,/\./,"operationtype",/\./,t.concat(a,/\b/)],scope:{
 1:"built_in",2:"punctuation",3:"keyword",4:"punctuation",5:"variable.constant"},
-relevance:10}],C=[{
+relevance:10}],D=[{
 match:t.either(",",/;/,/(?<=\w)\>/,/\<(?=\w)/,/\{|\}/,/\(|\)/,/\{|\}/),
-scope:"punctuation",relevance:0},R],D=e.inherit(e.APOS_STRING_MODE,{
-scope:"string",relevance:0,contains:[{match:/\\'/,scope:"literal",relevance:0}]
-}),I=e.COMMENT("//",/[$\n]/,{relevance:0}),_=[e.COMMENT("/\\*","\\*/",{
-relevance:0,contains:[{begin:/\w+@/,relevance:0},{
-match:[/@(?:exception|throws)/,o,a],scope:{1:"doctag",3:"title.class"},
-relevance:0},{begin:"@[A-Za-z_-]+",scope:"doctag",relevance:0},{
-match:[/(?<=@param)\s+/,a],scope:{2:"variable"},relevance:0},{
-contains:[e.BACKSLASH_ESCAPE],relevance:0,variants:[{begin:"`",end:"`",
-scope:"string"},{begin:/'/,end:/'/,scope:"string"}],contains:[]}]}),I],w={
-match:t.either(...g),scope:"operator",relevance:0},f={match:/(?<!\.)\bId\b/,
-scope:"type",relevance:8},U=[{begin:/\b(list|set|map)(?=\s*<)/,
-beginScope:"type",end:/\>+/,endScope:"punctuation",contains:[{match:/\<|\,/,
-scope:"punctuation"},{match:c,scope:"type"}],relevance:8},{
-match:[t.optional(c),/\[/,t.optional(/\d+/),/\]/],scope:{1:"variable",
-2:"punctuation",3:"number",4:"punctuation"}},{match:[a,/\[\]/],scope:{1:"type",
-2:"punctuation"},relevance:0}],M=[{match:t.concat(n,/\b(?!\s*\()/),scope:"meta"
-},{scope:"meta",begin:[t.concat(n,/\b/),/\s*/,/\(/],beginScope:{3:"punctuation"
-},end:/\)/,endScope:"punctuation",contains:[{match:[c,/\s*=/],scope:{
-1:"keyword",2:"operator"},contains:[w]},D,p],keywords:{literal:S}}],k={
-match:[/\b[a-zA-Z0-9\.]*Exception/,o,a],scope:{1:"type",3:"variable"},
-relevance:0},F=[{match:[/(?<!\.)/,c,/\s*(?=\=[^\>])/],scope:{2:"variable"},
-relevance:0},{match:[c,"(?=\\s+"+a+/\s*\=/+")"],scope:{1:"type"},relevance:0},{
-match:[c,o,c,/\s*(?=\=[^\>])/],scope:{1:"type",3:"variable"},relevance:0}],P={
-match:[/(?<=\=\s*\()/,a,"(?=\\)\\s*"+a+")"],scope:{2:"type"},relevance:0},Y={
-match:[/\bnew\s+/,a,s],scope:{2:"type"},relevance:0};let W={scope:"params_call",
-begin:/\(/,beginScope:"punctuation",end:/\)/,endScope:"punctuation",relevance:0,
-keywords:y,contains:[]};const H=[{match:[/(?<=\.)/,a,s],scope:{
-2:"title.function.invoke"},relevance:1,contains:[...i],starts:W},{
-match:[/^\s*/,l(...b),a,s],scope:{3:"title.function.invoke"},relevance:1,
-starts:W}];W.contains=[D,Y,_,w,U,L,p,f,H,{keywords:{KEYWORDS:y},
-match:t.concat(/(?<=\s|\(|\,)/,l(...S),a,/\b/,/(?!\.)/),scope:"variable",
-relevance:0},{match:/\(|\,|\./,scope:"punctuation",relevance:0},{match:a,
-scope:"variable"}];const x={scope:"params",end:/\)/,endScope:"punctuation",
-relevance:1,keywords:y,contains:[p,D,_,U,...L,{match:/\,|\(/,scope:"punctuation"
-},f,{match:[/(?<=\(|\,)\s*/,a,/(?=\s)/],scope:{2:"type"}},{
-match:[o,a,/\s*(?=[,)])/],scope:{2:"variable"}}]},G={
-match:[/\bswitch\s+on\s+/,a],scope:{1:"keyword",2:"variable"}};return{
+scope:"punctuation",relevance:0},T],I=e.inherit(e.APOS_STRING_MODE,{
+scope:"string",relevance:1,contains:[{match:/\\'/,scope:"literal",relevance:1}]
+}),_=[{begin:"`",end:"`",scope:"string"},{begin:/'/,end:/'/,scope:"string"},{
+begin:/"/,end:/"/,scope:"string"}],f=e.COMMENT("//",/[$\n]/,{relevance:0
+}),U=[e.COMMENT("/\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0
+},{match:[/@(?:exception|throws)/,o,t.concat(n,i,n)],scope:{1:"doctag",
+3:"title.class"},relevance:0},{match:[/@(?:exception|throws)/,o,n],scope:{
+1:"doctag",3:"title.class"},relevance:0},{
+begin:[/\{/,/@(?:link|see)/,o,/[a-zA-Z_0-9]*/,t.concat(/(?:#|\.)/,n),s],
+beginScope:{2:"doctag",4:"title.class",5:"title.method"},end:/\}/,contains:[{
+match:/(?:\(|\))/,scope:"punctuation"},{match:[o,n,/\s*(?=[,)])/],scope:{
+2:"variable"}},{match:[n,/(?=\s)/],scope:{1:"type"}}]},{
+begin:[/\{/,/@(?:link|see)/,o,/[a-zA-Z_0-9]*/,t.concat(/(?:#|\.)/,n,/\s*(?=\})/)],
+beginScope:{2:"doctag",4:"title.class",5:"title.method"},end:/\}/,returnEnd:!0
+},{begin:[/\{/,/@(?:link|see)/,o,a],beginScope:{2:"doctag",4:"title.class"},
+end:/\}/,returnEnd:!0},{begin:[/\{/,/@(?:link|see)(?=\s+")/],beginScope:{
+2:"doctag"},end:/\}/,returnEnd:!0,contains:_},{begin:[/\{/,/@(?:link|see)/],
+beginScope:{2:"doctag"},end:/\}/,returnEnd:!0,subLanguage:["markdown","xml"]},{
+begin:[/\{/,/@literal/],beginScope:{2:"doctag"},end:/\}/,returnEnd:!0,
+subLanguage:["apex","xml","javascript"]},{match:c,scope:"doctag",relevance:0},{
+match:[/(?<=@param)\s+/,n],scope:{2:"variable"},relevance:0},{
+contains:[e.BACKSLASH_ESCAPE],relevance:0,variants:_},{begin:/[0-9]+\.[0-9]+/,
+end:/\.*\s+/,scope:"number",excludeEnd:!0},{
+begin:t.either(/\d{4}-\d{1,2}-\d{1,2}/,/\d{1,2}\/\d{1,2}\/\d{4}/),
+scope:"literal"},{begin:[/\{/,/@code/],beginScope:{2:"doctag"},starts:{end:/\}/,
+returnEnd:!0,contains:[{match:/^\s+\*\s+/,skip:!0,relevance:0},{begin:/\{/,
+end:/\}/,skip:!0}],subLanguage:["apex","xml","javascript"]}}]}),f],k={
+match:t.either(...y),scope:"operator",relevance:0},M=[{
+begin:/\b(list|set|map)(?=\s*<)/,beginScope:"type",end:/\>+/,
+endScope:"punctuation",contains:[{match:/\<|\,/,scope:"punctuation"},{match:a,
+scope:"type"}],relevance:8},{match:[t.optional(a),/\[/,t.optional(/\d+/),/\]/],
+scope:{1:"variable",2:"punctuation",3:"number",4:"punctuation"}},{
+match:[n,/\[\]/],scope:{1:"type",2:"punctuation"},relevance:0}],F=[{
+match:t.concat(c,/\b(?!\s*\()/),scope:"meta"},{scope:"meta",
+begin:[t.concat(c,/\b/),/\s*/,/\(/],beginScope:{3:"punctuation"},end:/\)/,
+endScope:"punctuation",contains:[{match:[a,/\s*=/],scope:{1:"keyword",
+2:"operator"},contains:[k]},I,u],keywords:{literal:R}}],P={
+match:[/\b[a-zA-Z0-9\.]*Exception/,o,n],scope:{1:"type",3:"variable"},
+relevance:0},Y=[{match:[/(?<!\.)/,a,/\s*(?=\=[^\>])/],scope:{2:"variable"},
+relevance:0},{match:[a,"(?=\\s+"+n+/\s*\=/+")"],scope:{1:"type"},relevance:0},{
+match:[a,o,a,/\s*(?=\=[^\>])/],scope:{1:"type",3:"variable"},relevance:0}],x={
+match:[/(?<=\=\s*\()/,n,"(?=\\)\\s*"+n+")"],scope:{2:"type"},relevance:0},W={
+match:[/\bnew\s+/,n,s],scope:{2:"type"},relevance:0};let H={begin:/\(/,
+beginScope:"punctuation",end:/\)/,endScope:"punctuation",relevance:0,keywords:O,
+contains:[]};const G=[{match:[/(?<=\.)/,n,s],scope:{2:"title.function.invoke1"},
+relevance:1,contains:[...l],starts:H},{match:[/^\s*/,b(...d),n,s],scope:{
+3:"title.function.invoke"},relevance:1,starts:H}]
+;H.contains=[I,W,U,k,M,w,u,p,G,{keywords:{KEYWORDS:O},
+match:t.concat(/(?<=\s|\(|\,)/,b(...R),n,/\b/,/(?!\.)/),scope:"variable",
+relevance:0},{match:/\(|\,|\./,scope:"punctuation",relevance:0},{match:n,
+scope:"variable"}];const B={scope:"params",end:/\)/,endScope:"punctuation",
+relevance:1,keywords:O,contains:[u,I,U,M,...w,{match:/\,|\(/,scope:"punctuation"
+},p,{match:[/(?<=\(|\,)\s*/,n,/(?=\s)/],scope:{2:"type"}},{
+match:[o,n,/\s*(?=[,)])/],scope:{2:"variable"}}]},Q={
+match:[/\bswitch\s+on\s+/,n],scope:{1:"keyword",2:"variable"}};return{
 name:"Apex",aliases:["apex","lightning","soql","sosl"],case_insensitive:!0,
-disableAutodetect:!1,ignoreIllegals:!1,keywords:y,
+disableAutodetect:!1,ignoreIllegals:!1,keywords:O,
 illegal:["</","<#","<]","<div>","\x3c!--","!DOCTYPE",/<iframe\b/,/^#/,/^import \.[a-zA-Z]+\./,/^import [\w]+/,/^import$/,/^include </,/^use\s+</,/\b(const|var)\s+\w+\s*=/,/\bstruct\b/,"System.log","console.log",/\bfor\s+\w+\s+IN\s+/,/\bif\s+\w+\s+IN\s+/,/\bend\s+if\b/,/\bend\s+select\b/,/\b(int|var)\s+\w+\s+=/,/\b(int[0-9]+|bool)\b/,/\b\$/,/\b_/,"::=",/\s#[a-zA-Z]/,/\s_[a-zA-Z]/,/\s\$[a-zA-Z]/,"#if","%if",/\bif(?!\s+\()/,"%endif","#endif","#_",/\d\s+\d/,/\w::\w/,/\bfloat\b/,/(SELECT|RETURNING)\s+\*/,/END\s+LOOP/,/CREATE\s+FUNCTION/,/\bint\b/,/import\s+\w+\s+=\s+require\("\w+"\)/,"/^include\b/",/\buse\s+strict\b/,/\w+\s+=\s+"\S*";/,/\/include\//,/\Anamespace\b/,/\bend(\.)?\n/,'"""',/\+\+\+/,/<%/,"<%#","%%>","<%%",":-",/\bmergesort\(/,/\bvar\s+env\b/,/\bdef\b\s\W:/,/"[^"]+"/,/\(\*|\*\)/],
-contains:[_,M,D,p,P,U,[{begin:[/\btrigger/,o,a,o,"on",o,a],beginScope:{
+contains:[U,F,I,u,x,M,[{begin:[/\btrigger/,o,n,o,"on",o,n],beginScope:{
 1:"keyword",3:"title.class",5:"operator",7:"type"},end:/(?=\{)/,returnEnd:!0,
-contains:[_,{begin:/\(/,end:/\)/,contains:[{
+contains:[U,{begin:/\(/,end:/\)/,contains:[{
 match:/\b(before|after)\s+(insert|update|delete|merge|undelete)\b/,
-scope:"keyword",relevance:5},R]}]},{relevance:5,
+scope:"keyword",relevance:5},T]}]},{relevance:5,
 match:/\b(with|without|inherited)\s+sharing\b/,scope:"keyword"},{
 begin:[/(?!\.)/,/\b(class|interface)\b(?!\?|\.)/],beginScope:{2:"keyword"},
-end:/(?=\{)/,relevance:1,keywords:{type:m,keyword:b},contains:[{
-match:[/(?<=\bclass)\s+/,a],scope:{2:"title.class"}},{returnEnd:!0,
+end:/(?=\{)/,relevance:1,keywords:{type:h,keyword:d},contains:[{
+match:[/(?<=\bclass)\s+/,n],scope:{2:"title.class"}},{returnEnd:!0,
 endsWithParent:!0,beginKeywords:"implements extends",end:/\{/,contains:[{
-match:[c,/(?=\.)/],scope:{1:"built_in"}},{match:t.concat(c,/(?=\>)/),
-scope:"type"},{match:c,scope:"title.class.inherited"},{match:/<|>|,/,
-scope:"punctuation"},L],relevance:0}]},{begin:[/\benum\s+/,a,/\s*\{/],
+match:[a,/(?=\.)/],scope:{1:"built_in"}},{match:t.concat(a,/(?=\>)/),
+scope:"type"},{match:a,scope:"title.class.inherited"},{match:/<|>|,/,
+scope:"punctuation"},w],relevance:0}]},{begin:[/\benum\s+/,n,/\s*\{/],
 beginScope:{2:"type",3:"punctuation"},end:/\}/,endScope:"punctuation",
-relevance:0,contains:[_,R,{match:t.concat(c),scope:"variable.constant"}]},{
-match:[/(public|private|protected)\s+/,a,s],scope:{1:"keyword",
-2:"title.function"},starts:x,relevance:1},{
-match:[/(?<!new)(?<!return)(?<=\<|\>|\w)\s+/,a,s],scope:{2:"title.function"},
-relevance:1,starts:x}],[{match:/as\s+(user|system)\b/,scope:"keyword",
-relevance:5}],k,{match:[/\bfor\b\s*/,/\(/,a,o,a,/\s*/,/:/],scope:{3:"type",
-5:"variable",7:"operator"}},H,Y,N,L,f,{begin:[/\[/,/\s*(?=(SELECT|FIND)\b)/],
+relevance:0,contains:[U,T,{match:t.concat(a),scope:"variable.constant"}]},{
+match:[/(public|private|protected)\s+/,n,s],scope:{1:"keyword",
+2:"title.function"},starts:B,relevance:1},{
+match:[/(?<!new)(?<!return)(?<=\<|\>|\w)\s+/,n,s],scope:{2:"title.function"},
+relevance:1,starts:B}],[{match:/as\s+(user|system)\b/,scope:"keyword",
+relevance:5}],P,{match:[/\bfor\b\s*/,/\(/,n,o,n,/\s*/,/:/],scope:{3:"type",
+5:"variable",7:"operator"}},G,W,C,w,p,{begin:[/\[/,/\s*(?=(SELECT|FIND)\b)/],
 end:/\]/,beginScope:{1:"punctuation"},endScope:"punctuation",scope:"soql",
-relevance:10,endsWithParent:!0,keywords:{literal:y.literal,built_in:T},
-contains:[p,w,D,R,{match:/\(|\)/,scope:"punctuation",relevance:0},...i,{
+relevance:10,endsWithParent:!0,keywords:{literal:O.literal,built_in:L},
+contains:[u,k,I,T,{match:/\(|\)/,scope:"punctuation",relevance:0},...l,{
 begin:[/\bFROM\b/,o],beginScope:{1:"keyword"},end:/(?=\bWHERE\b|\]|\s|\))/,
-contains:[{match:a,scope:"type"},...i]},{
+contains:[{match:n,scope:"type"},...l]},{
 match:t.concat(/\b/,t.either("CALENDAR_MONTH","CALENDAR_QUARTER","CALENDAR_YEAR","DAY_IN_MONTH","DAY_IN_WEEK","DAY_IN_YEAR","DAY_ONLY","FISCAL_MONTH","FISCAL_QUARTER","FISCAL_YEAR","HOUR_IN_DAY","WEEK_IN_MONTH","WEEK_IN_YEAR","AVG","convertCurrency","convertTimezone","COUNT_DISTINCT","COUNT","DISTANCE","EXCLUDES","FIELDS","FORMAT","GEOLOCATION","GROUPING","ROLLUP","CUBE","INCLUDES","MAX","MIN","SUM","toLabel","USER_MODE","SYSTEM_MODE","SECURITY_ENFORCED"),/\b/),
 scope:"title.function"},{match:/\b(GROUP|ORDER)\s+BY\b/,scope:"title.function"
 },{match:/\b(TODAY|TOMORROW|YESTERDAY)\b/,scope:"keyword"},{
@@ -99,10 +117,10 @@ match:/(NEXT|LAST|THIS)_(90_DAY|DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEE
 scope:"keyword",relevance:8},{
 match:[/(NEXT|LAST)_N_(DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEEK|YEAR)S/,/\s*:\s*/,/\d+/],
 scope:{1:"keyword",2:"operator",3:"number"},relevance:8},{
-match:t.concat(/\b/,t.either(...y.keyword,"ABOVE_OR_BELOW","ABOVE","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","ASC","BELOW","CATEGORY","CONTAINS","CUSTOM","DATA","DESC","DIVISION","ELSE","END","FIND","FROM","METADATA","NETWORK","ON","PricebookId","RETURNING","ROLLUP","ROWS","SEARCH","SELECT","SNIPPET","SORT","SPELL_CORRECTION","STANDARD","THEN","USING","WHEN","WHERE","WITH","SCOPE","Delegated","Everything","Mine","My_Territory","My_Team_Territory","Team","AND","AT","FIRST","FOR","HAVING","IN","LAST","LIKE","LIMIT","LISTVIEW","NOT","NULLS","OFFSET","OR","REFERENCE","TRACKING","TYPEOF","UPDATE","VIEW","VIEWSTAT"),/\b/),
-scope:"keyword"},{match:[/(?<=:)/,/\s*/,c,/(?!\()/],scope:{3:"variable"},
-relevance:0},{match:[/(?<=:|\.)/,a,/(?=\s*\()/],scope:{2:"title.function.invoke"
+match:t.concat(/\b/,t.either(...O.keyword,"ABOVE_OR_BELOW","ABOVE","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","ASC","BELOW","CATEGORY","CONTAINS","CUSTOM","DATA","DESC","DIVISION","ELSE","END","FIND","FROM","METADATA","NETWORK","ON","PricebookId","RETURNING","ROLLUP","ROWS","SEARCH","SELECT","SNIPPET","SORT","SPELL_CORRECTION","STANDARD","THEN","USING","WHEN","WHERE","WITH","SCOPE","Delegated","Everything","Mine","My_Territory","My_Team_Territory","Team","AND","AT","FIRST","FOR","HAVING","IN","LAST","LIKE","LIMIT","LISTVIEW","NOT","NULLS","OFFSET","OR","REFERENCE","TRACKING","TYPEOF","UPDATE","VIEW","VIEWSTAT"),/\b/),
+scope:"keyword"},{match:[/(?<=:)/,/\s*/,a,/(?!\()/],scope:{3:"variable"},
+relevance:0},{match:[/(?<=:|\.)/,n,/(?=\s*\()/],scope:{2:"title.function.invoke"
 },relevance:0},{match:/:/,scope:"operator",relevance:0}],illegal:"::"
-},G,F,w,C,i,{match:t.concat("(?<=this.)",a,"(?!\\()"),scope:"variable"},{
-match:[t.concat(/\b/,l(...O)),a,o,/(?=\{)/],scope:{2:"property"},relevance:0}]}}
+},Q,Y,k,D,l,{match:t.concat("(?<=this.)",n,"(?!\\()"),scope:"variable"},{
+match:[t.concat(/\b/,b(...N)),n,o,/(?=\{)/],scope:{2:"property"},relevance:0}]}}
 })();export default hljsGrammar;
\ No newline at end of file
diff --git a/dist/apex.min.js b/dist/apex.min.js
index 3d90469..b6c0569 100644
--- a/dist/apex.min.js
+++ b/dist/apex.min.js
@@ -1,97 +1,115 @@
 /*! `apex` grammar compiled for Highlight.js 11.11.1 */
 (()=>{var e=(()=>{"use strict";return e=>{
-const t=e.regex,a="[a-zA-Z][a-zA-Z_0-9]*",n="\\b"+a+"\\b",c="@"+a,s=/(?=\s*\()/,o=/\s+/,r=/\?\./,i=[{
-match:/(?<!\?)\./,scope:"punctuation",relevance:0},{match:r,scope:"operator",
-relevance:0}];function l(...e){return t.concat("(?!",e.join("|"),")")}const p={
-scope:"number",
+const t=e.regex,n="[a-zA-Z][a-zA-Z_0-9]*",a="\\b"+n+"\\b",c="@"+n,s=/(?=\s*\()/,o=/\s+/,i=/(?<!\?)\./,r=/\?\./,l=[{
+match:i,scope:"punctuation",relevance:0},{match:r,scope:"operator",relevance:0
+}],p={match:/(?<!\.)\bId\b/,scope:"type",relevance:8};function b(...e){
+return t.concat("(?!",e.join("|"),")")}const u={scope:"number",
 match:t.either(/\b(\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(\.\d{1,3})?(\-|\+)\d{2}\:\d{2})\b/,/\b(\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(\.\d{1,3})?(Z)?)\b/,/\b(\d{4}\-\d{2}\-\d{2})\b/,/\b0(x|X)[0-9a-fA-F_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/\b0(b|B)[01_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/\b([0-9]+)?\.[0-9]+((e|E)[0-9]+)?(F|f|D|d|M|m)?\b/,/(-?)\b[0-9]+(e|E)[0-9]+(F|f|D|d|M|m)?\b/,/(-?)\b[0-9]+(F|f|D|d|M|m)\b/,/(-?)\b[0-9]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/(-?)(\b0[0-9]+|(\b\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?)/),
 relevance:0
-},b=["try","catch","finally","get","set","put","if","for","else","do","while","continue","break","implements","extends","return","throw","when","new"],u=["instanceof","super","this"],d=["abstract","final","global","override","private","protected","public","static","testMethod","transient","virtual","webservice"],m=["anytype|0","blob|0","boolean|0","byte|0","currency|0","date|0","datetime|0","decimal|0","double|0","enum|0","float|0","integer|0","long|0","object|0","pagereference|8","selectoption|8","short|0","sobject|10","string|0","time|0","void|0","float|0"],E=["insert","update","upsert","delete","undelete","merge","convertLead"],h=["AppLauncher","Approval","Auth","Cache","Canvas","ChatterAnswers","CommerceOrders","fsccashflow","CommercePayments","ConnectApi","Context","Database","Datacloud","DataRetrieval","DataSource","Dataweave","Dom","EventBus","ExternalService","Flow","FormulaEval","Functions","id_verification","industriesDigitalLending","Invocable","KbManagement","LxScheduler","Messaging","Metadata","Pref_center","Process","QuickAction","Reports","RichMessageing","Schema","Search","Sfc","Sfdc_Checkout","IndustriesNlpSvc","PlaceQuote","Sfdc_Enablement","sfdc_surveys","Site","Slack","Support","System","TerritoryMgmt","TxnSecurity","UserProvisioning","VisualEditor","Wave"],v=["Address","Answers","ApexPages","Approval","Assert","AsyncInfo","AsyncOptions","BusinessHours","Cases","Collator","Compression","Continuation","Cookie","Crypto","Database","Date","Datetime","Decimal","Domain","DomainCreator","DomainParser","EmailMessages","EncodingUtil","EventBus","Exception","FeatureManagement","FlexQueue","Formula","FormulaRecalcFieldError","FormulaRecalcResult","Http","HttpRequest","HttpResponse","Ideas","IsvPartners","JSON","JSONGenerator","JSONParser","Label","Limits","Location","Matcher","Math","Messaging","MultiStaticResourceCalloutMock","Network","OrgLimit","OrgLimits","Packaging","PageReference","Pattern","QueueableDuplicateSignature","QueueableDuplicateSignature.Builder","QuickAction","Request","ResetPasswordResult","RestContext","RestRequest","RestResponse","Search","Security","SelectOption","Site","SObject","SObjectAccessDecision","StaticResourceCalloutMock","Test","TimeZone","Type","URL","UserInfo","UserManagement","UUID","Version","WebServiceCallout","XmlStreamReader","XmlStreamWriter"],A=["AccessType","AccessLevel","CallbackStatus","DomainType","JSONToken","LoggingLevel","Quiddity","TriggerOperation","operationType"],S=["false","true","null"],g={
+},d=["try","catch","finally","get","set","put","if","for","else","do","while","continue","break","implements","extends","return","throw","when","new"],m=["instanceof","super","this"],E=["abstract","final","global","override","private","protected","public","static","testMethod","transient","virtual","webservice"],g=["anytype|0","blob|0","boolean|0","byte|0","currency|0","date|0","datetime|0","decimal|0","double|0","enum|0","float|0","integer|0","long|0","object|0","pagereference|8","selectoption|8","short|0","sobject|10","string|0","time|0","void|0","float|0"],h=["insert","update","upsert","delete","undelete","merge","convertLead"],v=["AppLauncher","Approval","Auth","Cache","Canvas","ChatterAnswers","CommerceOrders","fsccashflow","CommercePayments","ConnectApi","Context","Database","Datacloud","DataRetrieval","DataSource","Dataweave","Dom","EventBus","ExternalService","Flow","FormulaEval","Functions","id_verification","industriesDigitalLending","Invocable","KbManagement","LxScheduler","Messaging","Metadata","Pref_center","Process","QuickAction","Reports","RichMessageing","Schema","Search","Sfc","Sfdc_Checkout","IndustriesNlpSvc","PlaceQuote","Sfdc_Enablement","Sfdc_surveys","Site","Slack","Support","System","TerritoryMgmt","TxnSecurity","UserProvisioning","VisualEditor","Wave"],S=["Address","Answers","ApexPages","Approval","Assert","AsyncInfo","AsyncOptions","BusinessHours","Cases","Collator","Compression","Continuation","Cookie","Crypto","Database","Date","Datetime","Decimal","Domain","DomainCreator","DomainParser","EmailMessages","EncodingUtil","EventBus","Exception","FeatureManagement","FlexQueue","Formula","FormulaRecalcFieldError","FormulaRecalcResult","Http","HttpRequest","HttpResponse","Ideas","IsvPartners","JSON","JSONGenerator","JSONParser","Label","Limits","Location","Matcher","Math","Messaging","MultiStaticResourceCalloutMock","Network","OrgLimit","OrgLimits","Packaging","PageReference","Pattern","QueueableDuplicateSignature","QueueableDuplicateSignature.Builder","QuickAction","Request","ResetPasswordResult","RestContext","RestRequest","RestResponse","Search","Security","SelectOption","Site","SObject","SObjectAccessDecision","StaticResourceCalloutMock","Test","TimeZone","Type","URL","UserInfo","UserManagement","UUID","Version","WebServiceCallout","XmlStreamReader","XmlStreamWriter"],A=["AccessType","AccessLevel","CallbackStatus","DomainType","JSONToken","LoggingLevel","Quiddity","TriggerOperation","operationType"],R=["false","true","null"],T={
 match:/,/,scope:"punctuation",relevance:0
-},R=[/--/,/\+\+/,/\&\&|\|\|/,/\*\=|\/\=|\%\=|\+\=|-\=/,/\&\=|\^\=|<<\=|>>\=|>>>\=|\|\=/,/\&|~|\^|\|/,/<<|>>/,/<\=|>\=|\s(<|>)\s/,/\=\=|!\=/,/\=>/,/!(?=\w)/,/(?<=\s)(\?|:)(?=\s)/,r,/(?<=\s)(\?\?)(?=\s)/,/(?<!\?)\?(?!\?|\.|\[)/,/%[^%]|\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/(?<!\=|!)\=(?!\=|>)/],T=h.concat(...v),y={
-$pattern:t.concat(/(?<!\.)\b/,a,/\b/),keyword:[...b,...d,...E],type:m,literal:S
-},O=[...S,...b,...d,...h,...v,...A,...u,...E],L={
-match:t.concat(/\b/,t.either(...u),/\b/),scope:"variable.language",relevance:0
-},N=[{match:[t.concat(/\b/,t.either(...A)),/\./,a,/\b\s*(?![\.\(])/],scope:{
+},y=[/--/,/\+\+/,/\&\&|\|\|/,/\*\=|\/\=|\%\=|\+\=|-\=/,/\&\=|\^\=|<<\=|>>\=|>>>\=|\|\=/,/\&|~|\^|\|/,/<<|>>/,/<\=|>\=|\s(<|>)\s/,/\=\=|!\=/,/\=>/,/!(?=\w)/,/(?<=\s)(\?|:)(?=\s)/,r,/(?<=\s)(\?\?)(?=\s)/,/(?<!\?)\?(?!\?|\.|\[)/,/%[^%]|(?<!\n\s+)\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/(?<!\=|!)\=(?!\=|>)/],L=v.concat(...S),O={
+$pattern:t.concat(/(?<!\.)\b/,n,/\b/),keyword:[...d,...E,...h],type:g,literal:R
+},N=[...R,...d,...E,...v,...S,...A,...m,...h],C={
+match:t.concat(/\b/,t.either(...m),/\b/),scope:"variable.language",relevance:0
+},w=[{match:[t.concat(/\b/,t.either(...A)),/\./,n,/\b\s*(?![\.\(])/],scope:{
 1:"built_in",2:"punctuation",3:"variable"},relevance:0},{
-match:[t.concat(/\b/,t.either(...v)),/\./,a,/\b\s*(?![\.\(])/],scope:{
+match:[t.concat(/\b/,t.either(...S)),/\./,n,/\b\s*(?![\.\(])/],scope:{
 1:"built_in",2:"punctuation",3:"type"},relevance:0},{
-match:[t.concat(/\b/,t.either(...h)),/\./,n,/\b(?=\.)/],scope:{1:"built_in",
+match:[t.concat(/\b/,t.either(...v)),/\./,a,/\b(?=\.)/],scope:{1:"built_in",
 2:"punctuation",3:"type"}},{
-match:[t.concat(/\b/,t.either(...h,...v)),/\./,n,/\b(?!\.)/],scope:{
+match:[t.concat(/\b/,t.either(...v,...S)),/\./,a,/\b(?!\.)/],scope:{
 1:"built_in",2:"punctuation",3:"keyword"}},{
 match:[/\bTrigger\b/,/\./,/(isExecuting|isInsert|isUpdate|isDelete|isBefore|isAfter|isUndelete|new|newMap|old|oldMap|size|operationType)\b(?!\.)/],
 scope:{1:"built_in",2:"punctuation",3:"type"},relevance:10},{
-match:[/\btrigger\b/,/\./,"operationtype",/\./,t.concat(n,/\b/)],scope:{
+match:[/\btrigger\b/,/\./,"operationtype",/\./,t.concat(a,/\b/)],scope:{
 1:"built_in",2:"punctuation",3:"keyword",4:"punctuation",5:"variable.constant"},
-relevance:10}],C=[{
+relevance:10}],D=[{
 match:t.either(",",/;/,/(?<=\w)\>/,/\<(?=\w)/,/\{|\}/,/\(|\)/,/\{|\}/),
-scope:"punctuation",relevance:0},g],D=e.inherit(e.APOS_STRING_MODE,{
-scope:"string",relevance:0,contains:[{match:/\\'/,scope:"literal",relevance:0}]
-}),I=e.COMMENT("//",/[$\n]/,{relevance:0}),_=[e.COMMENT("/\\*","\\*/",{
-relevance:0,contains:[{begin:/\w+@/,relevance:0},{
-match:[/@(?:exception|throws)/,o,a],scope:{1:"doctag",3:"title.class"},
-relevance:0},{begin:"@[A-Za-z_-]+",scope:"doctag",relevance:0},{
-match:[/(?<=@param)\s+/,a],scope:{2:"variable"},relevance:0},{
-contains:[e.BACKSLASH_ESCAPE],relevance:0,variants:[{begin:"`",end:"`",
-scope:"string"},{begin:/'/,end:/'/,scope:"string"}],contains:[]}]}),I],w={
-match:t.either(...R),scope:"operator",relevance:0},U={match:/(?<!\.)\bId\b/,
-scope:"type",relevance:8},f=[{begin:/\b(list|set|map)(?=\s*<)/,
-beginScope:"type",end:/\>+/,endScope:"punctuation",contains:[{match:/\<|\,/,
-scope:"punctuation"},{match:n,scope:"type"}],relevance:8},{
-match:[t.optional(n),/\[/,t.optional(/\d+/),/\]/],scope:{1:"variable",
-2:"punctuation",3:"number",4:"punctuation"}},{match:[a,/\[\]/],scope:{1:"type",
-2:"punctuation"},relevance:0}],M=[{match:t.concat(c,/\b(?!\s*\()/),scope:"meta"
-},{scope:"meta",begin:[t.concat(c,/\b/),/\s*/,/\(/],beginScope:{3:"punctuation"
-},end:/\)/,endScope:"punctuation",contains:[{match:[n,/\s*=/],scope:{
-1:"keyword",2:"operator"},contains:[w]},D,p],keywords:{literal:S}}],k={
-match:[/\b[a-zA-Z0-9\.]*Exception/,o,a],scope:{1:"type",3:"variable"},
-relevance:0},F=[{match:[/(?<!\.)/,n,/\s*(?=\=[^\>])/],scope:{2:"variable"},
-relevance:0},{match:[n,"(?=\\s+"+a+/\s*\=/+")"],scope:{1:"type"},relevance:0},{
-match:[n,o,n,/\s*(?=\=[^\>])/],scope:{1:"type",3:"variable"},relevance:0}],P={
-match:[/(?<=\=\s*\()/,a,"(?=\\)\\s*"+a+")"],scope:{2:"type"},relevance:0},Y={
-match:[/\bnew\s+/,a,s],scope:{2:"type"},relevance:0};let W={scope:"params_call",
-begin:/\(/,beginScope:"punctuation",end:/\)/,endScope:"punctuation",relevance:0,
-keywords:y,contains:[]};const H=[{match:[/(?<=\.)/,a,s],scope:{
-2:"title.function.invoke"},relevance:1,contains:[...i],starts:W},{
-match:[/^\s*/,l(...b),a,s],scope:{3:"title.function.invoke"},relevance:1,
-starts:W}];W.contains=[D,Y,_,w,f,N,p,U,H,{keywords:{KEYWORDS:y},
-match:t.concat(/(?<=\s|\(|\,)/,l(...S),a,/\b/,/(?!\.)/),scope:"variable",
-relevance:0},{match:/\(|\,|\./,scope:"punctuation",relevance:0},{match:a,
-scope:"variable"}];const x={scope:"params",end:/\)/,endScope:"punctuation",
-relevance:1,keywords:y,contains:[p,D,_,f,...N,{match:/\,|\(/,scope:"punctuation"
-},U,{match:[/(?<=\(|\,)\s*/,a,/(?=\s)/],scope:{2:"type"}},{
-match:[o,a,/\s*(?=[,)])/],scope:{2:"variable"}}]},B={
-match:[/\bswitch\s+on\s+/,a],scope:{1:"keyword",2:"variable"}};return{
+scope:"punctuation",relevance:0},T],I=e.inherit(e.APOS_STRING_MODE,{
+scope:"string",relevance:1,contains:[{match:/\\'/,scope:"literal",relevance:1}]
+}),_=[{begin:"`",end:"`",scope:"string"},{begin:/'/,end:/'/,scope:"string"},{
+begin:/"/,end:/"/,scope:"string"}],U=e.COMMENT("//",/[$\n]/,{relevance:0
+}),f=[e.COMMENT("/\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0
+},{match:[/@(?:exception|throws)/,o,t.concat(n,i,n)],scope:{1:"doctag",
+3:"title.class"},relevance:0},{match:[/@(?:exception|throws)/,o,n],scope:{
+1:"doctag",3:"title.class"},relevance:0},{
+begin:[/\{/,/@(?:link|see)/,o,/[a-zA-Z_0-9]*/,t.concat(/(?:#|\.)/,n),s],
+beginScope:{2:"doctag",4:"title.class",5:"title.method"},end:/\}/,contains:[{
+match:/(?:\(|\))/,scope:"punctuation"},{match:[o,n,/\s*(?=[,)])/],scope:{
+2:"variable"}},{match:[n,/(?=\s)/],scope:{1:"type"}}]},{
+begin:[/\{/,/@(?:link|see)/,o,/[a-zA-Z_0-9]*/,t.concat(/(?:#|\.)/,n,/\s*(?=\})/)],
+beginScope:{2:"doctag",4:"title.class",5:"title.method"},end:/\}/,returnEnd:!0
+},{begin:[/\{/,/@(?:link|see)/,o,a],beginScope:{2:"doctag",4:"title.class"},
+end:/\}/,returnEnd:!0},{begin:[/\{/,/@(?:link|see)(?=\s+")/],beginScope:{
+2:"doctag"},end:/\}/,returnEnd:!0,contains:_},{begin:[/\{/,/@(?:link|see)/],
+beginScope:{2:"doctag"},end:/\}/,returnEnd:!0,subLanguage:["markdown","xml"]},{
+begin:[/\{/,/@literal/],beginScope:{2:"doctag"},end:/\}/,returnEnd:!0,
+subLanguage:["apex","xml","javascript"]},{match:c,scope:"doctag",relevance:0},{
+match:[/(?<=@param)\s+/,n],scope:{2:"variable"},relevance:0},{
+contains:[e.BACKSLASH_ESCAPE],relevance:0,variants:_},{begin:/[0-9]+\.[0-9]+/,
+end:/\.*\s+/,scope:"number",excludeEnd:!0},{
+begin:t.either(/\d{4}-\d{1,2}-\d{1,2}/,/\d{1,2}\/\d{1,2}\/\d{4}/),
+scope:"literal"},{begin:[/\{/,/@code/],beginScope:{2:"doctag"},starts:{end:/\}/,
+returnEnd:!0,contains:[{match:/^\s+\*\s+/,skip:!0,relevance:0},{begin:/\{/,
+end:/\}/,skip:!0}],subLanguage:["apex","xml","javascript"]}}]}),U],k={
+match:t.either(...y),scope:"operator",relevance:0},M=[{
+begin:/\b(list|set|map)(?=\s*<)/,beginScope:"type",end:/\>+/,
+endScope:"punctuation",contains:[{match:/\<|\,/,scope:"punctuation"},{match:a,
+scope:"type"}],relevance:8},{match:[t.optional(a),/\[/,t.optional(/\d+/),/\]/],
+scope:{1:"variable",2:"punctuation",3:"number",4:"punctuation"}},{
+match:[n,/\[\]/],scope:{1:"type",2:"punctuation"},relevance:0}],F=[{
+match:t.concat(c,/\b(?!\s*\()/),scope:"meta"},{scope:"meta",
+begin:[t.concat(c,/\b/),/\s*/,/\(/],beginScope:{3:"punctuation"},end:/\)/,
+endScope:"punctuation",contains:[{match:[a,/\s*=/],scope:{1:"keyword",
+2:"operator"},contains:[k]},I,u],keywords:{literal:R}}],P={
+match:[/\b[a-zA-Z0-9\.]*Exception/,o,n],scope:{1:"type",3:"variable"},
+relevance:0},Y=[{match:[/(?<!\.)/,a,/\s*(?=\=[^\>])/],scope:{2:"variable"},
+relevance:0},{match:[a,"(?=\\s+"+n+/\s*\=/+")"],scope:{1:"type"},relevance:0},{
+match:[a,o,a,/\s*(?=\=[^\>])/],scope:{1:"type",3:"variable"},relevance:0}],x={
+match:[/(?<=\=\s*\()/,n,"(?=\\)\\s*"+n+")"],scope:{2:"type"},relevance:0},W={
+match:[/\bnew\s+/,n,s],scope:{2:"type"},relevance:0};let H={begin:/\(/,
+beginScope:"punctuation",end:/\)/,endScope:"punctuation",relevance:0,keywords:O,
+contains:[]};const B=[{match:[/(?<=\.)/,n,s],scope:{2:"title.function.invoke1"},
+relevance:1,contains:[...l],starts:H},{match:[/^\s*/,b(...d),n,s],scope:{
+3:"title.function.invoke"},relevance:1,starts:H}]
+;H.contains=[I,W,f,k,M,w,u,p,B,{keywords:{KEYWORDS:O},
+match:t.concat(/(?<=\s|\(|\,)/,b(...R),n,/\b/,/(?!\.)/),scope:"variable",
+relevance:0},{match:/\(|\,|\./,scope:"punctuation",relevance:0},{match:n,
+scope:"variable"}];const G={scope:"params",end:/\)/,endScope:"punctuation",
+relevance:1,keywords:O,contains:[u,I,f,M,...w,{match:/\,|\(/,scope:"punctuation"
+},p,{match:[/(?<=\(|\,)\s*/,n,/(?=\s)/],scope:{2:"type"}},{
+match:[o,n,/\s*(?=[,)])/],scope:{2:"variable"}}]},Q={
+match:[/\bswitch\s+on\s+/,n],scope:{1:"keyword",2:"variable"}};return{
 name:"Apex",aliases:["apex","lightning","soql","sosl"],case_insensitive:!0,
-disableAutodetect:!1,ignoreIllegals:!1,keywords:y,
+disableAutodetect:!1,ignoreIllegals:!1,keywords:O,
 illegal:["</","<#","<]","<div>","\x3c!--","!DOCTYPE",/<iframe\b/,/^#/,/^import \.[a-zA-Z]+\./,/^import [\w]+/,/^import$/,/^include </,/^use\s+</,/\b(const|var)\s+\w+\s*=/,/\bstruct\b/,"System.log","console.log",/\bfor\s+\w+\s+IN\s+/,/\bif\s+\w+\s+IN\s+/,/\bend\s+if\b/,/\bend\s+select\b/,/\b(int|var)\s+\w+\s+=/,/\b(int[0-9]+|bool)\b/,/\b\$/,/\b_/,"::=",/\s#[a-zA-Z]/,/\s_[a-zA-Z]/,/\s\$[a-zA-Z]/,"#if","%if",/\bif(?!\s+\()/,"%endif","#endif","#_",/\d\s+\d/,/\w::\w/,/\bfloat\b/,/(SELECT|RETURNING)\s+\*/,/END\s+LOOP/,/CREATE\s+FUNCTION/,/\bint\b/,/import\s+\w+\s+=\s+require\("\w+"\)/,"/^include\b/",/\buse\s+strict\b/,/\w+\s+=\s+"\S*";/,/\/include\//,/\Anamespace\b/,/\bend(\.)?\n/,'"""',/\+\+\+/,/<%/,"<%#","%%>","<%%",":-",/\bmergesort\(/,/\bvar\s+env\b/,/\bdef\b\s\W:/,/"[^"]+"/,/\(\*|\*\)/],
-contains:[_,M,D,p,P,f,[{begin:[/\btrigger/,o,a,o,"on",o,a],beginScope:{
+contains:[f,F,I,u,x,M,[{begin:[/\btrigger/,o,n,o,"on",o,n],beginScope:{
 1:"keyword",3:"title.class",5:"operator",7:"type"},end:/(?=\{)/,returnEnd:!0,
-contains:[_,{begin:/\(/,end:/\)/,contains:[{
+contains:[f,{begin:/\(/,end:/\)/,contains:[{
 match:/\b(before|after)\s+(insert|update|delete|merge|undelete)\b/,
-scope:"keyword",relevance:5},g]}]},{relevance:5,
+scope:"keyword",relevance:5},T]}]},{relevance:5,
 match:/\b(with|without|inherited)\s+sharing\b/,scope:"keyword"},{
 begin:[/(?!\.)/,/\b(class|interface)\b(?!\?|\.)/],beginScope:{2:"keyword"},
-end:/(?=\{)/,relevance:1,keywords:{type:m,keyword:b},contains:[{
-match:[/(?<=\bclass)\s+/,a],scope:{2:"title.class"}},{returnEnd:!0,
+end:/(?=\{)/,relevance:1,keywords:{type:g,keyword:d},contains:[{
+match:[/(?<=\bclass)\s+/,n],scope:{2:"title.class"}},{returnEnd:!0,
 endsWithParent:!0,beginKeywords:"implements extends",end:/\{/,contains:[{
-match:[n,/(?=\.)/],scope:{1:"built_in"}},{match:t.concat(n,/(?=\>)/),
-scope:"type"},{match:n,scope:"title.class.inherited"},{match:/<|>|,/,
-scope:"punctuation"},N],relevance:0}]},{begin:[/\benum\s+/,a,/\s*\{/],
+match:[a,/(?=\.)/],scope:{1:"built_in"}},{match:t.concat(a,/(?=\>)/),
+scope:"type"},{match:a,scope:"title.class.inherited"},{match:/<|>|,/,
+scope:"punctuation"},w],relevance:0}]},{begin:[/\benum\s+/,n,/\s*\{/],
 beginScope:{2:"type",3:"punctuation"},end:/\}/,endScope:"punctuation",
-relevance:0,contains:[_,g,{match:t.concat(n),scope:"variable.constant"}]},{
-match:[/(public|private|protected)\s+/,a,s],scope:{1:"keyword",
-2:"title.function"},starts:x,relevance:1},{
-match:[/(?<!new)(?<!return)(?<=\<|\>|\w)\s+/,a,s],scope:{2:"title.function"},
-relevance:1,starts:x}],[{match:/as\s+(user|system)\b/,scope:"keyword",
-relevance:5}],k,{match:[/\bfor\b\s*/,/\(/,a,o,a,/\s*/,/:/],scope:{3:"type",
-5:"variable",7:"operator"}},H,Y,L,N,U,{begin:[/\[/,/\s*(?=(SELECT|FIND)\b)/],
+relevance:0,contains:[f,T,{match:t.concat(a),scope:"variable.constant"}]},{
+match:[/(public|private|protected)\s+/,n,s],scope:{1:"keyword",
+2:"title.function"},starts:G,relevance:1},{
+match:[/(?<!new)(?<!return)(?<=\<|\>|\w)\s+/,n,s],scope:{2:"title.function"},
+relevance:1,starts:G}],[{match:/as\s+(user|system)\b/,scope:"keyword",
+relevance:5}],P,{match:[/\bfor\b\s*/,/\(/,n,o,n,/\s*/,/:/],scope:{3:"type",
+5:"variable",7:"operator"}},B,W,C,w,p,{begin:[/\[/,/\s*(?=(SELECT|FIND)\b)/],
 end:/\]/,beginScope:{1:"punctuation"},endScope:"punctuation",scope:"soql",
-relevance:10,endsWithParent:!0,keywords:{literal:y.literal,built_in:T},
-contains:[p,w,D,g,{match:/\(|\)/,scope:"punctuation",relevance:0},...i,{
+relevance:10,endsWithParent:!0,keywords:{literal:O.literal,built_in:L},
+contains:[u,k,I,T,{match:/\(|\)/,scope:"punctuation",relevance:0},...l,{
 begin:[/\bFROM\b/,o],beginScope:{1:"keyword"},end:/(?=\bWHERE\b|\]|\s|\))/,
-contains:[{match:a,scope:"type"},...i]},{
+contains:[{match:n,scope:"type"},...l]},{
 match:t.concat(/\b/,t.either("CALENDAR_MONTH","CALENDAR_QUARTER","CALENDAR_YEAR","DAY_IN_MONTH","DAY_IN_WEEK","DAY_IN_YEAR","DAY_ONLY","FISCAL_MONTH","FISCAL_QUARTER","FISCAL_YEAR","HOUR_IN_DAY","WEEK_IN_MONTH","WEEK_IN_YEAR","AVG","convertCurrency","convertTimezone","COUNT_DISTINCT","COUNT","DISTANCE","EXCLUDES","FIELDS","FORMAT","GEOLOCATION","GROUPING","ROLLUP","CUBE","INCLUDES","MAX","MIN","SUM","toLabel","USER_MODE","SYSTEM_MODE","SECURITY_ENFORCED"),/\b/),
 scope:"title.function"},{match:/\b(GROUP|ORDER)\s+BY\b/,scope:"title.function"
 },{match:/\b(TODAY|TOMORROW|YESTERDAY)\b/,scope:"keyword"},{
@@ -99,10 +117,10 @@ match:/(NEXT|LAST|THIS)_(90_DAY|DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEE
 scope:"keyword",relevance:8},{
 match:[/(NEXT|LAST)_N_(DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEEK|YEAR)S/,/\s*:\s*/,/\d+/],
 scope:{1:"keyword",2:"operator",3:"number"},relevance:8},{
-match:t.concat(/\b/,t.either(...y.keyword,"ABOVE_OR_BELOW","ABOVE","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","ASC","BELOW","CATEGORY","CONTAINS","CUSTOM","DATA","DESC","DIVISION","ELSE","END","FIND","FROM","METADATA","NETWORK","ON","PricebookId","RETURNING","ROLLUP","ROWS","SEARCH","SELECT","SNIPPET","SORT","SPELL_CORRECTION","STANDARD","THEN","USING","WHEN","WHERE","WITH","SCOPE","Delegated","Everything","Mine","My_Territory","My_Team_Territory","Team","AND","AT","FIRST","FOR","HAVING","IN","LAST","LIKE","LIMIT","LISTVIEW","NOT","NULLS","OFFSET","OR","REFERENCE","TRACKING","TYPEOF","UPDATE","VIEW","VIEWSTAT"),/\b/),
-scope:"keyword"},{match:[/(?<=:)/,/\s*/,n,/(?!\()/],scope:{3:"variable"},
-relevance:0},{match:[/(?<=:|\.)/,a,/(?=\s*\()/],scope:{2:"title.function.invoke"
+match:t.concat(/\b/,t.either(...O.keyword,"ABOVE_OR_BELOW","ABOVE","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","ASC","BELOW","CATEGORY","CONTAINS","CUSTOM","DATA","DESC","DIVISION","ELSE","END","FIND","FROM","METADATA","NETWORK","ON","PricebookId","RETURNING","ROLLUP","ROWS","SEARCH","SELECT","SNIPPET","SORT","SPELL_CORRECTION","STANDARD","THEN","USING","WHEN","WHERE","WITH","SCOPE","Delegated","Everything","Mine","My_Territory","My_Team_Territory","Team","AND","AT","FIRST","FOR","HAVING","IN","LAST","LIKE","LIMIT","LISTVIEW","NOT","NULLS","OFFSET","OR","REFERENCE","TRACKING","TYPEOF","UPDATE","VIEW","VIEWSTAT"),/\b/),
+scope:"keyword"},{match:[/(?<=:)/,/\s*/,a,/(?!\()/],scope:{3:"variable"},
+relevance:0},{match:[/(?<=:|\.)/,n,/(?=\s*\()/],scope:{2:"title.function.invoke"
 },relevance:0},{match:/:/,scope:"operator",relevance:0}],illegal:"::"
-},B,F,w,C,i,{match:t.concat("(?<=this.)",a,"(?!\\()"),scope:"variable"},{
-match:[t.concat(/\b/,l(...O)),a,o,/(?=\{)/],scope:{2:"property"},relevance:0}]}}
+},Q,Y,k,D,l,{match:t.concat("(?<=this.)",n,"(?!\\()"),scope:"variable"},{
+match:[t.concat(/\b/,b(...N)),n,o,/(?=\{)/],scope:{2:"property"},relevance:0}]}}
 })();hljs.registerLanguage("apex",e)})();
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 072ee78..0b8b0ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,6 +22,7 @@
 			"version": "11.11.1",
 			"resolved": "https://registry.npmjs.org/@highlightjs/cdn-assets/-/cdn-assets-11.11.1.tgz",
 			"integrity": "sha512-VEPdHzwelZ12hEX18BHduqxMZGolcUsrbeokHYxOUIm8X2+M7nx5QPtPeQgRxR9XjhdLv4/7DD5BWOlSrJ3k7Q==",
+			"license": "BSD-3-Clause",
 			"engines": {
 				"node": ">=12.0.0"
 			}
@@ -56,9 +57,9 @@
 			}
 		},
 		"node_modules/ansi-regex": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-			"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+			"version": "6.2.2",
+			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+			"integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -73,6 +74,7 @@
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
 			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"color-convert": "^2.0.1"
 			},
@@ -87,7 +89,8 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
 			"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-			"dev": true
+			"dev": true,
+			"license": "Python-2.0"
 		},
 		"node_modules/balanced-match": {
 			"version": "1.0.2",
@@ -97,9 +100,9 @@
 			"license": "MIT"
 		},
 		"node_modules/brace-expansion": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-			"integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+			"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -110,13 +113,15 @@
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
 			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-			"dev": true
+			"dev": true,
+			"license": "ISC"
 		},
 		"node_modules/camelcase": {
 			"version": "6.3.0",
 			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
 			"integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -129,6 +134,7 @@
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
 			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"ansi-styles": "^4.1.0",
 				"supports-color": "^7.1.0"
@@ -145,6 +151,7 @@
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -251,6 +258,7 @@
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"color-name": "~1.1.4"
 			},
@@ -262,7 +270,8 @@
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/cross-spawn": {
 			"version": "7.0.6",
@@ -280,12 +289,13 @@
 			}
 		},
 		"node_modules/debug": {
-			"version": "4.3.5",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-			"integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+			"version": "4.4.3",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+			"integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
-				"ms": "2.1.2"
+				"ms": "^2.1.3"
 			},
 			"engines": {
 				"node": ">=6.0"
@@ -296,17 +306,12 @@
 				}
 			}
 		},
-		"node_modules/debug/node_modules/ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-			"dev": true
-		},
 		"node_modules/decamelize": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
 			"integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -353,6 +358,7 @@
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
 			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -365,6 +371,7 @@
 			"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
 			"integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"locate-path": "^6.0.0",
 				"path-exists": "^4.0.0"
@@ -381,18 +388,19 @@
 			"resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
 			"integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"bin": {
 				"flat": "cli.js"
 			}
 		},
 		"node_modules/foreground-child": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
-			"integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+			"version": "3.3.1",
+			"resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+			"integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
 			"dev": true,
 			"license": "ISC",
 			"dependencies": {
-				"cross-spawn": "^7.0.0",
+				"cross-spawn": "^7.0.6",
 				"signal-exit": "^4.0.1"
 			},
 			"engines": {
@@ -438,6 +446,7 @@
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
@@ -447,6 +456,7 @@
 			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
 			"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"he": "bin/he"
 			}
@@ -466,6 +476,7 @@
 			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
 			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
@@ -475,6 +486,7 @@
 			"resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
 			"integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
@@ -510,6 +522,7 @@
 			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
 			"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"argparse": "^2.0.1"
 			},
@@ -522,6 +535,7 @@
 			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
 			"integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"p-locate": "^5.0.0"
 			},
@@ -537,6 +551,7 @@
 			"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
 			"integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"chalk": "^4.1.0",
 				"is-unicode-supported": "^0.1.0"
@@ -576,6 +591,7 @@
 			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
 			"integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
 			"dev": true,
+			"license": "MIT",
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
@@ -630,13 +646,15 @@
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
 			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/p-limit": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
 			"integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"yocto-queue": "^0.1.0"
 			},
@@ -652,6 +670,7 @@
 			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
 			"integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"p-limit": "^3.0.2"
 			},
@@ -674,6 +693,7 @@
 			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
 			"integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			}
@@ -717,6 +737,7 @@
 			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
 			"integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
 			"dev": true,
+			"license": "MIT",
 			"bin": {
 				"prettier": "bin/prettier.cjs"
 			},
@@ -732,6 +753,7 @@
 			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
 			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"safe-buffer": "^5.1.0"
 			}
@@ -778,13 +800,15 @@
 					"type": "consulting",
 					"url": "https://feross.org/support"
 				}
-			]
+			],
+			"license": "MIT"
 		},
 		"node_modules/serialize-javascript": {
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
 			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
 			"dev": true,
+			"license": "BSD-3-Clause",
 			"dependencies": {
 				"randombytes": "^2.1.0"
 			}
@@ -817,6 +841,7 @@
 			"resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
 			"integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"should-equal": "^2.0.0",
 				"should-format": "^3.0.3",
@@ -830,6 +855,7 @@
 			"resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
 			"integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"should-type": "^1.4.0"
 			}
@@ -839,6 +865,7 @@
 			"resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
 			"integrity": "sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"should-type": "^1.3.0",
 				"should-type-adaptors": "^1.0.1"
@@ -848,13 +875,15 @@
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
 			"integrity": "sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/should-type-adaptors": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
 			"integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"should-type": "^1.3.0",
 				"should-util": "^1.0.0"
@@ -864,7 +893,8 @@
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz",
 			"integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==",
-			"dev": true
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/signal-exit": {
 			"version": "4.1.0",
@@ -944,9 +974,9 @@
 			}
 		},
 		"node_modules/strip-ansi": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-			"integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+			"integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -988,6 +1018,7 @@
 			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=8"
 			},
@@ -1000,6 +1031,7 @@
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
 			"integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"has-flag": "^4.0.0"
 			},
@@ -1027,9 +1059,9 @@
 			}
 		},
 		"node_modules/workerpool": {
-			"version": "9.3.2",
-			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.2.tgz",
-			"integrity": "sha512-Xz4Nm9c+LiBHhDR5bDLnNzmj6+5F+cyEAWPMkbs2awq/dYazR/efelZzUAjB/y3kNHL+uzkHvxVVpaOfGCPV7A==",
+			"version": "9.3.4",
+			"resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.4.tgz",
+			"integrity": "sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==",
 			"dev": true,
 			"license": "Apache-2.0"
 		},
@@ -1116,9 +1148,9 @@
 			}
 		},
 		"node_modules/wrap-ansi/node_modules/ansi-styles": {
-			"version": "6.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-			"integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+			"version": "6.2.3",
+			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+			"integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -1172,6 +1204,7 @@
 			"resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
 			"integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"camelcase": "^6.0.0",
 				"decamelize": "^4.0.0",
@@ -1232,6 +1265,7 @@
 			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
 			"integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			},
diff --git a/src/languages/apex.js b/src/languages/apex.js
index 1ff7447..95da1a0 100644
--- a/src/languages/apex.js
+++ b/src/languages/apex.js
@@ -21,6 +21,9 @@ export default function (hljs) {
     { match: ACCESSOR, scope: 'punctuation', relevance: 0 },
     { match: NULLSAFE, scope: 'operator', relevance: 0 }
   ];
+  const MM_DD_YYYY = /\d{1,2}\/\d{1,2}\/\d{4}/;
+  const YYYY_MM_DD = /\d{4}-\d{1,2}-\d{1,2}/;
+  const SALESFORCE_ID = { match: /(?<!\.)\bId\b/, scope: 'type', relevance: 8 };
 
   /**
    * @param {...(RegExp | string) } args
@@ -168,7 +171,7 @@ export default function (hljs) {
     'IndustriesNlpSvc',
     'PlaceQuote',
     'Sfdc_Enablement',
-    'sfdc_surveys',
+    'Sfdc_surveys',
     'Site',
     'Slack',
     'Support',
@@ -305,7 +308,7 @@ export default function (hljs) {
     NULLSAFE, // null-safe operator
     /(?<=\s)(\?\?)(?=\s)/, // null coalescing operator
     /(?<!\?)\?(?!\?|\.|\[)/, // ternary operator or CONDITIONAL_OPERATOR
-    /%[^%]|\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/, // arithmetic
+    /%[^%]|(?<!\n\s+)\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/, // arithmetic
     /(?<!\=|!)\=(?!\=|>)/ // assignment
   ];
 
@@ -420,10 +423,16 @@ export default function (hljs) {
 
   const STRINGS = hljs.inherit(hljs.APOS_STRING_MODE, {
     scope: 'string',
-    relevance: 0,
-    contains: [{ match: /\\'/, scope: 'literal', relevance: 0 }]
+    relevance: 1,
+    contains: [{ match: /\\'/, scope: 'literal', relevance: 1 }]
   });
 
+  const COMMENT_STRINGS = [
+    { begin: '`', end: '`', scope: 'string' },
+    { begin: /'/, end: /'/, scope: 'string' },
+    { begin: /"/, end: /"/, scope: 'string' }
+  ];
+
   const COMMENT_LINE = hljs.COMMENT('//', /[$\n]/, { relevance: 0 });
 
   const COMMENT_BLOCK = hljs.COMMENT('/\\*', '\\*/', {
@@ -434,34 +443,117 @@ export default function (hljs) {
         begin: /\w+@/,
         relevance: 0
       },
+      {
+        match: [
+          /@(?:exception|throws)/,
+          SPACE,
+          regex.concat(APEX_IDENT_RE, ACCESSOR, APEX_IDENT_RE)
+        ],
+        scope: {
+          1: 'doctag',
+          3: 'title.class'
+        },
+        relevance: 0
+      },
       {
         match: [/@(?:exception|throws)/, SPACE, APEX_IDENT_RE],
         scope: { 1: 'doctag', 3: 'title.class' },
         relevance: 0
       },
-      { begin: '@[A-Za-z_-]+', scope: 'doctag', relevance: 0 },
+      {
+        // Reference to a method with parameters
+        // prettier-ignore
+        begin: [/\{/, /@(?:link|see)/, SPACE , /[a-zA-Z_0-9]*/, regex.concat(/(?:#|\.)/, APEX_IDENT_RE), SPACEPARENS_LOOKAHEAD ],
+        // prettier-ignore
+        beginScope: {2: 'doctag', 4: 'title.class', 5: 'title.method'},
+        end: /\}/,
+        contains: [
+          //PUNCTUATION,
+          { match: /(?:\(|\))/, scope: 'punctuation' },
+          {
+            match: [SPACE, APEX_IDENT_RE, /\s*(?=[,)])/],
+            scope: { 2: 'variable' }
+          },
+          { match: [APEX_IDENT_RE, /(?=\s)/], scope: { 1: 'type' } }
+        ]
+      },
+      {
+        // Reference to method without parameters
+        // prettier-ignore
+        begin: [/\{/, /@(?:link|see)/, SPACE ,  /[a-zA-Z_0-9]*/, regex.concat(/(?:#|\.)/, APEX_IDENT_RE, /\s*(?=\})/)],
+        // prettier-ignore
+        beginScope: {2: 'doctag', 4: 'title.class', 5: 'title.method' },
+        end: /\}/,
+        returnEnd: true
+      },
+      {
+        begin: [/\{/, /@(?:link|see)/, SPACE, APEX_IDENT_WORD_RE],
+        beginScope: { 2: 'doctag', 4: 'title.class' },
+        end: /\}/,
+        returnEnd: true
+      },
+      {
+        begin: [/\{/, /@(?:link|see)(?=\s+")/],
+        beginScope: { 2: 'doctag' },
+        end: /\}/,
+        returnEnd: true,
+        contains: COMMENT_STRINGS
+      },
+
+      {
+        begin: [/\{/, /@(?:link|see)/],
+        beginScope: { 2: 'doctag' },
+        end: /\}/,
+        returnEnd: true,
+        subLanguage: ['markdown', 'xml']
+      },
+      {
+        begin: [/\{/, /@literal/],
+        beginScope: { 2: 'doctag' },
+        end: /\}/,
+        returnEnd: true,
+        subLanguage: ['apex', 'xml', 'javascript']
+      },
+      { match: ANNOTATION_RE, scope: 'doctag', relevance: 0 },
       {
         match: [/(?<=@param)\s+/, APEX_IDENT_RE],
         scope: { 2: 'variable' },
         relevance: 0
       },
       {
-        /* begin: '`',
-        end: '`',
-        scope: 'string', */
-        //excludeBegin: true,
-        //excludeEnd: true,
         contains: [hljs.BACKSLASH_ESCAPE],
         relevance: 0,
-        variants: [
-          { begin: '`', end: '`', scope: 'string' }, //, beginScope: 'hidden', endScope: 'hidden' },
-          { begin: /'/, end: /'/, scope: 'string' }
-        ],
-        contains: [
-          // {match: '`', scope: 'hidden'}
-        ]
+        variants: COMMENT_STRINGS
+      },
+      {
+        // version numbers
+        begin: /[0-9]+\.[0-9]+/,
+        end: /\.*\s+/,
+        scope: 'number',
+        excludeEnd: true
+      },
+      {
+        // #YYYY-MM-DD# (ISO-Date) or #M/D/YYYY# (US/Euro-Date)
+        begin: regex.either(YYYY_MM_DD, MM_DD_YYYY),
+        scope: 'literal'
+      },
+      {
+        begin: [/\{/, /@code/],
+        beginScope: { 2: 'doctag' },
+        starts: {
+          end: /\}/,
+          returnEnd: true,
+          contains: [
+            {
+              match: /^\s+\*\s+/,
+              skip: true,
+              relevance: 0
+            },
+            { begin: /\{/, end: /\}/, skip: true }
+          ],
+          subLanguage: ['apex', 'xml', 'javascript']
+        }
       }
-      // TODO : Code Sample in method header
     ]
   });
 
@@ -473,8 +565,6 @@ export default function (hljs) {
     relevance: 0
   };
 
-  const SALESFORCE_ID = { match: /(?<!\.)\bId\b/, scope: 'type', relevance: 8 };
-
   const COLLECTIONS = [
     {
       //scope: 'clause: collection',
@@ -578,8 +668,6 @@ export default function (hljs) {
   };
 
   let PARAMS_CALL = {
-    //scope: 'clause: params call',
-    scope: 'params_call',
     begin: /\(/,
     beginScope: 'punctuation',
     end: /\)/,
@@ -592,7 +680,7 @@ export default function (hljs) {
   const METHOD_CALL = [
     {
       match: [/(?<=\.)/, APEX_IDENT_RE, SPACEPARENS_LOOKAHEAD],
-      scope: { 2: 'title.function.invoke' },
+      scope: { 2: 'title.function.invoke1' },
       relevance: 1,
       contains: [...DOT_NOTATION],
       starts: PARAMS_CALL
@@ -741,7 +829,6 @@ export default function (hljs) {
     beginScope: { 2: 'type', 3: 'punctuation' },
     end: /\}/,
     endScope: 'punctuation',
-    //scope: 'enum_declaration',
     relevance: 0,
     contains: [
       COMMENTS,
@@ -785,7 +872,9 @@ export default function (hljs) {
     scope: { 1: 'keyword', 2: 'variable' }
   };
 
-  const DML_OPERATIONS = [{ match: /as\s+(user|system)\b/, scope: 'keyword', relevance: 5 }];
+  const DML_OPERATIONS = [
+    { match: /as\s+(user|system)\b/, scope: 'keyword', relevance: 5 }
+  ];
 
   /**
    * SOQL SECTION
@@ -1089,6 +1178,38 @@ export default function (hljs) {
     /\(\*|\*\)/ //mathematica, ocaml
   ];
 
+  const APEX_PARTS = [
+    COMMENTS,
+    ANNOTATIONS,
+    STRINGS,
+    NUMBERS,
+    CASTING,
+    COLLECTIONS,
+    DECLARATIONS,
+    DML_OPERATIONS,
+    EXCEPTION,
+    FOR_LOOP,
+    METHOD_CALL,
+    INSTANTIATE_TYPE,
+    LANGUAGE_VARS_RE,
+    NAMESPACES,
+    SALESFORCE_ID,
+    SOQL_QUERY,
+    SWITCH_STATEMENT,
+    VAR_ASSIGN,
+    OPERATORS, // includes null-safe
+    PUNCTUATION, // includes comma
+    DOT_NOTATION,
+    THIS,
+    PROPERTY
+    // the last coloring to do is to eat the unclaimed variables
+    /* {
+        match: [regex.concat(/\b/, noneOf(...RESERVED_WORDS).concat([/\./]),/\b/),  APEX_IDENT_WORD_RE, ';'],
+        scope: {2: 'variable', 3: 'punctuation'},
+        keywords: KEYWORDS
+      } */
+  ];
+
   return {
     name: 'Apex',
     aliases: ['apex', 'lightning', 'soql', 'sosl'],
@@ -1097,37 +1218,7 @@ export default function (hljs) {
     ignoreIllegals: false,
     keywords: KEYWORDS,
     illegal: ILLEGALS,
-    contains: [
-      COMMENTS,
-      ANNOTATIONS,
-      STRINGS,
-      NUMBERS,
-      CASTING,
-      COLLECTIONS,
-      DECLARATIONS,
-      DML_OPERATIONS,
-      EXCEPTION,
-      FOR_LOOP,
-      METHOD_CALL,
-      INSTANTIATE_TYPE,
-      LANGUAGE_VARS_RE,
-      NAMESPACES,
-      SALESFORCE_ID,
-      SOQL_QUERY,
-      SWITCH_STATEMENT,
-      VAR_ASSIGN,
-      OPERATORS, // includes null-safe
-      PUNCTUATION, // includes comma
-      DOT_NOTATION,
-      THIS,
-      PROPERTY
-      // the last coloring to do is to eat the unclaimed variables
-      /* {
-        match: [regex.concat(/\b/, noneOf(...RESERVED_WORDS).concat([/\./]),/\b/),  APEX_IDENT_WORD_RE, ';'],
-        scope: {2: 'variable', 3: 'punctuation'},
-        keywords: KEYWORDS
-      } */
-    ]
+    contains: [...APEX_PARTS]
   };
 
   /*   // * Can use later; omitted for now
diff --git a/src/styles/monokai-sublime-apex.css b/src/styles/monokai-sublime-apex.css
index e08880b..d3600b1 100644
--- a/src/styles/monokai-sublime-apex.css
+++ b/src/styles/monokai-sublime-apex.css
@@ -46,7 +46,6 @@ Monokai color scheme by Wimer Hazenberg 2006 https://monokai.nl/
 	font-style: italic;
 }
 .hljs-bullet,
-
 .hljs-selector-id,
 .hljs-template-variable {
 	color: #e6db74;
@@ -63,6 +62,9 @@ Monokai color scheme by Wimer Hazenberg 2006 https://monokai.nl/
 .hljs-comment {
 	color: #75715e;
 }
+.hljs-comment .hljs-code {
+	color: inherit;
+}
 .hljs-deletion {
 	color: #f92672;
 	background: #90274a80;

From cd5a9fbb59577b3746b271f712af23089a37e3e4 Mon Sep 17 00:00:00 2001
From: David Schach <636977+dschach@users.noreply.github.com>
Date: Fri, 10 Oct 2025 11:35:40 -0700
Subject: [PATCH 2/2] chore: refactor JS variables (#102)

And include Dom namespace
---
 dist/apex.es.min.js   | 142 +++++++++++++++++++++---------------------
 dist/apex.min.js      | 142 +++++++++++++++++++++---------------------
 src/languages/apex.js |  60 ++++++++++--------
 3 files changed, 175 insertions(+), 169 deletions(-)

diff --git a/dist/apex.es.min.js b/dist/apex.es.min.js
index 62ab9e9..67bba78 100644
--- a/dist/apex.es.min.js
+++ b/dist/apex.es.min.js
@@ -1,115 +1,115 @@
 /*! `apex` grammar compiled for Highlight.js 11.11.1 */
 var hljsGrammar=(()=>{"use strict";return e=>{
-const t=e.regex,n="[a-zA-Z][a-zA-Z_0-9]*",a="\\b"+n+"\\b",c="@"+n,s=/(?=\s*\()/,o=/\s+/,i=/(?<!\?)\./,r=/\?\./,l=[{
-match:i,scope:"punctuation",relevance:0},{match:r,scope:"operator",relevance:0
-}],p={match:/(?<!\.)\bId\b/,scope:"type",relevance:8};function b(...e){
-return t.concat("(?!",e.join("|"),")")}const u={scope:"number",
+const t=e.regex,n="[a-zA-Z][a-zA-Z_0-9]*",a="\\b"+n+"\\b",c="@"+n,s=/(?=\s*\()/,o=/\s+/,i=/\{/,r=/\}/,l=/\(/,p=/\)/,b=/(?<!\?)\./,u=/\?\./,d=[{
+match:b,scope:"punctuation",relevance:0},{match:u,scope:"operator",relevance:0
+}],m={match:/(?<!\.)\bId\b/,scope:"type",relevance:8};function E(...e){
+return t.concat("(?!",e.join("|"),")")}const g={scope:"number",
 match:t.either(/\b(\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(\.\d{1,3})?(\-|\+)\d{2}\:\d{2})\b/,/\b(\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(\.\d{1,3})?(Z)?)\b/,/\b(\d{4}\-\d{2}\-\d{2})\b/,/\b0(x|X)[0-9a-fA-F_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/\b0(b|B)[01_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/\b([0-9]+)?\.[0-9]+((e|E)[0-9]+)?(F|f|D|d|M|m)?\b/,/(-?)\b[0-9]+(e|E)[0-9]+(F|f|D|d|M|m)?\b/,/(-?)\b[0-9]+(F|f|D|d|M|m)\b/,/(-?)\b[0-9]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/(-?)(\b0[0-9]+|(\b\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?)/),
 relevance:0
-},d=["try","catch","finally","get","set","put","if","for","else","do","while","continue","break","implements","extends","return","throw","when","new"],m=["instanceof","super","this"],E=["abstract","final","global","override","private","protected","public","static","testMethod","transient","virtual","webservice"],h=["anytype|0","blob|0","boolean|0","byte|0","currency|0","date|0","datetime|0","decimal|0","double|0","enum|0","float|0","integer|0","long|0","object|0","pagereference|8","selectoption|8","short|0","sobject|10","string|0","time|0","void|0","float|0"],g=["insert","update","upsert","delete","undelete","merge","convertLead"],v=["AppLauncher","Approval","Auth","Cache","Canvas","ChatterAnswers","CommerceOrders","fsccashflow","CommercePayments","ConnectApi","Context","Database","Datacloud","DataRetrieval","DataSource","Dataweave","Dom","EventBus","ExternalService","Flow","FormulaEval","Functions","id_verification","industriesDigitalLending","Invocable","KbManagement","LxScheduler","Messaging","Metadata","Pref_center","Process","QuickAction","Reports","RichMessageing","Schema","Search","Sfc","Sfdc_Checkout","IndustriesNlpSvc","PlaceQuote","Sfdc_Enablement","Sfdc_surveys","Site","Slack","Support","System","TerritoryMgmt","TxnSecurity","UserProvisioning","VisualEditor","Wave"],S=["Address","Answers","ApexPages","Approval","Assert","AsyncInfo","AsyncOptions","BusinessHours","Cases","Collator","Compression","Continuation","Cookie","Crypto","Database","Date","Datetime","Decimal","Domain","DomainCreator","DomainParser","EmailMessages","EncodingUtil","EventBus","Exception","FeatureManagement","FlexQueue","Formula","FormulaRecalcFieldError","FormulaRecalcResult","Http","HttpRequest","HttpResponse","Ideas","IsvPartners","JSON","JSONGenerator","JSONParser","Label","Limits","Location","Matcher","Math","Messaging","MultiStaticResourceCalloutMock","Network","OrgLimit","OrgLimits","Packaging","PageReference","Pattern","QueueableDuplicateSignature","QueueableDuplicateSignature.Builder","QuickAction","Request","ResetPasswordResult","RestContext","RestRequest","RestResponse","Search","Security","SelectOption","Site","SObject","SObjectAccessDecision","StaticResourceCalloutMock","Test","TimeZone","Type","URL","UserInfo","UserManagement","UUID","Version","WebServiceCallout","XmlStreamReader","XmlStreamWriter"],A=["AccessType","AccessLevel","CallbackStatus","DomainType","JSONToken","LoggingLevel","Quiddity","TriggerOperation","operationType"],R=["false","true","null"],T={
+},h=["try","catch","finally","get","set","put","if","for","else","do","while","continue","break","implements","extends","return","throw","when","new"],v=["instanceof","super","this"],S=["abstract","final","global","override","private","protected","public","static","testMethod","transient","virtual","webservice"],A=["anytype|0","blob|0","boolean|0","byte|0","currency|0","date|0","datetime|0","decimal|0","double|0","enum|0","float|0","integer|0","long|0","object|0","pagereference|8","selectoption|8","short|0","sobject|10","string|0","time|0","void|0","float|0"],R=["insert","update","upsert","delete","undelete","merge","convertLead"],T=["AppLauncher","Approval","Auth","Cache","Canvas","ChatterAnswers","CommerceOrders","fsccashflow","CommercePayments","ConnectApi","Context","Database","Datacloud","DataRetrieval","DataSource","Dataweave","Dom","EventBus","ExternalService","Flow","FormulaEval","Functions","id_verification","industriesDigitalLending","Invocable","KbManagement","LxScheduler","Messaging","Metadata","Pref_center","Process","QuickAction","Reports","RichMessageing","Schema","Search","Sfc","Sfdc_Checkout","IndustriesNlpSvc","PlaceQuote","Sfdc_Enablement","Sfdc_surveys","Site","Slack","Support","System","TerritoryMgmt","TxnSecurity","UserProvisioning","VisualEditor","Wave"],y=["Address","Answers","ApexPages","Approval","Assert","AsyncInfo","AsyncOptions","BusinessHours","Cases","Collator","Compression","Continuation","Cookie","Crypto","Database","Date","Datetime","Decimal","Dom","Domain","DomainCreator","DomainParser","EmailMessages","EncodingUtil","EventBus","Exception","FeatureManagement","FlexQueue","Formula","FormulaRecalcFieldError","FormulaRecalcResult","Http","HttpRequest","HttpResponse","Ideas","IsvPartners","JSON","JSONGenerator","JSONParser","Label","Limits","Location","Matcher","Math","Messaging","MultiStaticResourceCalloutMock","Network","OrgLimit","OrgLimits","Packaging","PageReference","Pattern","QueueableDuplicateSignature","QueueableDuplicateSignature.Builder","QuickAction","Request","ResetPasswordResult","RestContext","RestRequest","RestResponse","Search","Security","SelectOption","Site","SObject","SObjectAccessDecision","StaticResourceCalloutMock","Test","TimeZone","Type","URL","UserInfo","UserManagement","UUID","Version","WebServiceCallout","XmlStreamReader","XmlStreamWriter"],L=["AccessType","AccessLevel","CallbackStatus","DomainType","JSONToken","LoggingLevel","Quiddity","TriggerOperation","operationType"],O=["false","true","null"],N={
 match:/,/,scope:"punctuation",relevance:0
-},y=[/--/,/\+\+/,/\&\&|\|\|/,/\*\=|\/\=|\%\=|\+\=|-\=/,/\&\=|\^\=|<<\=|>>\=|>>>\=|\|\=/,/\&|~|\^|\|/,/<<|>>/,/<\=|>\=|\s(<|>)\s/,/\=\=|!\=/,/\=>/,/!(?=\w)/,/(?<=\s)(\?|:)(?=\s)/,r,/(?<=\s)(\?\?)(?=\s)/,/(?<!\?)\?(?!\?|\.|\[)/,/%[^%]|(?<!\n\s+)\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/(?<!\=|!)\=(?!\=|>)/],L=v.concat(...S),O={
-$pattern:t.concat(/(?<!\.)\b/,n,/\b/),keyword:[...d,...E,...g],type:h,literal:R
-},N=[...R,...d,...E,...v,...S,...A,...m,...g],C={
-match:t.concat(/\b/,t.either(...m),/\b/),scope:"variable.language",relevance:0
-},w=[{match:[t.concat(/\b/,t.either(...A)),/\./,n,/\b\s*(?![\.\(])/],scope:{
+},w=[/--/,/\+\+/,/\&\&|\|\|/,/\*\=|\/\=|\%\=|\+\=|-\=/,/\&\=|\^\=|<<\=|>>\=|>>>\=|\|\=/,/\&|~|\^|\|/,/<<|>>/,/<\=|>\=|\s(<|>)\s/,/\=\=|!\=/,/\=>/,/!(?=\w)/,/(?<=\s)(\?|:)(?=\s)/,u,/(?<=\s)(\?\?)(?=\s)/,/(?<!\?)\?(?!\?|\.|\[)/,/%[^%]|(?<!\n\s+)\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/(?<!\=|!)\=(?!\=|>)/],C=T.concat(...y),D={
+$pattern:t.concat(/(?<!\.)\b/,n,/\b/),keyword:[...h,...S,...R],type:A,literal:O
+},I=[...O,...h,...S,...T,...y,...L,...v,...R],_={
+match:t.concat(/\b/,t.either(...v),/\b/),scope:"variable.language",relevance:0
+},f=[{match:[t.concat(/\b/,t.either(...L)),/\./,n,/\b\s*(?![\.\(])/],scope:{
 1:"built_in",2:"punctuation",3:"variable"},relevance:0},{
-match:[t.concat(/\b/,t.either(...S)),/\./,n,/\b\s*(?![\.\(])/],scope:{
+match:[t.concat(/\b/,t.either(...y)),/\./,n,/\b\s*(?![\.\(])/],scope:{
 1:"built_in",2:"punctuation",3:"type"},relevance:0},{
-match:[t.concat(/\b/,t.either(...v)),/\./,a,/\b(?=\.)/],scope:{1:"built_in",
+match:[t.concat(/\b/,t.either(...T)),/\./,a,/\b(?=\.)/],scope:{1:"built_in",
 2:"punctuation",3:"type"}},{
-match:[t.concat(/\b/,t.either(...v,...S)),/\./,a,/\b(?!\.)/],scope:{
+match:[t.concat(/\b/,t.either(...T,...y)),/\./,a,/\b(?!\.)/],scope:{
 1:"built_in",2:"punctuation",3:"keyword"}},{
 match:[/\bTrigger\b/,/\./,/(isExecuting|isInsert|isUpdate|isDelete|isBefore|isAfter|isUndelete|new|newMap|old|oldMap|size|operationType)\b(?!\.)/],
 scope:{1:"built_in",2:"punctuation",3:"type"},relevance:10},{
 match:[/\btrigger\b/,/\./,"operationtype",/\./,t.concat(a,/\b/)],scope:{
 1:"built_in",2:"punctuation",3:"keyword",4:"punctuation",5:"variable.constant"},
-relevance:10}],D=[{
+relevance:10}],U=[{
 match:t.either(",",/;/,/(?<=\w)\>/,/\<(?=\w)/,/\{|\}/,/\(|\)/,/\{|\}/),
-scope:"punctuation",relevance:0},T],I=e.inherit(e.APOS_STRING_MODE,{
+scope:"punctuation",relevance:0},N],k=e.inherit(e.APOS_STRING_MODE,{
 scope:"string",relevance:1,contains:[{match:/\\'/,scope:"literal",relevance:1}]
-}),_=[{begin:"`",end:"`",scope:"string"},{begin:/'/,end:/'/,scope:"string"},{
-begin:/"/,end:/"/,scope:"string"}],f=e.COMMENT("//",/[$\n]/,{relevance:0
-}),U=[e.COMMENT("/\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0
-},{match:[/@(?:exception|throws)/,o,t.concat(n,i,n)],scope:{1:"doctag",
+}),M=[{begin:"`",end:"`",scope:"string"},{begin:/'/,end:/'/,scope:"string"},{
+begin:/"/,end:/"/,scope:"string"}],F=e.COMMENT("//",/[$\n]/,{relevance:0
+}),P=[e.COMMENT("/\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0
+},{match:[/@(?:exception|throws)/,o,t.concat(n,b,n)],scope:{1:"doctag",
 3:"title.class"},relevance:0},{match:[/@(?:exception|throws)/,o,n],scope:{
 1:"doctag",3:"title.class"},relevance:0},{
-begin:[/\{/,/@(?:link|see)/,o,/[a-zA-Z_0-9]*/,t.concat(/(?:#|\.)/,n),s],
-beginScope:{2:"doctag",4:"title.class",5:"title.method"},end:/\}/,contains:[{
+begin:[i,/@(?:link|see)/,o,/[a-zA-Z_0-9]*/,t.concat(/(?:#|\.)/,n),s],
+beginScope:{2:"doctag",4:"title.class",5:"title.method"},end:r,contains:[{
 match:/(?:\(|\))/,scope:"punctuation"},{match:[o,n,/\s*(?=[,)])/],scope:{
 2:"variable"}},{match:[n,/(?=\s)/],scope:{1:"type"}}]},{
-begin:[/\{/,/@(?:link|see)/,o,/[a-zA-Z_0-9]*/,t.concat(/(?:#|\.)/,n,/\s*(?=\})/)],
-beginScope:{2:"doctag",4:"title.class",5:"title.method"},end:/\}/,returnEnd:!0
-},{begin:[/\{/,/@(?:link|see)/,o,a],beginScope:{2:"doctag",4:"title.class"},
-end:/\}/,returnEnd:!0},{begin:[/\{/,/@(?:link|see)(?=\s+")/],beginScope:{
-2:"doctag"},end:/\}/,returnEnd:!0,contains:_},{begin:[/\{/,/@(?:link|see)/],
-beginScope:{2:"doctag"},end:/\}/,returnEnd:!0,subLanguage:["markdown","xml"]},{
-begin:[/\{/,/@literal/],beginScope:{2:"doctag"},end:/\}/,returnEnd:!0,
+begin:[i,/@(?:link|see)/,o,/[a-zA-Z_0-9]*/,t.concat(/(?:#|\.)/,n,/\s*(?=\})/)],
+beginScope:{2:"doctag",4:"title.class",5:"title.method"},end:r,returnEnd:!0},{
+begin:[i,/@(?:link|see)/,o,a],beginScope:{2:"doctag",4:"title.class"},end:r,
+returnEnd:!0},{begin:[i,/@(?:link|see)(?=\s+")/],beginScope:{2:"doctag"},end:r,
+returnEnd:!0,contains:M},{begin:[i,/@(?:link|see)/],beginScope:{2:"doctag"},
+end:r,returnEnd:!0,subLanguage:["markdown","xml"]},{begin:[i,/@literal/],
+beginScope:{2:"doctag"},end:r,returnEnd:!0,
 subLanguage:["apex","xml","javascript"]},{match:c,scope:"doctag",relevance:0},{
 match:[/(?<=@param)\s+/,n],scope:{2:"variable"},relevance:0},{
-contains:[e.BACKSLASH_ESCAPE],relevance:0,variants:_},{begin:/[0-9]+\.[0-9]+/,
+contains:[e.BACKSLASH_ESCAPE],relevance:0,variants:M},{begin:/[0-9]+\.[0-9]+/,
 end:/\.*\s+/,scope:"number",excludeEnd:!0},{
 begin:t.either(/\d{4}-\d{1,2}-\d{1,2}/,/\d{1,2}\/\d{1,2}\/\d{4}/),
-scope:"literal"},{begin:[/\{/,/@code/],beginScope:{2:"doctag"},starts:{end:/\}/,
-returnEnd:!0,contains:[{match:/^\s+\*\s+/,skip:!0,relevance:0},{begin:/\{/,
-end:/\}/,skip:!0}],subLanguage:["apex","xml","javascript"]}}]}),f],k={
-match:t.either(...y),scope:"operator",relevance:0},M=[{
+scope:"literal"},{begin:[i,/@code/],beginScope:{2:"doctag"},starts:{end:r,
+returnEnd:!0,contains:[{match:/^\s+\*\s+/,skip:!0,relevance:0},{begin:i,end:r,
+skip:!0}],subLanguage:["apex","xml","javascript"]}}]}),F],Y={
+match:t.either(...w),scope:"operator",relevance:0},x=[{
 begin:/\b(list|set|map)(?=\s*<)/,beginScope:"type",end:/\>+/,
 endScope:"punctuation",contains:[{match:/\<|\,/,scope:"punctuation"},{match:a,
 scope:"type"}],relevance:8},{match:[t.optional(a),/\[/,t.optional(/\d+/),/\]/],
 scope:{1:"variable",2:"punctuation",3:"number",4:"punctuation"}},{
-match:[n,/\[\]/],scope:{1:"type",2:"punctuation"},relevance:0}],F=[{
+match:[n,/\[\]/],scope:{1:"type",2:"punctuation"},relevance:0}],W=[{
 match:t.concat(c,/\b(?!\s*\()/),scope:"meta"},{scope:"meta",
-begin:[t.concat(c,/\b/),/\s*/,/\(/],beginScope:{3:"punctuation"},end:/\)/,
+begin:[t.concat(c,/\b/),/\s*/,l],beginScope:{3:"punctuation"},end:p,
 endScope:"punctuation",contains:[{match:[a,/\s*=/],scope:{1:"keyword",
-2:"operator"},contains:[k]},I,u],keywords:{literal:R}}],P={
+2:"operator"},contains:[Y]},k,g],keywords:{literal:O}}],H={
 match:[/\b[a-zA-Z0-9\.]*Exception/,o,n],scope:{1:"type",3:"variable"},
-relevance:0},Y=[{match:[/(?<!\.)/,a,/\s*(?=\=[^\>])/],scope:{2:"variable"},
+relevance:0},G=[{match:[/(?<!\.)/,a,/\s*(?=\=[^\>])/],scope:{2:"variable"},
 relevance:0},{match:[a,"(?=\\s+"+n+/\s*\=/+")"],scope:{1:"type"},relevance:0},{
-match:[a,o,a,/\s*(?=\=[^\>])/],scope:{1:"type",3:"variable"},relevance:0}],x={
-match:[/(?<=\=\s*\()/,n,"(?=\\)\\s*"+n+")"],scope:{2:"type"},relevance:0},W={
-match:[/\bnew\s+/,n,s],scope:{2:"type"},relevance:0};let H={begin:/\(/,
-beginScope:"punctuation",end:/\)/,endScope:"punctuation",relevance:0,keywords:O,
-contains:[]};const G=[{match:[/(?<=\.)/,n,s],scope:{2:"title.function.invoke1"},
-relevance:1,contains:[...l],starts:H},{match:[/^\s*/,b(...d),n,s],scope:{
-3:"title.function.invoke"},relevance:1,starts:H}]
-;H.contains=[I,W,U,k,M,w,u,p,G,{keywords:{KEYWORDS:O},
-match:t.concat(/(?<=\s|\(|\,)/,b(...R),n,/\b/,/(?!\.)/),scope:"variable",
+match:[a,o,a,/\s*(?=\=[^\>])/],scope:{1:"type",3:"variable"},relevance:0}],B={
+match:[/(?<=\=\s*\()/,n,"(?=\\)\\s*"+n+")"],scope:{2:"type"},relevance:0},K={
+match:[/\bnew\s+/,n,s],scope:{2:"type"},relevance:0};let Q={begin:l,
+beginScope:"punctuation",end:p,endScope:"punctuation",relevance:0,keywords:D,
+contains:[]};const V=[{match:[/(?<=\.)/,n,s],scope:{2:"title.function.invoke1"},
+relevance:1,contains:[...d],starts:Q},{match:[/^\s*/,E(...h),n,s],scope:{
+3:"title.function.invoke"},relevance:1,starts:Q}]
+;Q.contains=[k,K,P,Y,x,f,g,m,V,{keywords:{KEYWORDS:D},
+match:t.concat(/(?<=\s|\(|\,)/,E(...O),n,/\b/,/(?!\.)/),scope:"variable",
 relevance:0},{match:/\(|\,|\./,scope:"punctuation",relevance:0},{match:n,
-scope:"variable"}];const B={scope:"params",end:/\)/,endScope:"punctuation",
-relevance:1,keywords:O,contains:[u,I,U,M,...w,{match:/\,|\(/,scope:"punctuation"
-},p,{match:[/(?<=\(|\,)\s*/,n,/(?=\s)/],scope:{2:"type"}},{
-match:[o,n,/\s*(?=[,)])/],scope:{2:"variable"}}]},Q={
+scope:"variable"}];const z={scope:"params",end:p,endScope:"punctuation",
+relevance:1,keywords:D,contains:[g,k,P,x,...f,{match:/\,|\(/,scope:"punctuation"
+},m,{match:[/(?<=\(|\,)\s*/,n,/(?=\s)/],scope:{2:"type"}},{
+match:[o,n,/\s*(?=[,)])/],scope:{2:"variable"}}]},Z={
 match:[/\bswitch\s+on\s+/,n],scope:{1:"keyword",2:"variable"}};return{
 name:"Apex",aliases:["apex","lightning","soql","sosl"],case_insensitive:!0,
-disableAutodetect:!1,ignoreIllegals:!1,keywords:O,
+disableAutodetect:!1,ignoreIllegals:!1,keywords:D,beginKeywords:"Id",
 illegal:["</","<#","<]","<div>","\x3c!--","!DOCTYPE",/<iframe\b/,/^#/,/^import \.[a-zA-Z]+\./,/^import [\w]+/,/^import$/,/^include </,/^use\s+</,/\b(const|var)\s+\w+\s*=/,/\bstruct\b/,"System.log","console.log",/\bfor\s+\w+\s+IN\s+/,/\bif\s+\w+\s+IN\s+/,/\bend\s+if\b/,/\bend\s+select\b/,/\b(int|var)\s+\w+\s+=/,/\b(int[0-9]+|bool)\b/,/\b\$/,/\b_/,"::=",/\s#[a-zA-Z]/,/\s_[a-zA-Z]/,/\s\$[a-zA-Z]/,"#if","%if",/\bif(?!\s+\()/,"%endif","#endif","#_",/\d\s+\d/,/\w::\w/,/\bfloat\b/,/(SELECT|RETURNING)\s+\*/,/END\s+LOOP/,/CREATE\s+FUNCTION/,/\bint\b/,/import\s+\w+\s+=\s+require\("\w+"\)/,"/^include\b/",/\buse\s+strict\b/,/\w+\s+=\s+"\S*";/,/\/include\//,/\Anamespace\b/,/\bend(\.)?\n/,'"""',/\+\+\+/,/<%/,"<%#","%%>","<%%",":-",/\bmergesort\(/,/\bvar\s+env\b/,/\bdef\b\s\W:/,/"[^"]+"/,/\(\*|\*\)/],
-contains:[U,F,I,u,x,M,[{begin:[/\btrigger/,o,n,o,"on",o,n],beginScope:{
+contains:[P,W,k,g,B,x,[{begin:[/\btrigger/,o,n,o,"on",o,n],beginScope:{
 1:"keyword",3:"title.class",5:"operator",7:"type"},end:/(?=\{)/,returnEnd:!0,
-contains:[U,{begin:/\(/,end:/\)/,contains:[{
+contains:[P,{begin:l,end:p,contains:[{
 match:/\b(before|after)\s+(insert|update|delete|merge|undelete)\b/,
-scope:"keyword",relevance:5},T]}]},{relevance:5,
+scope:"keyword",relevance:5},N]}]},{relevance:5,
 match:/\b(with|without|inherited)\s+sharing\b/,scope:"keyword"},{
 begin:[/(?!\.)/,/\b(class|interface)\b(?!\?|\.)/],beginScope:{2:"keyword"},
-end:/(?=\{)/,relevance:1,keywords:{type:h,keyword:d},contains:[{
+end:/(?=\{)/,relevance:1,keywords:{type:A,keyword:h},contains:[{
 match:[/(?<=\bclass)\s+/,n],scope:{2:"title.class"}},{returnEnd:!0,
-endsWithParent:!0,beginKeywords:"implements extends",end:/\{/,contains:[{
+endsWithParent:!0,beginKeywords:"implements extends",end:i,contains:[{
 match:[a,/(?=\.)/],scope:{1:"built_in"}},{match:t.concat(a,/(?=\>)/),
 scope:"type"},{match:a,scope:"title.class.inherited"},{match:/<|>|,/,
-scope:"punctuation"},w],relevance:0}]},{begin:[/\benum\s+/,n,/\s*\{/],
-beginScope:{2:"type",3:"punctuation"},end:/\}/,endScope:"punctuation",
-relevance:0,contains:[U,T,{match:t.concat(a),scope:"variable.constant"}]},{
+scope:"punctuation"},f],relevance:0}]},{begin:[/\benum\s+/,n,/\s*\{/],
+beginScope:{2:"type",3:"punctuation"},end:r,endScope:"punctuation",relevance:0,
+contains:[P,N,{match:t.concat(a),scope:"variable.constant"}]},{
 match:[/(public|private|protected)\s+/,n,s],scope:{1:"keyword",
-2:"title.function"},starts:B,relevance:1},{
+2:"title.function"},starts:z,relevance:1},{
 match:[/(?<!new)(?<!return)(?<=\<|\>|\w)\s+/,n,s],scope:{2:"title.function"},
-relevance:1,starts:B}],[{match:/as\s+(user|system)\b/,scope:"keyword",
-relevance:5}],P,{match:[/\bfor\b\s*/,/\(/,n,o,n,/\s*/,/:/],scope:{3:"type",
-5:"variable",7:"operator"}},G,W,C,w,p,{begin:[/\[/,/\s*(?=(SELECT|FIND)\b)/],
+relevance:1,starts:z}],[{match:/as\s+(user|system)\b/,scope:"keyword",
+relevance:5}],H,{match:[/\bfor\b\s*/,l,n,o,n,/\s*/,/:/],scope:{3:"type",
+5:"variable",7:"operator"}},V,K,_,f,m,{begin:[/\[/,/\s*(?=(SELECT|FIND)\b)/],
 end:/\]/,beginScope:{1:"punctuation"},endScope:"punctuation",scope:"soql",
-relevance:10,endsWithParent:!0,keywords:{literal:O.literal,built_in:L},
-contains:[u,k,I,T,{match:/\(|\)/,scope:"punctuation",relevance:0},...l,{
+relevance:10,endsWithParent:!0,keywords:{literal:D.literal,built_in:C},
+contains:[g,Y,k,N,{match:/\(|\)/,scope:"punctuation",relevance:0},...d,{
 begin:[/\bFROM\b/,o],beginScope:{1:"keyword"},end:/(?=\bWHERE\b|\]|\s|\))/,
-contains:[{match:n,scope:"type"},...l]},{
+contains:[{match:n,scope:"type"},...d]},{
 match:t.concat(/\b/,t.either("CALENDAR_MONTH","CALENDAR_QUARTER","CALENDAR_YEAR","DAY_IN_MONTH","DAY_IN_WEEK","DAY_IN_YEAR","DAY_ONLY","FISCAL_MONTH","FISCAL_QUARTER","FISCAL_YEAR","HOUR_IN_DAY","WEEK_IN_MONTH","WEEK_IN_YEAR","AVG","convertCurrency","convertTimezone","COUNT_DISTINCT","COUNT","DISTANCE","EXCLUDES","FIELDS","FORMAT","GEOLOCATION","GROUPING","ROLLUP","CUBE","INCLUDES","MAX","MIN","SUM","toLabel","USER_MODE","SYSTEM_MODE","SECURITY_ENFORCED"),/\b/),
 scope:"title.function"},{match:/\b(GROUP|ORDER)\s+BY\b/,scope:"title.function"
 },{match:/\b(TODAY|TOMORROW|YESTERDAY)\b/,scope:"keyword"},{
@@ -117,10 +117,10 @@ match:/(NEXT|LAST|THIS)_(90_DAY|DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEE
 scope:"keyword",relevance:8},{
 match:[/(NEXT|LAST)_N_(DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEEK|YEAR)S/,/\s*:\s*/,/\d+/],
 scope:{1:"keyword",2:"operator",3:"number"},relevance:8},{
-match:t.concat(/\b/,t.either(...O.keyword,"ABOVE_OR_BELOW","ABOVE","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","ASC","BELOW","CATEGORY","CONTAINS","CUSTOM","DATA","DESC","DIVISION","ELSE","END","FIND","FROM","METADATA","NETWORK","ON","PricebookId","RETURNING","ROLLUP","ROWS","SEARCH","SELECT","SNIPPET","SORT","SPELL_CORRECTION","STANDARD","THEN","USING","WHEN","WHERE","WITH","SCOPE","Delegated","Everything","Mine","My_Territory","My_Team_Territory","Team","AND","AT","FIRST","FOR","HAVING","IN","LAST","LIKE","LIMIT","LISTVIEW","NOT","NULLS","OFFSET","OR","REFERENCE","TRACKING","TYPEOF","UPDATE","VIEW","VIEWSTAT"),/\b/),
+match:t.concat(/\b/,t.either(...D.keyword,"ABOVE_OR_BELOW","ABOVE","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","ASC","BELOW","CATEGORY","CONTAINS","CUSTOM","DATA","DESC","DIVISION","ELSE","END","FIND","FROM","METADATA","NETWORK","ON","PricebookId","RETURNING","ROLLUP","ROWS","SEARCH","SELECT","SNIPPET","SORT","SPELL_CORRECTION","STANDARD","THEN","USING","WHEN","WHERE","WITH","SCOPE","Delegated","Everything","Mine","My_Territory","My_Team_Territory","Team","AND","AT","FIRST","FOR","HAVING","IN","LAST","LIKE","LIMIT","LISTVIEW","NOT","NULLS","OFFSET","OR","REFERENCE","TRACKING","TYPEOF","UPDATE","VIEW","VIEWSTAT"),/\b/),
 scope:"keyword"},{match:[/(?<=:)/,/\s*/,a,/(?!\()/],scope:{3:"variable"},
-relevance:0},{match:[/(?<=:|\.)/,n,/(?=\s*\()/],scope:{2:"title.function.invoke"
-},relevance:0},{match:/:/,scope:"operator",relevance:0}],illegal:"::"
-},Q,Y,k,D,l,{match:t.concat("(?<=this.)",n,"(?!\\()"),scope:"variable"},{
-match:[t.concat(/\b/,b(...N)),n,o,/(?=\{)/],scope:{2:"property"},relevance:0}]}}
+relevance:0},{match:[/(?<=:|\.)/,n,s],scope:{2:"title.function.invoke"},
+relevance:0},{match:/:/,scope:"operator",relevance:0}],illegal:"::"},Z,G,Y,U,d,{
+match:t.concat("(?<=this.)",n,"(?!\\()"),scope:"variable"},{
+match:[t.concat(/\b/,E(...I)),n,o,/(?=\{)/],scope:{2:"property"},relevance:0}]}}
 })();export default hljsGrammar;
\ No newline at end of file
diff --git a/dist/apex.min.js b/dist/apex.min.js
index b6c0569..9552d87 100644
--- a/dist/apex.min.js
+++ b/dist/apex.min.js
@@ -1,115 +1,115 @@
 /*! `apex` grammar compiled for Highlight.js 11.11.1 */
 (()=>{var e=(()=>{"use strict";return e=>{
-const t=e.regex,n="[a-zA-Z][a-zA-Z_0-9]*",a="\\b"+n+"\\b",c="@"+n,s=/(?=\s*\()/,o=/\s+/,i=/(?<!\?)\./,r=/\?\./,l=[{
-match:i,scope:"punctuation",relevance:0},{match:r,scope:"operator",relevance:0
-}],p={match:/(?<!\.)\bId\b/,scope:"type",relevance:8};function b(...e){
-return t.concat("(?!",e.join("|"),")")}const u={scope:"number",
+const t=e.regex,n="[a-zA-Z][a-zA-Z_0-9]*",a="\\b"+n+"\\b",c="@"+n,s=/(?=\s*\()/,o=/\s+/,i=/\{/,r=/\}/,l=/\(/,p=/\)/,b=/(?<!\?)\./,u=/\?\./,d=[{
+match:b,scope:"punctuation",relevance:0},{match:u,scope:"operator",relevance:0
+}],m={match:/(?<!\.)\bId\b/,scope:"type",relevance:8};function E(...e){
+return t.concat("(?!",e.join("|"),")")}const g={scope:"number",
 match:t.either(/\b(\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(\.\d{1,3})?(\-|\+)\d{2}\:\d{2})\b/,/\b(\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}(\.\d{1,3})?(Z)?)\b/,/\b(\d{4}\-\d{2}\-\d{2})\b/,/\b0(x|X)[0-9a-fA-F_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/\b0(b|B)[01_]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/\b([0-9]+)?\.[0-9]+((e|E)[0-9]+)?(F|f|D|d|M|m)?\b/,/(-?)\b[0-9]+(e|E)[0-9]+(F|f|D|d|M|m)?\b/,/(-?)\b[0-9]+(F|f|D|d|M|m)\b/,/(-?)\b[0-9]+(U|u|L|l|UL|Ul|uL|ul|LU|Lu|lU|lu)?\b/,/(-?)(\b0[0-9]+|(\b\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?)/),
 relevance:0
-},d=["try","catch","finally","get","set","put","if","for","else","do","while","continue","break","implements","extends","return","throw","when","new"],m=["instanceof","super","this"],E=["abstract","final","global","override","private","protected","public","static","testMethod","transient","virtual","webservice"],g=["anytype|0","blob|0","boolean|0","byte|0","currency|0","date|0","datetime|0","decimal|0","double|0","enum|0","float|0","integer|0","long|0","object|0","pagereference|8","selectoption|8","short|0","sobject|10","string|0","time|0","void|0","float|0"],h=["insert","update","upsert","delete","undelete","merge","convertLead"],v=["AppLauncher","Approval","Auth","Cache","Canvas","ChatterAnswers","CommerceOrders","fsccashflow","CommercePayments","ConnectApi","Context","Database","Datacloud","DataRetrieval","DataSource","Dataweave","Dom","EventBus","ExternalService","Flow","FormulaEval","Functions","id_verification","industriesDigitalLending","Invocable","KbManagement","LxScheduler","Messaging","Metadata","Pref_center","Process","QuickAction","Reports","RichMessageing","Schema","Search","Sfc","Sfdc_Checkout","IndustriesNlpSvc","PlaceQuote","Sfdc_Enablement","Sfdc_surveys","Site","Slack","Support","System","TerritoryMgmt","TxnSecurity","UserProvisioning","VisualEditor","Wave"],S=["Address","Answers","ApexPages","Approval","Assert","AsyncInfo","AsyncOptions","BusinessHours","Cases","Collator","Compression","Continuation","Cookie","Crypto","Database","Date","Datetime","Decimal","Domain","DomainCreator","DomainParser","EmailMessages","EncodingUtil","EventBus","Exception","FeatureManagement","FlexQueue","Formula","FormulaRecalcFieldError","FormulaRecalcResult","Http","HttpRequest","HttpResponse","Ideas","IsvPartners","JSON","JSONGenerator","JSONParser","Label","Limits","Location","Matcher","Math","Messaging","MultiStaticResourceCalloutMock","Network","OrgLimit","OrgLimits","Packaging","PageReference","Pattern","QueueableDuplicateSignature","QueueableDuplicateSignature.Builder","QuickAction","Request","ResetPasswordResult","RestContext","RestRequest","RestResponse","Search","Security","SelectOption","Site","SObject","SObjectAccessDecision","StaticResourceCalloutMock","Test","TimeZone","Type","URL","UserInfo","UserManagement","UUID","Version","WebServiceCallout","XmlStreamReader","XmlStreamWriter"],A=["AccessType","AccessLevel","CallbackStatus","DomainType","JSONToken","LoggingLevel","Quiddity","TriggerOperation","operationType"],R=["false","true","null"],T={
+},h=["try","catch","finally","get","set","put","if","for","else","do","while","continue","break","implements","extends","return","throw","when","new"],v=["instanceof","super","this"],S=["abstract","final","global","override","private","protected","public","static","testMethod","transient","virtual","webservice"],A=["anytype|0","blob|0","boolean|0","byte|0","currency|0","date|0","datetime|0","decimal|0","double|0","enum|0","float|0","integer|0","long|0","object|0","pagereference|8","selectoption|8","short|0","sobject|10","string|0","time|0","void|0","float|0"],R=["insert","update","upsert","delete","undelete","merge","convertLead"],T=["AppLauncher","Approval","Auth","Cache","Canvas","ChatterAnswers","CommerceOrders","fsccashflow","CommercePayments","ConnectApi","Context","Database","Datacloud","DataRetrieval","DataSource","Dataweave","Dom","EventBus","ExternalService","Flow","FormulaEval","Functions","id_verification","industriesDigitalLending","Invocable","KbManagement","LxScheduler","Messaging","Metadata","Pref_center","Process","QuickAction","Reports","RichMessageing","Schema","Search","Sfc","Sfdc_Checkout","IndustriesNlpSvc","PlaceQuote","Sfdc_Enablement","Sfdc_surveys","Site","Slack","Support","System","TerritoryMgmt","TxnSecurity","UserProvisioning","VisualEditor","Wave"],y=["Address","Answers","ApexPages","Approval","Assert","AsyncInfo","AsyncOptions","BusinessHours","Cases","Collator","Compression","Continuation","Cookie","Crypto","Database","Date","Datetime","Decimal","Dom","Domain","DomainCreator","DomainParser","EmailMessages","EncodingUtil","EventBus","Exception","FeatureManagement","FlexQueue","Formula","FormulaRecalcFieldError","FormulaRecalcResult","Http","HttpRequest","HttpResponse","Ideas","IsvPartners","JSON","JSONGenerator","JSONParser","Label","Limits","Location","Matcher","Math","Messaging","MultiStaticResourceCalloutMock","Network","OrgLimit","OrgLimits","Packaging","PageReference","Pattern","QueueableDuplicateSignature","QueueableDuplicateSignature.Builder","QuickAction","Request","ResetPasswordResult","RestContext","RestRequest","RestResponse","Search","Security","SelectOption","Site","SObject","SObjectAccessDecision","StaticResourceCalloutMock","Test","TimeZone","Type","URL","UserInfo","UserManagement","UUID","Version","WebServiceCallout","XmlStreamReader","XmlStreamWriter"],L=["AccessType","AccessLevel","CallbackStatus","DomainType","JSONToken","LoggingLevel","Quiddity","TriggerOperation","operationType"],O=["false","true","null"],N={
 match:/,/,scope:"punctuation",relevance:0
-},y=[/--/,/\+\+/,/\&\&|\|\|/,/\*\=|\/\=|\%\=|\+\=|-\=/,/\&\=|\^\=|<<\=|>>\=|>>>\=|\|\=/,/\&|~|\^|\|/,/<<|>>/,/<\=|>\=|\s(<|>)\s/,/\=\=|!\=/,/\=>/,/!(?=\w)/,/(?<=\s)(\?|:)(?=\s)/,r,/(?<=\s)(\?\?)(?=\s)/,/(?<!\?)\?(?!\?|\.|\[)/,/%[^%]|(?<!\n\s+)\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/(?<!\=|!)\=(?!\=|>)/],L=v.concat(...S),O={
-$pattern:t.concat(/(?<!\.)\b/,n,/\b/),keyword:[...d,...E,...h],type:g,literal:R
-},N=[...R,...d,...E,...v,...S,...A,...m,...h],C={
-match:t.concat(/\b/,t.either(...m),/\b/),scope:"variable.language",relevance:0
-},w=[{match:[t.concat(/\b/,t.either(...A)),/\./,n,/\b\s*(?![\.\(])/],scope:{
+},w=[/--/,/\+\+/,/\&\&|\|\|/,/\*\=|\/\=|\%\=|\+\=|-\=/,/\&\=|\^\=|<<\=|>>\=|>>>\=|\|\=/,/\&|~|\^|\|/,/<<|>>/,/<\=|>\=|\s(<|>)\s/,/\=\=|!\=/,/\=>/,/!(?=\w)/,/(?<=\s)(\?|:)(?=\s)/,u,/(?<=\s)(\?\?)(?=\s)/,/(?<!\?)\?(?!\?|\.|\[)/,/%[^%]|(?<!\n\s+)\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/(?<!\=|!)\=(?!\=|>)/],C=T.concat(...y),D={
+$pattern:t.concat(/(?<!\.)\b/,n,/\b/),keyword:[...h,...S,...R],type:A,literal:O
+},I=[...O,...h,...S,...T,...y,...L,...v,...R],_={
+match:t.concat(/\b/,t.either(...v),/\b/),scope:"variable.language",relevance:0
+},U=[{match:[t.concat(/\b/,t.either(...L)),/\./,n,/\b\s*(?![\.\(])/],scope:{
 1:"built_in",2:"punctuation",3:"variable"},relevance:0},{
-match:[t.concat(/\b/,t.either(...S)),/\./,n,/\b\s*(?![\.\(])/],scope:{
+match:[t.concat(/\b/,t.either(...y)),/\./,n,/\b\s*(?![\.\(])/],scope:{
 1:"built_in",2:"punctuation",3:"type"},relevance:0},{
-match:[t.concat(/\b/,t.either(...v)),/\./,a,/\b(?=\.)/],scope:{1:"built_in",
+match:[t.concat(/\b/,t.either(...T)),/\./,a,/\b(?=\.)/],scope:{1:"built_in",
 2:"punctuation",3:"type"}},{
-match:[t.concat(/\b/,t.either(...v,...S)),/\./,a,/\b(?!\.)/],scope:{
+match:[t.concat(/\b/,t.either(...T,...y)),/\./,a,/\b(?!\.)/],scope:{
 1:"built_in",2:"punctuation",3:"keyword"}},{
 match:[/\bTrigger\b/,/\./,/(isExecuting|isInsert|isUpdate|isDelete|isBefore|isAfter|isUndelete|new|newMap|old|oldMap|size|operationType)\b(?!\.)/],
 scope:{1:"built_in",2:"punctuation",3:"type"},relevance:10},{
 match:[/\btrigger\b/,/\./,"operationtype",/\./,t.concat(a,/\b/)],scope:{
 1:"built_in",2:"punctuation",3:"keyword",4:"punctuation",5:"variable.constant"},
-relevance:10}],D=[{
+relevance:10}],f=[{
 match:t.either(",",/;/,/(?<=\w)\>/,/\<(?=\w)/,/\{|\}/,/\(|\)/,/\{|\}/),
-scope:"punctuation",relevance:0},T],I=e.inherit(e.APOS_STRING_MODE,{
+scope:"punctuation",relevance:0},N],k=e.inherit(e.APOS_STRING_MODE,{
 scope:"string",relevance:1,contains:[{match:/\\'/,scope:"literal",relevance:1}]
-}),_=[{begin:"`",end:"`",scope:"string"},{begin:/'/,end:/'/,scope:"string"},{
-begin:/"/,end:/"/,scope:"string"}],U=e.COMMENT("//",/[$\n]/,{relevance:0
-}),f=[e.COMMENT("/\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0
-},{match:[/@(?:exception|throws)/,o,t.concat(n,i,n)],scope:{1:"doctag",
+}),M=[{begin:"`",end:"`",scope:"string"},{begin:/'/,end:/'/,scope:"string"},{
+begin:/"/,end:/"/,scope:"string"}],F=e.COMMENT("//",/[$\n]/,{relevance:0
+}),P=[e.COMMENT("/\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0
+},{match:[/@(?:exception|throws)/,o,t.concat(n,b,n)],scope:{1:"doctag",
 3:"title.class"},relevance:0},{match:[/@(?:exception|throws)/,o,n],scope:{
 1:"doctag",3:"title.class"},relevance:0},{
-begin:[/\{/,/@(?:link|see)/,o,/[a-zA-Z_0-9]*/,t.concat(/(?:#|\.)/,n),s],
-beginScope:{2:"doctag",4:"title.class",5:"title.method"},end:/\}/,contains:[{
+begin:[i,/@(?:link|see)/,o,/[a-zA-Z_0-9]*/,t.concat(/(?:#|\.)/,n),s],
+beginScope:{2:"doctag",4:"title.class",5:"title.method"},end:r,contains:[{
 match:/(?:\(|\))/,scope:"punctuation"},{match:[o,n,/\s*(?=[,)])/],scope:{
 2:"variable"}},{match:[n,/(?=\s)/],scope:{1:"type"}}]},{
-begin:[/\{/,/@(?:link|see)/,o,/[a-zA-Z_0-9]*/,t.concat(/(?:#|\.)/,n,/\s*(?=\})/)],
-beginScope:{2:"doctag",4:"title.class",5:"title.method"},end:/\}/,returnEnd:!0
-},{begin:[/\{/,/@(?:link|see)/,o,a],beginScope:{2:"doctag",4:"title.class"},
-end:/\}/,returnEnd:!0},{begin:[/\{/,/@(?:link|see)(?=\s+")/],beginScope:{
-2:"doctag"},end:/\}/,returnEnd:!0,contains:_},{begin:[/\{/,/@(?:link|see)/],
-beginScope:{2:"doctag"},end:/\}/,returnEnd:!0,subLanguage:["markdown","xml"]},{
-begin:[/\{/,/@literal/],beginScope:{2:"doctag"},end:/\}/,returnEnd:!0,
+begin:[i,/@(?:link|see)/,o,/[a-zA-Z_0-9]*/,t.concat(/(?:#|\.)/,n,/\s*(?=\})/)],
+beginScope:{2:"doctag",4:"title.class",5:"title.method"},end:r,returnEnd:!0},{
+begin:[i,/@(?:link|see)/,o,a],beginScope:{2:"doctag",4:"title.class"},end:r,
+returnEnd:!0},{begin:[i,/@(?:link|see)(?=\s+")/],beginScope:{2:"doctag"},end:r,
+returnEnd:!0,contains:M},{begin:[i,/@(?:link|see)/],beginScope:{2:"doctag"},
+end:r,returnEnd:!0,subLanguage:["markdown","xml"]},{begin:[i,/@literal/],
+beginScope:{2:"doctag"},end:r,returnEnd:!0,
 subLanguage:["apex","xml","javascript"]},{match:c,scope:"doctag",relevance:0},{
 match:[/(?<=@param)\s+/,n],scope:{2:"variable"},relevance:0},{
-contains:[e.BACKSLASH_ESCAPE],relevance:0,variants:_},{begin:/[0-9]+\.[0-9]+/,
+contains:[e.BACKSLASH_ESCAPE],relevance:0,variants:M},{begin:/[0-9]+\.[0-9]+/,
 end:/\.*\s+/,scope:"number",excludeEnd:!0},{
 begin:t.either(/\d{4}-\d{1,2}-\d{1,2}/,/\d{1,2}\/\d{1,2}\/\d{4}/),
-scope:"literal"},{begin:[/\{/,/@code/],beginScope:{2:"doctag"},starts:{end:/\}/,
-returnEnd:!0,contains:[{match:/^\s+\*\s+/,skip:!0,relevance:0},{begin:/\{/,
-end:/\}/,skip:!0}],subLanguage:["apex","xml","javascript"]}}]}),U],k={
-match:t.either(...y),scope:"operator",relevance:0},M=[{
+scope:"literal"},{begin:[i,/@code/],beginScope:{2:"doctag"},starts:{end:r,
+returnEnd:!0,contains:[{match:/^\s+\*\s+/,skip:!0,relevance:0},{begin:i,end:r,
+skip:!0}],subLanguage:["apex","xml","javascript"]}}]}),F],Y={
+match:t.either(...w),scope:"operator",relevance:0},x=[{
 begin:/\b(list|set|map)(?=\s*<)/,beginScope:"type",end:/\>+/,
 endScope:"punctuation",contains:[{match:/\<|\,/,scope:"punctuation"},{match:a,
 scope:"type"}],relevance:8},{match:[t.optional(a),/\[/,t.optional(/\d+/),/\]/],
 scope:{1:"variable",2:"punctuation",3:"number",4:"punctuation"}},{
-match:[n,/\[\]/],scope:{1:"type",2:"punctuation"},relevance:0}],F=[{
+match:[n,/\[\]/],scope:{1:"type",2:"punctuation"},relevance:0}],W=[{
 match:t.concat(c,/\b(?!\s*\()/),scope:"meta"},{scope:"meta",
-begin:[t.concat(c,/\b/),/\s*/,/\(/],beginScope:{3:"punctuation"},end:/\)/,
+begin:[t.concat(c,/\b/),/\s*/,l],beginScope:{3:"punctuation"},end:p,
 endScope:"punctuation",contains:[{match:[a,/\s*=/],scope:{1:"keyword",
-2:"operator"},contains:[k]},I,u],keywords:{literal:R}}],P={
+2:"operator"},contains:[Y]},k,g],keywords:{literal:O}}],H={
 match:[/\b[a-zA-Z0-9\.]*Exception/,o,n],scope:{1:"type",3:"variable"},
-relevance:0},Y=[{match:[/(?<!\.)/,a,/\s*(?=\=[^\>])/],scope:{2:"variable"},
+relevance:0},B=[{match:[/(?<!\.)/,a,/\s*(?=\=[^\>])/],scope:{2:"variable"},
 relevance:0},{match:[a,"(?=\\s+"+n+/\s*\=/+")"],scope:{1:"type"},relevance:0},{
-match:[a,o,a,/\s*(?=\=[^\>])/],scope:{1:"type",3:"variable"},relevance:0}],x={
-match:[/(?<=\=\s*\()/,n,"(?=\\)\\s*"+n+")"],scope:{2:"type"},relevance:0},W={
-match:[/\bnew\s+/,n,s],scope:{2:"type"},relevance:0};let H={begin:/\(/,
-beginScope:"punctuation",end:/\)/,endScope:"punctuation",relevance:0,keywords:O,
-contains:[]};const B=[{match:[/(?<=\.)/,n,s],scope:{2:"title.function.invoke1"},
-relevance:1,contains:[...l],starts:H},{match:[/^\s*/,b(...d),n,s],scope:{
-3:"title.function.invoke"},relevance:1,starts:H}]
-;H.contains=[I,W,f,k,M,w,u,p,B,{keywords:{KEYWORDS:O},
-match:t.concat(/(?<=\s|\(|\,)/,b(...R),n,/\b/,/(?!\.)/),scope:"variable",
+match:[a,o,a,/\s*(?=\=[^\>])/],scope:{1:"type",3:"variable"},relevance:0}],G={
+match:[/(?<=\=\s*\()/,n,"(?=\\)\\s*"+n+")"],scope:{2:"type"},relevance:0},K={
+match:[/\bnew\s+/,n,s],scope:{2:"type"},relevance:0};let Q={begin:l,
+beginScope:"punctuation",end:p,endScope:"punctuation",relevance:0,keywords:D,
+contains:[]};const V=[{match:[/(?<=\.)/,n,s],scope:{2:"title.function.invoke1"},
+relevance:1,contains:[...d],starts:Q},{match:[/^\s*/,E(...h),n,s],scope:{
+3:"title.function.invoke"},relevance:1,starts:Q}]
+;Q.contains=[k,K,P,Y,x,U,g,m,V,{keywords:{KEYWORDS:D},
+match:t.concat(/(?<=\s|\(|\,)/,E(...O),n,/\b/,/(?!\.)/),scope:"variable",
 relevance:0},{match:/\(|\,|\./,scope:"punctuation",relevance:0},{match:n,
-scope:"variable"}];const G={scope:"params",end:/\)/,endScope:"punctuation",
-relevance:1,keywords:O,contains:[u,I,f,M,...w,{match:/\,|\(/,scope:"punctuation"
-},p,{match:[/(?<=\(|\,)\s*/,n,/(?=\s)/],scope:{2:"type"}},{
-match:[o,n,/\s*(?=[,)])/],scope:{2:"variable"}}]},Q={
+scope:"variable"}];const z={scope:"params",end:p,endScope:"punctuation",
+relevance:1,keywords:D,contains:[g,k,P,x,...U,{match:/\,|\(/,scope:"punctuation"
+},m,{match:[/(?<=\(|\,)\s*/,n,/(?=\s)/],scope:{2:"type"}},{
+match:[o,n,/\s*(?=[,)])/],scope:{2:"variable"}}]},Z={
 match:[/\bswitch\s+on\s+/,n],scope:{1:"keyword",2:"variable"}};return{
 name:"Apex",aliases:["apex","lightning","soql","sosl"],case_insensitive:!0,
-disableAutodetect:!1,ignoreIllegals:!1,keywords:O,
+disableAutodetect:!1,ignoreIllegals:!1,keywords:D,beginKeywords:"Id",
 illegal:["</","<#","<]","<div>","\x3c!--","!DOCTYPE",/<iframe\b/,/^#/,/^import \.[a-zA-Z]+\./,/^import [\w]+/,/^import$/,/^include </,/^use\s+</,/\b(const|var)\s+\w+\s*=/,/\bstruct\b/,"System.log","console.log",/\bfor\s+\w+\s+IN\s+/,/\bif\s+\w+\s+IN\s+/,/\bend\s+if\b/,/\bend\s+select\b/,/\b(int|var)\s+\w+\s+=/,/\b(int[0-9]+|bool)\b/,/\b\$/,/\b_/,"::=",/\s#[a-zA-Z]/,/\s_[a-zA-Z]/,/\s\$[a-zA-Z]/,"#if","%if",/\bif(?!\s+\()/,"%endif","#endif","#_",/\d\s+\d/,/\w::\w/,/\bfloat\b/,/(SELECT|RETURNING)\s+\*/,/END\s+LOOP/,/CREATE\s+FUNCTION/,/\bint\b/,/import\s+\w+\s+=\s+require\("\w+"\)/,"/^include\b/",/\buse\s+strict\b/,/\w+\s+=\s+"\S*";/,/\/include\//,/\Anamespace\b/,/\bend(\.)?\n/,'"""',/\+\+\+/,/<%/,"<%#","%%>","<%%",":-",/\bmergesort\(/,/\bvar\s+env\b/,/\bdef\b\s\W:/,/"[^"]+"/,/\(\*|\*\)/],
-contains:[f,F,I,u,x,M,[{begin:[/\btrigger/,o,n,o,"on",o,n],beginScope:{
+contains:[P,W,k,g,G,x,[{begin:[/\btrigger/,o,n,o,"on",o,n],beginScope:{
 1:"keyword",3:"title.class",5:"operator",7:"type"},end:/(?=\{)/,returnEnd:!0,
-contains:[f,{begin:/\(/,end:/\)/,contains:[{
+contains:[P,{begin:l,end:p,contains:[{
 match:/\b(before|after)\s+(insert|update|delete|merge|undelete)\b/,
-scope:"keyword",relevance:5},T]}]},{relevance:5,
+scope:"keyword",relevance:5},N]}]},{relevance:5,
 match:/\b(with|without|inherited)\s+sharing\b/,scope:"keyword"},{
 begin:[/(?!\.)/,/\b(class|interface)\b(?!\?|\.)/],beginScope:{2:"keyword"},
-end:/(?=\{)/,relevance:1,keywords:{type:g,keyword:d},contains:[{
+end:/(?=\{)/,relevance:1,keywords:{type:A,keyword:h},contains:[{
 match:[/(?<=\bclass)\s+/,n],scope:{2:"title.class"}},{returnEnd:!0,
-endsWithParent:!0,beginKeywords:"implements extends",end:/\{/,contains:[{
+endsWithParent:!0,beginKeywords:"implements extends",end:i,contains:[{
 match:[a,/(?=\.)/],scope:{1:"built_in"}},{match:t.concat(a,/(?=\>)/),
 scope:"type"},{match:a,scope:"title.class.inherited"},{match:/<|>|,/,
-scope:"punctuation"},w],relevance:0}]},{begin:[/\benum\s+/,n,/\s*\{/],
-beginScope:{2:"type",3:"punctuation"},end:/\}/,endScope:"punctuation",
-relevance:0,contains:[f,T,{match:t.concat(a),scope:"variable.constant"}]},{
+scope:"punctuation"},U],relevance:0}]},{begin:[/\benum\s+/,n,/\s*\{/],
+beginScope:{2:"type",3:"punctuation"},end:r,endScope:"punctuation",relevance:0,
+contains:[P,N,{match:t.concat(a),scope:"variable.constant"}]},{
 match:[/(public|private|protected)\s+/,n,s],scope:{1:"keyword",
-2:"title.function"},starts:G,relevance:1},{
+2:"title.function"},starts:z,relevance:1},{
 match:[/(?<!new)(?<!return)(?<=\<|\>|\w)\s+/,n,s],scope:{2:"title.function"},
-relevance:1,starts:G}],[{match:/as\s+(user|system)\b/,scope:"keyword",
-relevance:5}],P,{match:[/\bfor\b\s*/,/\(/,n,o,n,/\s*/,/:/],scope:{3:"type",
-5:"variable",7:"operator"}},B,W,C,w,p,{begin:[/\[/,/\s*(?=(SELECT|FIND)\b)/],
+relevance:1,starts:z}],[{match:/as\s+(user|system)\b/,scope:"keyword",
+relevance:5}],H,{match:[/\bfor\b\s*/,l,n,o,n,/\s*/,/:/],scope:{3:"type",
+5:"variable",7:"operator"}},V,K,_,U,m,{begin:[/\[/,/\s*(?=(SELECT|FIND)\b)/],
 end:/\]/,beginScope:{1:"punctuation"},endScope:"punctuation",scope:"soql",
-relevance:10,endsWithParent:!0,keywords:{literal:O.literal,built_in:L},
-contains:[u,k,I,T,{match:/\(|\)/,scope:"punctuation",relevance:0},...l,{
+relevance:10,endsWithParent:!0,keywords:{literal:D.literal,built_in:C},
+contains:[g,Y,k,N,{match:/\(|\)/,scope:"punctuation",relevance:0},...d,{
 begin:[/\bFROM\b/,o],beginScope:{1:"keyword"},end:/(?=\bWHERE\b|\]|\s|\))/,
-contains:[{match:n,scope:"type"},...l]},{
+contains:[{match:n,scope:"type"},...d]},{
 match:t.concat(/\b/,t.either("CALENDAR_MONTH","CALENDAR_QUARTER","CALENDAR_YEAR","DAY_IN_MONTH","DAY_IN_WEEK","DAY_IN_YEAR","DAY_ONLY","FISCAL_MONTH","FISCAL_QUARTER","FISCAL_YEAR","HOUR_IN_DAY","WEEK_IN_MONTH","WEEK_IN_YEAR","AVG","convertCurrency","convertTimezone","COUNT_DISTINCT","COUNT","DISTANCE","EXCLUDES","FIELDS","FORMAT","GEOLOCATION","GROUPING","ROLLUP","CUBE","INCLUDES","MAX","MIN","SUM","toLabel","USER_MODE","SYSTEM_MODE","SECURITY_ENFORCED"),/\b/),
 scope:"title.function"},{match:/\b(GROUP|ORDER)\s+BY\b/,scope:"title.function"
 },{match:/\b(TODAY|TOMORROW|YESTERDAY)\b/,scope:"keyword"},{
@@ -117,10 +117,10 @@ match:/(NEXT|LAST|THIS)_(90_DAY|DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEE
 scope:"keyword",relevance:8},{
 match:[/(NEXT|LAST)_N_(DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEEK|YEAR)S/,/\s*:\s*/,/\d+/],
 scope:{1:"keyword",2:"operator",3:"number"},relevance:8},{
-match:t.concat(/\b/,t.either(...O.keyword,"ABOVE_OR_BELOW","ABOVE","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","ASC","BELOW","CATEGORY","CONTAINS","CUSTOM","DATA","DESC","DIVISION","ELSE","END","FIND","FROM","METADATA","NETWORK","ON","PricebookId","RETURNING","ROLLUP","ROWS","SEARCH","SELECT","SNIPPET","SORT","SPELL_CORRECTION","STANDARD","THEN","USING","WHEN","WHERE","WITH","SCOPE","Delegated","Everything","Mine","My_Territory","My_Team_Territory","Team","AND","AT","FIRST","FOR","HAVING","IN","LAST","LIKE","LIMIT","LISTVIEW","NOT","NULLS","OFFSET","OR","REFERENCE","TRACKING","TYPEOF","UPDATE","VIEW","VIEWSTAT"),/\b/),
+match:t.concat(/\b/,t.either(...D.keyword,"ABOVE_OR_BELOW","ABOVE","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","ASC","BELOW","CATEGORY","CONTAINS","CUSTOM","DATA","DESC","DIVISION","ELSE","END","FIND","FROM","METADATA","NETWORK","ON","PricebookId","RETURNING","ROLLUP","ROWS","SEARCH","SELECT","SNIPPET","SORT","SPELL_CORRECTION","STANDARD","THEN","USING","WHEN","WHERE","WITH","SCOPE","Delegated","Everything","Mine","My_Territory","My_Team_Territory","Team","AND","AT","FIRST","FOR","HAVING","IN","LAST","LIKE","LIMIT","LISTVIEW","NOT","NULLS","OFFSET","OR","REFERENCE","TRACKING","TYPEOF","UPDATE","VIEW","VIEWSTAT"),/\b/),
 scope:"keyword"},{match:[/(?<=:)/,/\s*/,a,/(?!\()/],scope:{3:"variable"},
-relevance:0},{match:[/(?<=:|\.)/,n,/(?=\s*\()/],scope:{2:"title.function.invoke"
-},relevance:0},{match:/:/,scope:"operator",relevance:0}],illegal:"::"
-},Q,Y,k,D,l,{match:t.concat("(?<=this.)",n,"(?!\\()"),scope:"variable"},{
-match:[t.concat(/\b/,b(...N)),n,o,/(?=\{)/],scope:{2:"property"},relevance:0}]}}
+relevance:0},{match:[/(?<=:|\.)/,n,s],scope:{2:"title.function.invoke"},
+relevance:0},{match:/:/,scope:"operator",relevance:0}],illegal:"::"},Z,B,Y,f,d,{
+match:t.concat("(?<=this.)",n,"(?!\\()"),scope:"variable"},{
+match:[t.concat(/\b/,E(...I)),n,o,/(?=\{)/],scope:{2:"property"},relevance:0}]}}
 })();hljs.registerLanguage("apex",e)})();
\ No newline at end of file
diff --git a/src/languages/apex.js b/src/languages/apex.js
index 95da1a0..e7deb71 100644
--- a/src/languages/apex.js
+++ b/src/languages/apex.js
@@ -14,6 +14,10 @@ export default function (hljs) {
   const SPACEPARENS_LOOKAHEAD = /(?=\s*\()/;
   //const PARENS_LOOKAHEAD = /(?=\()/;
   const SPACE = /\s+/;
+  const OPENCURLY = /\{/;
+  const CLOSECURLY = /\}/;
+  const OPENPARENS = /\(/;
+  const CLOSEPARENS = /\)/;
 
   const ACCESSOR = /(?<!\?)\./;
   const NULLSAFE = /\?\./;
@@ -203,6 +207,7 @@ export default function (hljs) {
     'Date',
     'Datetime',
     'Decimal',
+    'Dom',
     'Domain',
     'DomainCreator',
     'DomainParser',
@@ -463,10 +468,10 @@ export default function (hljs) {
       {
         // Reference to a method with parameters
         // prettier-ignore
-        begin: [/\{/, /@(?:link|see)/, SPACE , /[a-zA-Z_0-9]*/, regex.concat(/(?:#|\.)/, APEX_IDENT_RE), SPACEPARENS_LOOKAHEAD ],
+        begin: [OPENCURLY, /@(?:link|see)/, SPACE , /[a-zA-Z_0-9]*/, regex.concat(/(?:#|\.)/, APEX_IDENT_RE), SPACEPARENS_LOOKAHEAD ],
         // prettier-ignore
         beginScope: {2: 'doctag', 4: 'title.class', 5: 'title.method'},
-        end: /\}/,
+        end: CLOSECURLY,
         contains: [
           //PUNCTUATION,
           { match: /(?:\(|\))/, scope: 'punctuation' },
@@ -480,37 +485,37 @@ export default function (hljs) {
       {
         // Reference to method without parameters
         // prettier-ignore
-        begin: [/\{/, /@(?:link|see)/, SPACE ,  /[a-zA-Z_0-9]*/, regex.concat(/(?:#|\.)/, APEX_IDENT_RE, /\s*(?=\})/)],
+        begin: [OPENCURLY, /@(?:link|see)/, SPACE ,  /[a-zA-Z_0-9]*/, regex.concat(/(?:#|\.)/, APEX_IDENT_RE, /\s*(?=\})/)],
         // prettier-ignore
         beginScope: {2: 'doctag', 4: 'title.class', 5: 'title.method' },
-        end: /\}/,
+        end: CLOSECURLY,
         returnEnd: true
       },
       {
-        begin: [/\{/, /@(?:link|see)/, SPACE, APEX_IDENT_WORD_RE],
+        begin: [OPENCURLY, /@(?:link|see)/, SPACE, APEX_IDENT_WORD_RE],
         beginScope: { 2: 'doctag', 4: 'title.class' },
-        end: /\}/,
+        end: CLOSECURLY,
         returnEnd: true
       },
       {
-        begin: [/\{/, /@(?:link|see)(?=\s+")/],
+        begin: [OPENCURLY, /@(?:link|see)(?=\s+")/],
         beginScope: { 2: 'doctag' },
-        end: /\}/,
+        end: CLOSECURLY,
         returnEnd: true,
         contains: COMMENT_STRINGS
       },
 
       {
-        begin: [/\{/, /@(?:link|see)/],
+        begin: [OPENCURLY, /@(?:link|see)/],
         beginScope: { 2: 'doctag' },
-        end: /\}/,
+        end: CLOSECURLY,
         returnEnd: true,
         subLanguage: ['markdown', 'xml']
       },
       {
-        begin: [/\{/, /@literal/],
+        begin: [OPENCURLY, /@literal/],
         beginScope: { 2: 'doctag' },
-        end: /\}/,
+        end: CLOSECURLY,
         returnEnd: true,
         subLanguage: ['apex', 'xml', 'javascript']
       },
@@ -538,10 +543,10 @@ export default function (hljs) {
         scope: 'literal'
       },
       {
-        begin: [/\{/, /@code/],
+        begin: [OPENCURLY, /@code/],
         beginScope: { 2: 'doctag' },
         starts: {
-          end: /\}/,
+          end: CLOSECURLY,
           returnEnd: true,
           contains: [
             {
@@ -549,7 +554,7 @@ export default function (hljs) {
               skip: true,
               relevance: 0
             },
-            { begin: /\{/, end: /\}/, skip: true }
+            { begin: OPENCURLY, end: CLOSECURLY, skip: true }
           ],
           subLanguage: ['apex', 'xml', 'javascript']
         }
@@ -610,9 +615,9 @@ export default function (hljs) {
       // @IsTest
       // (Seealldata=true)
       scope: 'meta',
-      begin: [regex.concat(ANNOTATION_RE, /\b/), /\s*/, /\(/],
+      begin: [regex.concat(ANNOTATION_RE, /\b/), /\s*/, OPENPARENS],
       beginScope: { 3: 'punctuation' },
-      end: /\)/,
+      end: CLOSEPARENS,
       endScope: 'punctuation',
       //scope: 'clause: annotation',
       contains: [
@@ -668,9 +673,9 @@ export default function (hljs) {
   };
 
   let PARAMS_CALL = {
-    begin: /\(/,
+    begin: OPENPARENS,
     beginScope: 'punctuation',
-    end: /\)/,
+    end: CLOSEPARENS,
     endScope: 'punctuation',
     relevance: 0,
     keywords: KEYWORDS,
@@ -729,7 +734,7 @@ export default function (hljs) {
   const PARAMS_DECLARATION = {
     scope: 'params', // NOTE: declaration
     // no begin because only started from method declaration
-    end: /\)/,
+    end: CLOSEPARENS,
     endScope: 'punctuation',
     relevance: 1,
     keywords: KEYWORDS,
@@ -759,7 +764,7 @@ export default function (hljs) {
     returnEnd: true,
     endsWithParent: true,
     beginKeywords: 'implements extends',
-    end: /\{/,
+    end: OPENCURLY,
     contains: [
       { match: [APEX_IDENT_WORD_RE, /(?=\.)/], scope: { 1: 'built_in' } },
       { match: regex.concat(APEX_IDENT_WORD_RE, /(?=\>)/), scope: 'type' },
@@ -788,8 +793,8 @@ export default function (hljs) {
     contains: [
       COMMENTS,
       {
-        begin: /\(/,
-        end: /\)/,
+        begin: OPENPARENS,
+        end: CLOSEPARENS,
         contains: [
           {
             match: /\b(before|after)\s+(insert|update|delete|merge|undelete)\b/,
@@ -827,7 +832,7 @@ export default function (hljs) {
     // enum declaration
     begin: [/\benum\s+/, APEX_IDENT_RE, /\s*\{/],
     beginScope: { 2: 'type', 3: 'punctuation' },
-    end: /\}/,
+    end: CLOSECURLY,
     endScope: 'punctuation',
     relevance: 0,
     contains: [
@@ -1074,7 +1079,7 @@ export default function (hljs) {
       },
       {
         // any non-soql function used in the query
-        match: [/(?<=:|\.)/, APEX_IDENT_RE, /(?=\s*\()/],
+        match: [/(?<=:|\.)/, APEX_IDENT_RE, SPACEPARENS_LOOKAHEAD],
         scope: { 2: 'title.function.invoke' },
         relevance: 0
       },
@@ -1087,7 +1092,7 @@ export default function (hljs) {
   const FOR_LOOP = {
     match: [
       /\bfor\b\s*/,
-      /\(/,
+      OPENPARENS,
       APEX_IDENT_RE,
       SPACE,
       APEX_IDENT_RE,
@@ -1152,7 +1157,7 @@ export default function (hljs) {
     /\d\s+\d/, //clojure
     /\w::\w/,
     /\bfloat\b/, // many languages
-    /(SELECT|RETURNING)\s+\*/,
+    /(SELECT|RETURNING)\s+\*/, // SOQL requires explicit fields
     /END\s+LOOP/,
     /CREATE\s+FUNCTION/,
     /\bint\b/,
@@ -1217,6 +1222,7 @@ export default function (hljs) {
     disableAutodetect: false,
     ignoreIllegals: false,
     keywords: KEYWORDS,
+    beginKeywords: 'Id', //TODO: Check this
     illegal: ILLEGALS,
     contains: [...APEX_PARTS]
   };