[Swift] Fix tuple destructuring and backticks around identifiers

rouge-ruby · Dec 12, 2017 · 691aa70 · 691aa70
1 parent cb28457
commit 691aa70
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/rouge/lexers/swift.rb b/lib/rouge/lexers/swift.rb
@@ -142,12 +142,15 @@ class deinit enum extension final func import init internal lazy let optional pr
         end
 
         rule /(`)(#{id})(`)/ do
-          groups Punctuation, Name, Punctuation
+          groups Punctuation, Name::Variable, Punctuation
         end
       end
 
       state :tuple do
         rule /(#{id})/, Name::Variable
+        rule /(`)(#{id})(`)/ do
+            groups Punctuation, Name::Variable, Punctuation
+        end
         rule /,/, Punctuation
         rule /[(]/, Punctuation, :push
         rule /[)]/, Punctuation, :pop!

diff --git a/spec/visual/samples/swift b/spec/visual/samples/swift
@@ -395,4 +395,10 @@ var `var` = 3
 // keypath
 let keypath = \Person.firstName
 
-foo() // end-of-file comment
+// tuple destructuring
+let (t1, t2) = (1, 2)
+var ((`func`, foo), `protocol`) = ((3, 4), 5)
+var ( t3 , /* comment */
+    ( t4 , t5 ) ) = ("a", ("b", "c"))
+
+foo() // end-of-file comment