From 5557352259d3b089d4c9d7ae2f93dcbb94133648 Mon Sep 17 00:00:00 2001
From: olane <oli@gearset.com>
Date: Fri, 10 Aug 2018 11:28:44 +0100
Subject: [PATCH] Merge keyword list with keyword list from SFDC documentation

---
 src/apex/apex.ts | 149 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 141 insertions(+), 8 deletions(-)

diff --git a/src/apex/apex.ts b/src/apex/apex.ts
index d4b6dc37..7848895b 100644
--- a/src/apex/apex.ts
+++ b/src/apex/apex.ts
@@ -48,14 +48,147 @@ export const language = <ILanguage>{
 	tokenPostfix: '.apex',
 
 	keywords: [
-		'abstract', 'continue', 'for', 'new', 'switch', 'assert', 'default',
-		'goto', 'package', 'synchronized', 'boolean', 'do', 'if', 'private',
-		'this', 'break', 'double', 'implements', 'protected', 'throw', 'byte',
-		'else', 'import', 'public', 'throws', 'case', 'enum', 'instanceof', 'return',
-		'transient', 'catch', 'extends', 'int', 'short', 'try', 'char', 'final',
-		'interface', 'static', 'void', 'class', 'finally', 'long', 'strictfp',
-		'volatile', 'const', 'float', 'native', 'super', 'while', 'true', 'false',
-		'virtual', 'insert'
+		'abstract',
+		'activate',
+		'and',
+		'any',
+		'array',
+		'as',
+		'asc',
+		'assert',
+		'autonomous',
+		'begin',
+		'bigdecimal',
+		'blob',
+		'boolean',
+		'break',
+		'bulk',
+		'by',
+		'byte',
+		'case',
+		'cast',
+		'catch',
+		'char',
+		'class',
+		'collect',
+		'commit',
+		'const',
+		'continue',
+		'convertcurrency',
+		'decimal',
+		'default',
+		'delete',
+		'desc',
+		'do',
+		'double',
+		'else',
+		'end',
+		'enum',
+		'exception',
+		'exit',
+		'export',
+		'extends',
+		'false',
+		'final',
+		'finally',
+		'float',
+		'for',
+		'from',
+		'future',
+		'global',
+		'goto',
+		'group',
+		'having',
+		'hint',
+		'if',
+		'implements',
+		'import',
+		'in',
+		'inner',
+		'insert',
+		'instanceof',
+		'int',
+		'interface',
+		'into',
+		'join',
+		'last_90_days',
+		'last_month',
+		'last_n_days',
+		'last_week',
+		'like',
+		'limit',
+		'list',
+		'long',
+		'loop',
+		'map',
+		'merge',
+		'native',
+		'new',
+		'next_90_days',
+		'next_month',
+		'next_n_days',
+		'next_week',
+		'not',
+		'null',
+		'nulls',
+		'number',
+		'object',
+		'of',
+		'on',
+		'or',
+		'outer',
+		'override',
+		'package',
+		'parallel',
+		'pragma',
+		'private',
+		'protected',
+		'public',
+		'retrieve',
+		'return',
+		'returning',
+		'rollback',
+		'savepoint',
+		'search',
+		'select',
+		'set',
+		'short',
+		'sort',
+		'stat',
+		'static',
+		'strictfp',
+		'super',
+		'switch',
+		'synchronized',
+		'system',
+		'testmethod',
+		'then',
+		'this',
+		'this_month',
+		'this_week',
+		'throw',
+		'throws',
+		'today',
+		'tolabel',
+		'tomorrow',
+		'transaction',
+		'transient',
+		'trigger',
+		'true',
+		'try',
+		'type',
+		'undelete',
+		'update',
+		'upsert',
+		'using',
+		'virtual',
+		'void',
+		'volatile',
+		'webservice',
+		'when',
+		'where',
+		'while',
+		'yesterday'
 	],
 
 	operators: [