fix: support namespace-qualified types in extends/implements (issue #50)

- Update extends-class pattern to handle namespace-qualified types
- Update implements-class pattern to handle namespace-qualified types
- Patterns now correctly tokenize System.Exception, Database.Batchable, etc.
- Use lookahead to distinguish namespace-qualified from simple types
- Fix type-builtin to support both 'Id' and 'ID' (Apex is case-insensitive)
- Add test cases for namespace-qualified extends and implements

Closes #50

Author: mshanemc

src/apex.tmLanguage.yml

@@ -420,21 +420,35 @@ repository:
     - include: '#comment'
 
   extends-class:
-    begin: (extends)\b\s+([_[:alpha:]][_[:alnum:]]*)
+    begin: (extends)\b\s+
     beginCaptures:
       '1': { name: keyword.other.extends.apex }
-      '2': { name: entity.name.type.extends.apex }
     end: '(?={|implements)'
+    patterns:
+    - begin: (?=[_[:alpha:]][_[:alnum:]]*\s*\.)
+      end: '(?={|implements)'
+      patterns:
+      - include: '#support-type'
+      - include: '#type'
+    - match: ([_[:alpha:]][_[:alnum:]]*)
+      captures:
+        '1': { name: entity.name.type.extends.apex }
 
   implements-class:
     begin: (implements)\b
     beginCaptures:
       '1': { name: keyword.other.implements.apex }
     patterns:
+    - begin: (?=[_[:alpha:]][_[:alnum:]]*\s*\.)
+      end: '(?={|extends|,)'
+      patterns:
+      - include: '#support-type'
+      - include: '#type'
     - match: ([_[:alpha:]][_[:alnum:]]*)\b\s*(,)?
       captures:
         '1': { name: entity.name.type.implements.apex }
         '2': { name: punctuation.separator.comma.apex }
+    - include: '#punctuation-comma'
     end: '(?={|extends)'
 
   soql-query-expression:
@@ -1654,7 +1668,7 @@ repository:
     - include: '#type-nullable-suffix'
 
   type-builtin:
-    match: \b(Blob|Boolean|byte|Date|Datetime|Decimal|Double|ID|Integer|Long|Object|String|Time|void)\b
+    match: \b(Blob|Boolean|byte|Date|Datetime|Decimal|Double|Id|Integer|Long|Object|String|Time|void)\b
     captures:
       '1': { name: keyword.type.apex }
 

test/annotation.tests.ts

@@ -104,7 +104,7 @@ public             class MyTestClass { }`);
     it('annotation with multiple parameters on field', async () => {
       const input =
         Input.InClass(`@InvocableMethod(label='Insert Accounts' description='Inserts new accounts.' required=false)
-      global ID leadId;
+      global Id leadId;
 `);
       const tokens = await tokenize(input);
 
@@ -133,7 +133,9 @@ public             class MyTestClass { }`);
     });
 
     it('annotation on same line as method declaration (issue #44)', async () => {
-      const input = Input.InClass(`@Future(callout=true) public static void method() {}`);
+      const input = Input.InClass(
+        `@Future(callout=true) public static void method() {}`
+      );
       const tokens = await tokenize(input);
 
       tokens.should.deep.equal([

test/class.tests.ts

@@ -216,5 +216,42 @@ public    abstract class PublicAbstractClass { }
         Token.Punctuation.CloseBrace,
       ]);
     });
+
+    it('class extends namespace-qualified type (issue #50)', async () => {
+      const input = Input.FromText(`class MyClass extends System.Exception {}`);
+      const tokens = await tokenize(input);
+
+      tokens.should.deep.equal([
+        Token.Keywords.Class,
+        Token.Identifiers.ClassName('MyClass'),
+        Token.Keywords.Extends,
+        Token.Support.Class.System,
+        Token.Punctuation.Accessor,
+        Token.Support.Class.TypeText('Exception'),
+        Token.Punctuation.OpenBrace,
+        Token.Punctuation.CloseBrace,
+      ]);
+    });
+
+    it('class implements namespace-qualified type (issue #50)', async () => {
+      const input = Input.FromText(
+        `class MyClass implements Database.Batchable<Account> {}`
+      );
+      const tokens = await tokenize(input);
+
+      tokens.should.deep.equal([
+        Token.Keywords.Class,
+        Token.Identifiers.ClassName('MyClass'),
+        Token.Keywords.Implements,
+        Token.Support.Class.Database,
+        Token.Punctuation.Accessor,
+        Token.Support.Class.TypeText('Batchable'),
+        Token.Punctuation.TypeParameters.Begin,
+        Token.Type('Account'),
+        Token.Punctuation.TypeParameters.End,
+        Token.Punctuation.OpenBrace,
+        Token.Punctuation.CloseBrace,
+      ]);
+    });
   });
 });

test/interface.tests.ts

@@ -5,7 +5,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { should } from 'chai';
-import { tokenize, Token } from './utils/tokenize';
+import { tokenize, Input, Token } from './utils/tokenize';
 
 describe('Grammar', () => {
   before(() => {
@@ -78,5 +78,21 @@ interface IBar extends IFoo { }
         Token.Punctuation.CloseBrace,
       ]);
     });
+
+    it('interface extends namespace-qualified type (issue #50)', async () => {
+      const input = Input.FromText(`interface MyInterface extends System.IComparable {}`);
+      const tokens = await tokenize(input);
+
+      tokens.should.deep.equal([
+        Token.Keywords.Interface,
+        Token.Identifiers.InterfaceName('MyInterface'),
+        Token.Keywords.Extends,
+        Token.Support.Class.System,
+        Token.Punctuation.Accessor,
+        Token.Support.Class.TypeText('IComparable'),
+        Token.Punctuation.OpenBrace,
+        Token.Punctuation.CloseBrace,
+      ]);
+    });
   });
 });

test/utils/tokenize.ts

@@ -646,7 +646,7 @@ export namespace Token {
     export const Datetime = createToken('Datetime', 'keyword.type.apex');
     export const Decimal = createToken('Decimal', 'keyword.type.apex');
     export const Double = createToken('Double', 'keyword.type.apex');
-    export const ID = createToken('ID', 'keyword.type.apex');
+    export const ID = createToken('Id', 'keyword.type.apex');
     export const Integer = createToken('Integer', 'keyword.type.apex');
     export const Long = createToken('Long', 'keyword.type.apex');
     export const Object = createToken('Object', 'keyword.type.apex');