@ 261105.1

201230.1 · 8f3f60a84f3920eb9410d22850a5f450f0479493

improved interpolation regexes using curly brackets

reading declarations

langDefs/ballerina.lang

@@ -30,7 +30,7 @@ Keywords={ Strings={   Delimiter=[["|']],   Escape = [[ \\u\d{4}|\\x?\d{3}|\\\w|\\[\'\\\"] ]],-  Interpolation=[[ \$\{.+?\} ]],+  Interpolation=[[ \$\{[^}]+\} ]], }  IgnoreCase=false

langDefs/ceylon.lang

@@ -29,7 +29,7 @@ Keywords={ Strings = {   Delimiter=[["""|"|']],   RawPrefix="R",-  Interpolation=[[ ``[\w\(\)]+?``|\\\{.+?\} ]],+  Interpolation=[[ ``[\w\(\)]+?``|\\\{[^}]+\} ]], }  Comments = {

langDefs/cmake.lang

@@ -13,7 +13,7 @@ Keywords={     Regex=[[ [0-9A-Z_]{2,}  ]],   },   { Id=3,-    Regex=[[\$\{.+\$\{.+?\}.+?\}|\$\{.+?\} ]],+    Regex=[[\$\{.+\$\{[^}]+\}.+?\}|\$\{[^}]+\} ]],   },   { Id=3,     Regex=[[ [A-Z_\>]+\:([\w/]+) ]],@@ -29,7 +29,7 @@ Strings={     { Open=[[ \[=*\[ ]], Close=[[ \]=*\] ]], Raw=true }   },   AssertEqualLength=true,-  Interpolation=[[ \$\{.+?\} ]]+  Interpolation=[[ \$\{[^}]+\} ]] }  IgnoreCase=false

langDefs/dart.lang

@@ -34,7 +34,7 @@ Keywords={ Strings = {   Delimiter=[['|"]],   RawPrefix="r",-  Interpolation=[[\$\w+|\$\{.+?\}]],+  Interpolation=[[\$\w+|\$\{[^}]+\}]],   Escape = [[ \\u\d{4}|\\x?\d{3}|\\\w|\\[\'\\\"] ]] } 

langDefs/js.lang

@@ -41,7 +41,7 @@ Keywords={  Strings={   Delimiter=[["|'|`]],-  Interpolation=[[ \$\{.+?\} ]],+  Interpolation=[[ \$\{[^}]+\} ]],   Escape = [=[ \\u\{?[[:xdigit:]]{4,6}\}?|\\\d{3}|\\x[[:xdigit:]]{2}|\\[ntvbrfa\\\?'\"] ]=] } 

langDefs/kotlin.lang

@@ -28,7 +28,7 @@ Keywords={  Strings = {   Delimiter=[['|`|"]],-    Interpolation=[[ [%$]\w+|\$\{.+?\} ]],+    Interpolation=[[ [%$]\w+|\$\{[^}]+\} ]], }  Comments = {

langDefs/rs.lang

@@ -35,7 +35,8 @@ Keywords={ Strings = {   Delimiter=[["]],   RawPrefix="r",-  Escape = [[ \\[\'\\\"aftnrv]|\\U\{[0-9a-fA-F]{8}\}|\\u\{[0-9a-fA-F]{4}\}|\\x?? ]]+  Escape = [[ \\[\'\\\"aftnrv]|\\U\{[0-9a-fA-F]{8}\}|\\u\{[0-9a-fA-F]{4}\}|\\x?? ]],+  Interpolation=[[ \{[^}]+\}|\{\} ]] }  Comments = {

langDefs/terraform.lang

@@ -8,16 +8,14 @@ Digits = [[ (?:0x|0X|0b)[0-9a-fA-F']+|\d*[\.]?\d+(?:[eE][\-\+]\d+)?[lLuU]* ]] Keywords={    { Id=1,-    List= { "variable", "resource", "connection", "data", "vars", "tags", "module", "locals", "provider"-          }+    List= { "variable", "resource", "connection", "data", "vars", "tags", "module", "locals", "provider" }   },    { Id=3,     Regex=[[(\w+)\s*\=]]   },   { Id=2,-    List= { "false", "true"-          }+    List= { "false", "true" }   }  }@@ -26,7 +24,7 @@ Keywords={ -- hereDoc opening delimiter, see OnStateChange to handle end of string Strings={   Delimiter=[[<<[\-]?\s*["']?\s*[A-Za-z_]+["']?|"|`|']],-  Interpolation=[[ (\$\{.+?\}) ]]+  Interpolation=[[ (\$\{[^}]+\}) ]] }  Comments = {

langDefs/ts.lang

@@ -36,7 +36,7 @@ Keywords={  Strings = {   Delimiter=[[`|'|"]],-  Interpolation=[[ \$\{.+?\} ]],+  Interpolation=[[ \$\{[^}]+\} ]], }  Comments = {