MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-31442 Handle hash signs in literal parts of f-strings

Browse Source 
Made the corresponding states of the lexer exclusive so that the pattern
for line comments doesn't match literal fragments starting with a hash sign
as the longest (together with closing braces and quotes). It also means that
we need to replicate the BAD_CHARACTER rule in these states as a fallback
pattern for unmatched input.
This commit is contained in:
Mikhail Golubev
2018-10-01 12:46:45 +03:00
parent 1e527a9ba4
commit 2e8b9f7a9f
12 changed files with 492 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/testData/psi/FStringContainsHashInLiteralPart.py
+1
View File
@@ -0,0 +1 @@
s = f'#foo'
python/testData/psi/FStringContainsHashInLiteralPart.txt
+12
View File
@@ -0,0 +1,12 @@
PyFile:FStringContainsHashInLiteralPart.py
PyAssignmentStatement
PyTargetExpression: s
PsiElement(Py:IDENTIFIER)('s')
PsiWhiteSpace(' ')
PsiElement(Py:EQ)('=')
PsiWhiteSpace(' ')
PyStringLiteralExpression: #foo
PyFormattedStringNode
PsiElement(Py:FSTRING_START)('f'')
PsiElement(Py:FSTRING_TEXT)('#foo')
PsiElement(Py:FSTRING_END)(''')
python/testData/psi/FStringContainsHashSignInFormatPart.py
+1
View File
@@ -0,0 +1 @@
s = f'{42:#b}'
python/testData/psi/FStringContainsHashSignInFormatPart.txt
+19
View File
@@ -0,0 +1,19 @@
PyFile:FStringContainsHashSignInFormatPart.py
PyAssignmentStatement
PyTargetExpression: s
PsiElement(Py:IDENTIFIER)('s')
PsiWhiteSpace(' ')
PsiElement(Py:EQ)('=')
PsiWhiteSpace(' ')
PyStringLiteralExpression: {42:#b}
PyFormattedStringNode
PsiElement(Py:FSTRING_START)('f'')
PyFStringFragment
PsiElement(Py:FSTRING_FRAGMENT_START)('{')
PyNumericLiteralExpression
PsiElement(Py:INTEGER_LITERAL)('42')
PyFStringFragmentFormatPart
PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':')
PsiElement(Py:FSTRING_TEXT)('#b')
PsiElement(Py:FSTRING_FRAGMENT_END)('}')
PsiElement(Py:FSTRING_END)(''')
python/testData/psi/UnterminatedFStringWithTrailingBackslashInFormatPart.py
+1
View File
@@ -0,0 +1 @@
s = f'{42:\
python/testData/psi/UnterminatedFStringWithTrailingBackslashInFormatPart.txt
+21
View File
@@ -0,0 +1,21 @@
PyFile:UnterminatedFStringWithTrailingBackslashInFormatPart.py
PyAssignmentStatement
PyTargetExpression: s
PsiElement(Py:IDENTIFIER)('s')
PsiWhiteSpace(' ')
PsiElement(Py:EQ)('=')
PsiWhiteSpace(' ')
PyStringLiteralExpression: {42:
PyFormattedStringNode
PsiElement(Py:FSTRING_START)('f'')
PyFStringFragment
PsiElement(Py:FSTRING_FRAGMENT_START)('{')
PyNumericLiteralExpression
PsiElement(Py:INTEGER_LITERAL)('42')
PyFStringFragmentFormatPart
PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':')
PsiErrorElement:} expected
<empty list>
PsiElement(BAD_CHARACTER)('\')
PsiErrorElement:Statement expected, found BAD_CHARACTER
<empty list>
python/testData/psi/UnterminatedFStringWithTrailingBackslashInLiteralPart.py
+1
View File
@@ -0,0 +1 @@
s = f'\
python/testData/psi/UnterminatedFStringWithTrailingBackslashInLiteralPart.txt
+15
View File
@@ -0,0 +1,15 @@
PyFile:UnterminatedFStringWithTrailingBackslashInLiteralPart.py
PyAssignmentStatement
PyTargetExpression: s
PsiElement(Py:IDENTIFIER)('s')
PsiWhiteSpace(' ')
PsiElement(Py:EQ)('=')
PsiWhiteSpace(' ')
PyStringLiteralExpression:
PyFormattedStringNode
PsiElement(Py:FSTRING_START)('f'')
PsiErrorElement:unexpected f-string token
<empty list>
PsiElement(BAD_CHARACTER)('\')
PsiErrorElement:Statement expected, found BAD_CHARACTER
<empty list>