branch: elpa/swift-mode
commit b43c1e2e5de078dd31f8592ca1d0888d6ed5e2ac
Merge: 27b93dd a028f68
Author: Chris Barrett <chris.d.barr...@me.com>
Commit: Chris Barrett <chris.d.barr...@me.com>
Merge pull request #38 from ap4y/fix_36
Add "_" to the allowed symbols in string interpolation expression
---
swift-mode.el | 2 +-
test/font-lock-tests.el | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/swift-mode.el b/swift-mode.el
index dd93a34..c590853 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -405,7 +405,7 @@
(remove-text-properties start end '(swift-interpolation-match-data))
(funcall
(syntax-propertize-rules
- ((rx (group "\\(" (* (any alnum " " "(" ")" "+" "-" "*" "/")) ")"))
+ ((rx (group "\\(" (* (any alnum " " "(" ")" "+" "-" "*" "/" "_")) ")"))
(0 (ignore (swift-syntax-propertize-interpolation)))))
start end)))
diff --git a/test/font-lock-tests.el b/test/font-lock-tests.el
index d4daffc..8fd4b33 100644
--- a/test/font-lock-tests.el
+++ b/test/font-lock-tests.el
@@ -190,6 +190,7 @@ test will fail."
(check-face string-interpolation/has-variable-face/2
font-lock-variable-name-face "\"{{\\\(bar)}}\"")
(check-face string-interpolation/has-variable-face/3
font-lock-variable-name-face "\"\\\(bar\(1\){{\)}}\"")
(check-face string-interpolation/has-variable-face/4
font-lock-variable-name-face "\"\\\(bar\(1\){{ + baz\(2\)\)}}\"")
+(check-face string-interpolation/has-variable-face/5
font-lock-variable-name-face "\"foo {{\\\(bar_baz)}}\"")
(check-face string-interpolation/after-has-string-face/2 font-lock-string-face
"\"(foo \\\(bar){{baz}}\")")
(check-face self/has-keyword-face/1 font-lock-keyword-face "{{self}}.foo")
