Merge branch 'main' into fix-nix

Author: joshgoebel

CHANGES.md

@@ -37,7 +37,8 @@ Core Grammars:
 - fix(nix) handle `'''` string escapes [h7x4][]
 - fix(nix) handle backslash string escapes [h7x4][]
 - fix(nix) don't mix escapes for `"` and `''` strings [h7x4][]
-
+- fix(swift) - Fixed syntax highlighting for class func/var declarations [guuido]
+  
 New Grammars:
 
 - added 3rd party TTCN-3 grammar to SUPPORTED_LANGUAGES [Osmocom][]
@@ -71,6 +72,7 @@ CONTRIBUTORS
 [Álvaro Mondéjar]: https://github.com/mondeja
 [Lavan]: https://github.com/jvlavan
 [Somya]: https://github.com/somya-05
+[guuido]: https://github.com/guuido
 
 
 ## Version 11.10.0

src/languages/swift.js

@@ -460,6 +460,33 @@ export default function(hljs) {
     end: /}/
   };
 
+  const CLASS_FUNC_DECLARATION = {
+    match: [
+      /class\b/,          
+      /\s+/,
+      /func\b/,
+      /\s+/,
+      /\b[A-Za-z_][A-Za-z0-9_]*\b/ 
+    ],
+    scope: {
+      1: "keyword",
+      3: "keyword",
+      5: "title.function"
+    }
+  };
+
+  const CLASS_VAR_DECLARATION = {
+    match: [
+      /class\b/,
+      /\s+/,          
+      /var\b/, 
+    ],
+    scope: {
+      1: "keyword",
+      3: "keyword"
+    }
+  };
+
   const TYPE_DECLARATION = {
     begin: [
       /(struct|protocol|class|extension|enum|actor)/,
@@ -524,6 +551,8 @@ export default function(hljs) {
       ...COMMENTS,
       FUNCTION_OR_MACRO,
       INIT_SUBSCRIPT,
+      CLASS_FUNC_DECLARATION,
+      CLASS_VAR_DECLARATION,
       TYPE_DECLARATION,
       OPERATOR_DECLARATION,
       PRECEDENCEGROUP,

test/markup/swift/class-func-var.expect.txt

@@ -0,0 +1,15 @@
+<span class="hljs-keyword">class</span> <span class="hljs-keyword">func</span> <span class="hljs-title function_">f1</span>() -&gt; <span class="hljs-type">Void</span> { }
+
+<span class="hljs-keyword">class</span> <span class="hljs-keyword">func</span> <span class="hljs-title function_">f2</span><span class="hljs-operator">&lt;</span><span class="hljs-type">T</span>: <span class="hljs-type">Comparable</span><span class="hljs-operator">&gt;</span>() -&gt; <span class="hljs-type">T</span> { }
+
+<span class="hljs-keyword">class</span> <span class="hljs-keyword">func</span> <span class="hljs-title function_">f3</span><span class="hljs-operator">&lt;</span><span class="hljs-type">T</span><span class="hljs-operator">&gt;</span>(
+  <span class="hljs-keyword">_</span> p1: <span class="hljs-type">Int</span>,
+  p2: <span class="hljs-type">String</span>
+) <span class="hljs-keyword">async</span> <span class="hljs-keyword">throws</span> -&gt; [<span class="hljs-type">T</span>] { }
+
+<span class="hljs-keyword">class</span> <span class="hljs-keyword">var</span> v1: <span class="hljs-type">Int</span> { <span class="hljs-keyword">get</span> <span class="hljs-keyword">set</span> }
+
+<span class="hljs-keyword">class</span> <span class="hljs-keyword">var</span> v2: <span class="hljs-type">String</span> {
+  <span class="hljs-keyword">get</span> { <span class="hljs-keyword">return</span> <span class="hljs-string">&quot;test&quot;</span> }
+  <span class="hljs-keyword">set</span> { }
+}

test/markup/swift/class-func-var.txt

@@ -0,0 +1,15 @@
+class func f1() -> Void { }
+
+class func f2<T: Comparable>() -> T { }
+
+class func f3<T>(
+  _ p1: Int,
+  p2: String
+) async throws -> [T] { }
+
+class var v1: Int { get set }
+
+class var v2: String {
+  get { return "test" }
+  set { }
+}