Fix face of function names

Fixes #174.
swift-emacs · Oct 17, 2021 · e246264 · e246264
1 parent babe36c
commit e246264
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/swift-mode-font-lock.el b/swift-mode-font-lock.el
@@ -653,16 +653,16 @@ Excludes true, false, and keywords begin with a number sign.")
      .
      'swift-mode:builtin-precedence-group-face)
 
-    ;; Method/function calls
-    ("\\<\\(\\(\\sw\\|\\s_\\)+\\)\\>\\??\\s-*("
-     1
-     'swift-mode:function-call-face)
-
     ;; Function and type declarations
     (swift-mode:font-lock-match-declared-function-names
      .
      'swift-mode:function-name-face)
 
+    ;; Method/function calls
+    ("\\<\\(\\(\\sw\\|\\s_\\)+\\)\\>\\??\\s-*("
+     1
+     'swift-mode:function-call-face)
+
     ;; Property accesses
     (swift-mode:font-lock-match-property-access
      .

diff --git a/test/swift-files/font-lock/font-lock.swift b/test/swift-files/font-lock/font-lock.swift
@@ -55,3 +55,7 @@ foo +!+!+!+!+ bbb // "foo +!+!+!+!+ bbb"
 //
 
 enum Foo: Error { .foo } // #("enum Foo: Error { .foo }" 0 4 (face swift-mode:keyword-face) 5 8 (face swift-mode:function-name-face) 10 15 (face swift-mode:builtin-type-face) 19 22 (face swift-mode:property-access-face))
+
+func foo() { // #("func foo() {" 0 4 (face swift-mode:keyword-face) 5 8 (face swift-mode:function-name-face))
+    foo() // #("    foo()" 4 7 (face swift-mode:function-call-face))
+}