Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Not all docstrings are SQL #247

Merged
merged 1 commit into from Mar 28, 2018
Merged

Not all docstrings are SQL #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions grammars/python.cson
View file
Open in desktop
Expand Up @@ -1629,11 +1629,11 @@
'name': 'punctuation.definition.string.end.python'
'2':
'name': 'meta.empty-string.double.python'
'name': 'string.quoted.double.block.sql.python'
'contentName': 'meta.embedded.sql'
'name': 'string.quoted.double.block.python'
'patterns': [
{
'begin': '(?=\\s*(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|WITH))'
'name': 'meta.embedded.sql'
'end': '(?=\\s*""")'
'patterns': [
{
Expand Down Expand Up @@ -2200,12 +2200,12 @@
'name': 'punctuation.definition.string.end.python'
'2':
'name': 'meta.empty-string.single.python'
'name': 'string.quoted.single.block.sql.python'
'contentName': 'meta.embedded.sql'
'name': 'string.quoted.single.block.python'
'patterns': [
{
'begin': '(?=\\s*(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|WITH))'
'end': '(?=\\s*\'\'\')'
'name': 'meta.embedded.sql'
'patterns': [
{
'include': 'source.sql'
Expand Down
29 changes: 27 additions & 2 deletions spec/python-spec.coffee
View file
Open in desktop
Expand Up @@ -374,6 +374,29 @@ describe "Python grammar", ->
expect(tokens[4]).toEqual value: 'st', scopes: ['source.python', "string.quoted.single.single-line.binary.python"]
expect(tokens[5]).toEqual value: "'", scopes: ['source.python', "string.quoted.single.single-line.binary.python", 'punctuation.definition.string.end.python']

describe "docstrings", ->
it "tokenizes them", ->
lines = grammar.tokenizeLines '''
"""
Bla bla bla "wow" what's this?
"""
'''

expect(lines[0][0]).toEqual value: '"""', scopes: ['source.python', 'string.quoted.double.block.python', 'punctuation.definition.string.begin.python']
expect(lines[1][0]).toEqual value: ' Bla bla bla "wow" what\'s this?', scopes: ['source.python', 'string.quoted.double.block.python']
expect(lines[2][0]).toEqual value: '"""', scopes: ['source.python', 'string.quoted.double.block.python', 'punctuation.definition.string.end.python']

lines = grammar.tokenizeLines """
'''
Bla bla bla "wow" what's this?
'''
"""

expect(lines[0][0]).toEqual value: "'''", scopes: ['source.python', 'string.quoted.single.block.python', 'punctuation.definition.string.begin.python']
expect(lines[1][0]).toEqual value: ' Bla bla bla "wow" what\'s this?', scopes: ['source.python', 'string.quoted.single.block.python']
expect(lines[2][0]).toEqual value: "'''", scopes: ['source.python', 'string.quoted.single.block.python', 'punctuation.definition.string.end.python']


describe "string formatting", ->
describe "%-style formatting", ->
it "tokenizes the conversion type", ->
Expand Down Expand Up @@ -733,9 +756,11 @@ describe "Python grammar", ->
expect(tokens[3][0]).toEqual value: delim, scopes: ['source.python', scope, 'punctuation.definition.string.end.python']

it "tokenizes SQL inline highlighting on blocks with a CTE", ->
# Note that these scopes do not contain .sql because we can't definitively tell
# if the string contains SQL or not
delimsByScope =
"string.quoted.double.block.sql.python": '"""'
"string.quoted.single.block.sql.python": "'''"
"string.quoted.double.block.python": '"""'
"string.quoted.single.block.python": "'''"

for scope, delim of delimsByScope
tokens = grammar.tokenizeLines("""
Expand Down