Fix inline SQL for block strings with starting new lines

MichaelAquilina · MichaelAquilina · commit 802aa701b541 · 2015-09-03T23:20:09.000+01:00
diff --git a/grammars/python.cson b/grammars/python.cson
@@ -1137,7 +1137,7 @@
         ]
       }
       {
-        'begin': '(""")(?=\\s*(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER))'
+        'begin': '(""")'
         'beginCaptures':
           '1':
             'name': 'punctuation.definition.string.begin.python'
@@ -1151,13 +1151,19 @@
         'name': 'string.quoted.double.block.sql.python'
         'patterns': [
           {
-            'include': '#constant_placeholder'
+             'begin': '(?=\\s*(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER))'
+             'end': '(?=\\s*""")'
+             'patterns': [
+                {
+                  'include': 'source.sql'
+                }
+             ]
           }
           {
-            'include': '#escaped_char'
+            'include': '#constant_placeholder'
           }
           {
-            'include': 'source.sql'
+            'include': '#escaped_char'
           }
         ]
       }
@@ -1499,7 +1505,7 @@
         ]
       }
       {
-        'begin': '(\'\'\')(?=\\s*(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER))'
+        'begin': '(\'\'\')'
         'beginCaptures':
           '1':
             'name': 'punctuation.definition.string.begin.python'
@@ -1510,16 +1516,22 @@
             'name': 'punctuation.definition.string.end.python'
           '2':
             'name': 'meta.empty-string.single.python'
-        'name': 'string.quoted.single.block.python'
+        'name': 'string.quoted.single.block.sql.python'
         'patterns': [
           {
-            'include': '#constant_placeholder'
+             'begin': '(?=\\s*(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER))'
+             'end': '(?=\\s*\'\'\')'
+             'patterns': [
+                {
+                  'include': 'source.sql'
+                }
+             ]
           }
           {
-            'include': '#escaped_char'
+            'include': '#constant_placeholder'
           }
           {
-            'include': 'source.sql'
+            'include': '#escaped_char'
           }
         ]
       }

Original file line number	Diff line number	Diff line change
`@@ -1137,7 +1137,7 @@`
`1137`	`1137`	`]`
`1138`	`1138`	`}`
`1139`	`1139`	`{`
`1140`		`- 'begin': '(""")(?=\\s*(SELECT\|INSERT\|UPDATE\|DELETE\|CREATE\|REPLACE\|ALTER))'`
	`1140`	`+ 'begin': '(""")'`
`1141`	`1141`	`'beginCaptures':`
`1142`	`1142`	`'1':`
`1143`	`1143`	`'name': 'punctuation.definition.string.begin.python'`
`@@ -1151,13 +1151,19 @@`
`1151`	`1151`	`'name': 'string.quoted.double.block.sql.python'`
`1152`	`1152`	`'patterns': [`
`1153`	`1153`	`{`
`1154`		`- 'include': '#constant_placeholder'`
	`1154`	`+ 'begin': '(?=\\s*(SELECT\|INSERT\|UPDATE\|DELETE\|CREATE\|REPLACE\|ALTER))'`
	`1155`	`+ 'end': '(?=\\s*""")'`
	`1156`	`+ 'patterns': [`
	`1157`	`+ {`
	`1158`	`+ 'include': 'source.sql'`
	`1159`	`+ }`
	`1160`	`+ ]`
`1155`	`1161`	`}`
`1156`	`1162`	`{`
`1157`		`- 'include': '#escaped_char'`
	`1163`	`+ 'include': '#constant_placeholder'`
`1158`	`1164`	`}`
`1159`	`1165`	`{`
`1160`		`- 'include': 'source.sql'`
	`1166`	`+ 'include': '#escaped_char'`
`1161`	`1167`	`}`
`1162`	`1168`	`]`
`1163`	`1169`	`}`
`@@ -1499,7 +1505,7 @@`
`1499`	`1505`	`]`
`1500`	`1506`	`}`
`1501`	`1507`	`{`
`1502`		`- 'begin': '(\'\'\')(?=\\s*(SELECT\|INSERT\|UPDATE\|DELETE\|CREATE\|REPLACE\|ALTER))'`
	`1508`	`+ 'begin': '(\'\'\')'`
`1503`	`1509`	`'beginCaptures':`
`1504`	`1510`	`'1':`
`1505`	`1511`	`'name': 'punctuation.definition.string.begin.python'`
`@@ -1510,16 +1516,22 @@`
`1510`	`1516`	`'name': 'punctuation.definition.string.end.python'`
`1511`	`1517`	`'2':`
`1512`	`1518`	`'name': 'meta.empty-string.single.python'`
`1513`		`- 'name': 'string.quoted.single.block.python'`
	`1519`	`+ 'name': 'string.quoted.single.block.sql.python'`
`1514`	`1520`	`'patterns': [`
`1515`	`1521`	`{`
`1516`		`- 'include': '#constant_placeholder'`
	`1522`	`+ 'begin': '(?=\\s*(SELECT\|INSERT\|UPDATE\|DELETE\|CREATE\|REPLACE\|ALTER))'`
	`1523`	`+ 'end': '(?=\\s*\'\'\')'`
	`1524`	`+ 'patterns': [`
	`1525`	`+ {`
	`1526`	`+ 'include': 'source.sql'`
	`1527`	`+ }`
	`1528`	`+ ]`
`1517`	`1529`	`}`
`1518`	`1530`	`{`
`1519`		`- 'include': '#escaped_char'`
	`1531`	`+ 'include': '#constant_placeholder'`
`1520`	`1532`	`}`
`1521`	`1533`	`{`
`1522`		`- 'include': 'source.sql'`
	`1534`	`+ 'include': '#escaped_char'`
`1523`	`1535`	`}`
`1524`	`1536`	`]`
`1525`	`1537`	`}`