[W-15663214][W-18609524] fix: syntax highlighting when @istest annotation is on the same line as the test method (#64)

* fix: syntax highlighting when @istest annotation is on the same line as the test method

* fix: use a lookbehind for closing parenthesis so that the annotation includes parameters

* empty commit to retrigger checks

Author: daphne-sfdc

grammars/apex.tmLanguage

@@ -396,7 +396,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?&lt;=\)|$)</string>
+        <string>(?=\s(?!\())|(?=\s*$)|(?&lt;=\s*\))</string>
         <key>patterns</key>
         <array>
           <dict>

grammars/apex.tmLanguage.cson

@@ -275,7 +275,7 @@ repository:
     beginCaptures:
       '1':
         name: 'storage.type.annotation.apex'
-    end: '(?<=\\)|$)'
+    end: '(?=\\s(?!\\())|(?=\\s*$)|(?<=\\s*\\))'
     patterns: [
       {
         begin: '\\('
@@ -2977,4 +2977,4 @@ repository:
     end: '-->'
     endCaptures:
       '0':
-        name: 'punctuation.definition.comment.apex'
+        name: 'punctuation.definition.comment.apex'

grammars/soql.tmLanguage

@@ -382,7 +382,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?&lt;=\)|$)</string>
+        <string>(?=\s(?!\())|(?=\s*$)|(?&lt;=\s*\))</string>
         <key>patterns</key>
         <array>
           <dict>

src/apex.tmLanguage.yml

@@ -42,7 +42,7 @@ repository:
     - include: '#punctuation-semicolon'
 
   class-or-trigger-members:
-    patterns:  
+    patterns:
     - include: '#javadoc-comment'
     - include: '#comment'
     - include: '#storage-modifier'
@@ -57,7 +57,7 @@ repository:
     - include: '#punctuation-semicolon'
 
   interface-members:
-    patterns:    
+    patterns:
     - include: '#javadoc-comment'
     - include: '#comment'
     - include: '#property-declaration'
@@ -115,7 +115,7 @@ repository:
     begin: ([@][_[:alpha:]]+)\b
     beginCaptures:
       '1': { name: storage.type.annotation.apex }
-    end: (?<=\)|$)
+    end: (?=\s(?!\())|(?=\s*$)|(?<=\s*\))
     patterns:
     - begin: \(
       beginCaptures:
@@ -467,7 +467,7 @@ repository:
     - match: ([_[:alpha:]][_[:alnum:]]*)(\??\.)
       captures:
         '1': { name: variable.other.object.apex}
-        '2': 
+        '2':
           patterns:
           - include: '#punctuation-accessor'
           - include: '#operator-safe-navigation'
@@ -950,7 +950,7 @@ repository:
     patterns:
     - include: '#block'
     - include: '#expression'
-  
+
   when-string:
     begin: (when)(\b\s*)((\')[_.\,\'\s*[:alnum:]]+)
     beginCaptures:
@@ -964,7 +964,7 @@ repository:
     patterns:
     - include: '#block'
     - include: '#expression'
-  
+
   when-string-statement:
     patterns:
     - name: string.quoted.single.apex