fixed interpolation and added squiggly heredocs in ruby.lang

Author: andre-simon

langDefs/ruby.lang

@@ -35,12 +35,17 @@ Keywords={
   { Id=4,
     Regex=[[(\w+)\s*\(]],
   },
+  
+  --see OnStateChange
+  { Id=5,
+    Regex = [[ [#]\{[^}]*?\} ]],
+  },
 }
 
 -- hereDoc opening delimiter, see OnStateChange to handle end of string
 Strings={
-  Delimiter=[["|'|`|<<[\-"'`]?[\w_]+["'`]?]],
-  Interpolation = [[ %\{[^}]*?\} ]],
+  Delimiter=[["|'|`|<<[\-~"'`]?[\w_]+["'`]?]],
+  Interpolation = [[ [%]\{[^}]*?\} ]],
 
   DelimiterPairs= {
     { Open=[[%q\(]], Close=[[\)]] },
@@ -73,7 +78,6 @@ Operators=[[\(|\)|\[|\]|\{|\}|\,|\;|\:|\.|\&|<|>|\!|\-|\+|\/|\*|\=|\?|\%|\|]]
 function OnStateChange(oldState, newState, token, groupID)
 
   -- https://fossies.org/linux/misc/puppet-5.3.2.tar.gz/puppet-5.3.2/lib/puppet/indirector/hiera.rb?m=t  
-
 
    if token==")" or token=="}" or token=="{"  and oldState~=HL_STRING then
       return HL_OPERATOR
@@ -87,23 +91,26 @@ function OnStateChange(oldState, newState, token, groupID)
       hereDoc = nil
       return HL_STRING_END
    end
-   
-   
-   
+      
    if hereDoc~=nil then
     return HL_STRING
    end
 
+   --resolve issue with #{} sequence within strings
+   if oldState==HL_STRING and newState==HL_KEYWORD and groupID==5 then
+      return HL_INTERPOLATION
+   end
+   
    -- resolve issue with regex expression which spans strings like "</i>" + VAR + "</i>"
    if string.sub(token,1,1)=="/" and oldState==HL_STRING and newState==HL_KEYWORD then
       return HL_REJECT
    end
 
-   --recognize hereDoc multine strings
+   --recognize hereDoc multine strings (including squiggly heredoc)
    --do not clear hereDoc if token is ",' or `
    if (oldState==HL_STANDARD or oldState==HL_STRING) and newState==HL_STRING 
        and not string.find("\"'`", token) then
-      hereDoc = string.match(token, "<<[%-\"'`]?([%a_]+)" )
+      hereDoc = string.match(token, "<<[%-~\"'`]?([%a_]+)" )
    end
 
    -- fix quoted string termination