Number sign keywords can appear as function names when without #

Author: bradleymackey

src/languages/swift.js

@@ -494,20 +494,24 @@ export default function(hljs) {
     return concat("(?!", list.join("|"), ")");
   }
 
-  const METHODS_ONLY = [...Swift.keywords, ...Swift.numberSignKeywordsRaw, ...Swift.builtIns];
+  const METHODS_ONLY = [...Swift.keywords, ...Swift.builtIns];
   const FUNCTION_CALL = {
     relevance: 0,
     variants: [
       {
+        // Functions and macro calls
         scope: "title.function",
+        keywords: KEYWORDS,
         match: concat(
-          either(/#/, /\b/),
-          noneOf(METHODS_ONLY.map(x => concat(x, TRAILING_PAREN_REGEX))),
+          either(/\b/, /#/),
+          noneOf([...METHODS_ONLY].map(x => concat(x, TRAILING_PAREN_REGEX))),
           FUNCTION_IDENT,
           lookahead(TRAILING_PAREN_REGEX),
         ),
       },
       {
+        // Keywords/built-ins that only can appear as a method call
+        // e.g. foo.if()
         match: [
           /\./,
           either(...METHODS_ONLY),
@@ -518,6 +522,7 @@ export default function(hljs) {
         }
       },
       {
+        // Quoted methods calls, e.g. `foo`()
         scope: "title.function",
         match: concat(
           QUOTED_IDENTIFIER.match,

test/markup/swift/functions.expect.txt

@@ -79,3 +79,18 @@ obj.<span class="hljs-title function_">`if`</span> ()
 <span class="hljs-title function_">`notKeyword`</span>()
 obj.<span class="hljs-title function_">`notKeyword`</span>()
 obj.<span class="hljs-title function_">`notKeyword`</span> ()
+
+<span class="hljs-comment">// number sign keywords are fine</span>
+<span class="hljs-title function_">column</span>()
+<span class="hljs-title function_">keyPath</span>()
+<span class="hljs-title function_">sourceLocation</span>()
+obj.<span class="hljs-title function_">column</span>()
+obj.<span class="hljs-title function_">keyPath</span>()
+obj.<span class="hljs-title function_">sourceLocation</span>()
+
+<span class="hljs-comment">// attribute keywords are fine</span>
+<span class="hljs-title function_">frozen</span>()
+<span class="hljs-title function_">discardableResult</span>()
+obj.<span class="hljs-title function_">frozen</span>()
+obj.<span class="hljs-title function_">discardableResult</span>()
+

test/markup/swift/functions.txt

@@ -79,3 +79,18 @@ obj.`if` ()
 `notKeyword`()
 obj.`notKeyword`()
 obj.`notKeyword` ()
+
+// number sign keywords are fine
+column()
+keyPath()
+sourceLocation()
+obj.column()
+obj.keyPath()
+obj.sourceLocation()
+
+// attribute keywords are fine
+frozen()
+discardableResult()
+obj.frozen()
+obj.discardableResult()
+

test/markup/swift/keywords.expect.txt

@@ -20,21 +20,21 @@ x <span class="hljs-keyword">is</span> <span class="hljs-type">String</span>
 <span class="hljs-keyword">public</span> <span class="hljs-keyword">private</span> <span class="hljs-keyword">fileprivate</span> <span class="hljs-keyword">package</span> <span class="hljs-keyword">internal</span> <span class="hljs-keyword">open</span>
 
 <span class="hljs-keyword">#if</span> <span class="hljs-type">DEBUG</span>
-<span class="hljs-keyword">#error</span>(<span class="hljs-string">&quot;Error&quot;</span>)
+<span class="hljs-title function_"><span class="hljs-keyword">#error</span></span>(<span class="hljs-string">&quot;Error&quot;</span>)
 <span class="hljs-keyword">#elseif</span> <span class="hljs-title function_">os</span>(macOS)
-<span class="hljs-keyword">#error</span>(<span class="hljs-string">&quot;Error&quot;</span>)
+<span class="hljs-title function_"><span class="hljs-keyword">#error</span></span>(<span class="hljs-string">&quot;Error&quot;</span>)
 <span class="hljs-keyword">#elseif</span> <span class="hljs-title function_">arch</span>(arm64)
-<span class="hljs-keyword">#error</span>(<span class="hljs-string">&quot;Error&quot;</span>)
+<span class="hljs-title function_"><span class="hljs-keyword">#error</span></span>(<span class="hljs-string">&quot;Error&quot;</span>)
 <span class="hljs-keyword">#elseif</span> <span class="hljs-title function_">compiler</span>(<span class="hljs-operator">&gt;=</span><span class="hljs-number">5.0</span>)
-<span class="hljs-keyword">#error</span>(<span class="hljs-string">&quot;Error&quot;</span>)
+<span class="hljs-title function_"><span class="hljs-keyword">#error</span></span>(<span class="hljs-string">&quot;Error&quot;</span>)
 <span class="hljs-keyword">#elseif</span> <span class="hljs-title function_">canImport</span>(<span class="hljs-type">UIKit</span>)
-<span class="hljs-keyword">#error</span>(<span class="hljs-string">&quot;Error&quot;</span>)
+<span class="hljs-title function_"><span class="hljs-keyword">#error</span></span>(<span class="hljs-string">&quot;Error&quot;</span>)
 <span class="hljs-keyword">#elseif</span> <span class="hljs-title function_">targetEnvironment</span>(simulator)
-<span class="hljs-keyword">#error</span>(<span class="hljs-string">&quot;Error&quot;</span>)
+<span class="hljs-title function_"><span class="hljs-keyword">#error</span></span>(<span class="hljs-string">&quot;Error&quot;</span>)
 <span class="hljs-keyword">#endif</span>
 
-<span class="hljs-keyword">#imageLiteral</span>(resourceName: expression)
-<span class="hljs-keyword">#fileLiteral</span>(resourceName: expression)
+<span class="hljs-title function_"><span class="hljs-keyword">#imageLiteral</span></span>(resourceName: expression)
+<span class="hljs-title function_"><span class="hljs-keyword">#fileLiteral</span></span>(resourceName: expression)
 
 x.<span class="hljs-title function_">as</span>(y)
 x.<span class="hljs-title function_">for</span>(y)