fix(ruby) non-interpolable strings

Author: verhovsky

CHANGES.md

@@ -41,7 +41,8 @@ Core Grammars:
 - fix(swift) - Fixed syntax highlighting for class func/var declarations [guuido]
 - fix(yaml) - Fixed wrong escaping behavior in single quoted strings [guuido]
 - enh(nim) - Add `concept` and `defer` to list of Nim keywords [Jake Leahy]
-  
+- fix(ruby) - Don't highlighting interpolation in single quoted strings [Boris Verkhovskiy][]
+
 New Grammars:
 
 - added 3rd party TTCN-3 grammar to SUPPORTED_LANGUAGES [Osmocom][]
@@ -85,7 +86,7 @@ CONTRIBUTORS
 [guuido]: https://github.com/guuido
 [clsource]: https://github.com/clsource
 [Jake Leahy]: https://github.com/ire4ever1190
-
+[Boris Verkhovskiy]: https://github.com/verhovsky
 
 ## Version 11.10.0
 

src/languages/ruby.js

@@ -15,8 +15,7 @@ export default function(hljs) {
     /\b([A-Z]+[a-z0-9]+)+/,
     // ends in caps
     /\b([A-Z]+[a-z0-9]+)+[A-Z]+/,
-  )
-  ;
+  );
   const CLASS_NAME_WITH_NAMESPACE_RE = regex.concat(CLASS_NAME_RE, /(::\w+)*/)
   // very popular ruby built-ins that one might even assume
   // are actual keywords (despite that not being the case)
@@ -124,54 +123,119 @@ export default function(hljs) {
   };
   const STRING = {
     className: 'string',
-    contains: [
-      hljs.BACKSLASH_ESCAPE,
-      SUBST
-    ],
+    contains: [ hljs.BACKSLASH_ESCAPE ],
     variants: [
       {
         begin: /'/,
         end: /'/
       },
       {
-        begin: /"/,
-        end: /"/
-      },
-      {
-        begin: /`/,
-        end: /`/
-      },
-      {
-        begin: /%[qQwWx]?\(/,
+        begin: /%q\(/,
         end: /\)/
       },
       {
-        begin: /%[qQwWx]?\[/,
+        begin: /%q\[/,
         end: /\]/
       },
       {
-        begin: /%[qQwWx]?\{/,
+        begin: /%q\{/,
         end: /\}/
       },
       {
-        begin: /%[qQwWx]?</,
+        begin: /%q</,
         end: />/
       },
       {
-        begin: /%[qQwWx]?\//,
+        begin: /%q\//,
         end: /\//
       },
       {
-        begin: /%[qQwWx]?%/,
+        begin: /%q%/,
         end: /%/
       },
       {
-        begin: /%[qQwWx]?-/,
+        begin: /%q-/,
         end: /-/
       },
       {
-        begin: /%[qQwWx]?\|/,
-        end: /\|/
+        begin: /"/,
+        end: /"/,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ]
+      },
+      {
+        begin: /`/,
+        end: /`/,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ]
+      },
+      {
+        begin: /%[QwWx]?\(/,
+        end: /\)/,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ]
+      },
+      {
+        begin: /%[QwWx]?\[/,
+        end: /\]/,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ]
+      },
+      {
+        begin: /%[QwWx]?\{/,
+        end: /\}/,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ]
+      },
+      {
+        begin: /%[QwWx]?</,
+        end: />/,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ]
+      },
+      {
+        begin: /%[QwWx]?\//,
+        end: /\//,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ]
+      },
+      {
+        begin: /%[QwWx]?%/,
+        end: /%/,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ]
+      },
+      {
+        begin: /%[QwWx]?-/,
+        end: /-/,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ]
+      },
+      {
+        begin: /%[QwWx]?\|/,
+        end: /\|/,
+        contains: [
+          hljs.BACKSLASH_ESCAPE,
+          SUBST
+        ]
       },
       // in the following expressions, \B in the beginning suppresses recognition of ?-sequences
       // where ? is the last character of a preceding identifier, as in: `func?4`

test/markup/erb/default.expect.txt

@@ -6,6 +6,6 @@
 
 &lt;%-</span><span class="language-ruby"> available_things = things.select(&amp;<span class="hljs-symbol">:available?</span>) </span><span class="language-xml">-%&gt;
 &lt;%%</span><span class="language-ruby">- x = <span class="hljs-number">1</span> + <span class="hljs-number">2</span> -</span><span class="language-xml">%%&gt;
-&lt;%%</span><span class="language-ruby"> value = <span class="hljs-string">&#x27;real string <span class="hljs-subst">#{<span class="hljs-variable">@value</span>}</span>&#x27;</span> </span><span class="language-xml">%%&gt;
+&lt;%%</span><span class="language-ruby"> value = <span class="hljs-string">&quot;real string <span class="hljs-subst">#{<span class="hljs-variable">@value</span>}</span>&quot;</span> </span><span class="language-xml">%%&gt;
 &lt;%%</span><span class="language-ruby">= available_things.inspect </span><span class="language-xml">%%&gt;
 </span>

test/markup/erb/default.txt

@@ -6,5 +6,5 @@
 
 <%- available_things = things.select(&:available?) -%>
 <%%- x = 1 + 2 -%%>
-<%% value = 'real string #{@value}' %%>
+<%% value = "real string #{@value}" %%>
 <%%= available_things.inspect %%>

test/markup/ruby/strings.expect.txt

@@ -27,4 +27,10 @@ c = <span class="hljs-string">?\u{00AF09}</span>
 c = <span class="hljs-string">?\u{0AF09}</span>
 c = <span class="hljs-string">?\u{AF9}</span>
 c = <span class="hljs-string">?\u{F9}</span>
-c = <span class="hljs-string">?\u{F}</span>
+c = <span class="hljs-string">?\u{F}</span>
+
+<span class="hljs-comment"># Interpolation</span>
+c = <span class="hljs-string">&#x27;a#{1}b&#x27;</span>  <span class="hljs-comment">#=&gt; &quot;a\#{1}b&quot;</span>
+c = <span class="hljs-string">&quot;a<span class="hljs-subst">#{<span class="hljs-number">1</span>}</span>b&quot;</span>  <span class="hljs-comment">#=&gt; &quot;a1b&quot;</span>
+c = <span class="hljs-string">%q(a#{1}b)</span> <span class="hljs-comment">#=&gt; &quot;a\#{1}b&quot;</span>
+c = <span class="hljs-string">%Q{a<span class="hljs-subst">#{<span class="hljs-number">1</span>}</span>b}</span> <span class="hljs-comment">#=&gt; &quot;a1b&quot;</span>

test/markup/ruby/strings.txt

@@ -27,4 +27,10 @@ c = ?\u{00AF09}
 c = ?\u{0AF09}
 c = ?\u{AF9}
 c = ?\u{F9}
-c = ?\u{F}
+c = ?\u{F}
+
+# Interpolation
+c = 'a#{1}b'  #=> "a\#{1}b"
+c = "a#{1}b"  #=> "a1b"
+c = %q(a#{1}b) #=> "a\#{1}b"
+c = %Q{a#{1}b} #=> "a1b"