MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-31442 Started working on format parts of fragments

Browse Source
This commit is contained in:
Mikhail Golubev
2018-08-24 01:26:00 +03:00
parent c13a63958d
commit 81afd74ed9
7 changed files with 911 additions and 816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1643
python/gen/com/jetbrains/python/lexer/_PythonLexer.java
View File

File diff suppressed because it is too large Load Diff

60
python/src/com/jetbrains/python/lexer/Python.flex
View File

@@ -4,8 +4,9 @@ package com.jetbrains.python.lexer;
import com.intellij.lexer.FlexLexer;
import com.intellij.psi.tree.IElementType;
import com.jetbrains.python.PyTokenTypes;
import com.intellij.util.containers.Stack;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.containers.Stack;import org.jetbrains.annotations.NonNls;
import com.jetbrains.python.psi.PyStringLiteralUtil;
%%
@@ -91,36 +92,53 @@ FSTRING_TEXT = ([^\\\'\r\n{] | {ESCAPE_SEQUENCE} | {FSTRING_ESCAPED_LBRACE} | (\
%state FSTRING_FRAGMENT
%state FSTRING_FRAGMENT_FORMAT_PART
%{
static final class FStringState {
static final class FragmentState {
private final int oldState;
private final int oldBraceBalance;
private final String openingQuotes;
FStringState(int state, int braceBalance, @NonNls String fStringStart) {
FragmentState(int state, int braceBalance) {
oldState = state;
oldBraceBalance = braceBalance;
String prefix = fStringStart.toLowerCase();
prefix = StringUtil.trimLeading(prefix, 'r');
prefix = StringUtil.trimLeading(prefix, 'f');
prefix = StringUtil.trimLeading(prefix, 'r');
openingQuotes = prefix;
}
}
void pushFString() {
states.push(new FStringState(yystate(), braceBalance, yytext().toString()));
void pushFStringFragment() {
fragmentStates.push(new FragmentState(yystate(), braceBalance));
braceBalance = 0;
yybegin(FSTRING);
yybegin(FSTRING_FRAGMENT);
}
void popFString() {
FStringState state = states.pop();
void popFStringFragment() {
FragmentState state = fragmentStates.pop();
braceBalance = state.oldBraceBalance;
yybegin(state.oldState);
}
private final Stack<FStringState> states = new Stack<>();
static final class FStringState {
private final int oldState;
private final String quotes;
FStringState(int state, String quotes) {
oldState = state;
this.quotes = quotes;
}
}
void pushFString() {
final String prefixAndQuotes = yytext().toString();
final int prefixLength = PyStringLiteralUtil.getPrefixLength(prefixAndQuotes);
fStringStates.push(new FStringState(yystate(), prefixAndQuotes.substring(prefixLength)));
yybegin(FSTRING);
}
void popFString() {
final FStringState state = fStringStates.pop();
yybegin(state.oldState);
}
private final Stack<FragmentState> fragmentStates = new Stack<>();
private final Stack<FStringState> fStringStates = new Stack<>();
private int braceBalance = 0;
private int getSpaceLength(CharSequence string) {
@@ -143,12 +161,18 @@ return yylength()-s.length();
<FSTRING> {
{FSTRING_TEXT} { return PyTokenTypes.FSTRING_TEXT; }
{FSTRING_END} { popFString(); return PyTokenTypes.FSTRING_END; }
"{" { yybegin(FSTRING_FRAGMENT); return PyTokenTypes.FSTRING_FRAGMENT_START; }
"{" { pushFStringFragment(); return PyTokenTypes.FSTRING_FRAGMENT_START; }
}
<FSTRING_FRAGMENT> {
"(" { braceBalance++; return PyTokenTypes.LPAR; }
")" { braceBalance--; return PyTokenTypes.RPAR; }
"[" { braceBalance++; return PyTokenTypes.LBRACKET; }
"]" { braceBalance--; return PyTokenTypes.RBRACKET; }
"{" { braceBalance++; return PyTokenTypes.LBRACE; }
"}" { if (braceBalance == 0) { yybegin(FSTRING); return PyTokenTypes.FSTRING_FRAGMENT_END; }
"}" { if (braceBalance == 0) { popFStringFragment(); return PyTokenTypes.FSTRING_FRAGMENT_END; }
else { braceBalance--; return PyTokenTypes.RBRACE; } }
}

1
python/testData/psi/FStringFragmentWithDictLiteral.py Normal file
View File

@@ -0,0 +1 @@
s = f'{ {1: 2} }'

1
python/testData/psi/FStringFragmentWithLiteralFormatPart.py Normal file
View File

@@ -0,0 +1 @@
s = f'{42:foo}'

1
python/testData/psi/FStringFragmentWithNotParenthesizedLambda.py Normal file
View File

@@ -0,0 +1 @@
s = f'{lambda x: 42}'

1
python/testData/psi/FStringFragmentWithParenthesizedLambda.py Normal file
View File

@@ -0,0 +1 @@
s = f'{(lambda x: 42)}'

20
python/testSrc/com/jetbrains/python/PythonParsingTest.java
View File

@@ -528,6 +528,26 @@ public class PythonParsingTest extends ParsingTestCase {
doTest(LanguageLevel.PYTHON36);
}
// PY-31442
public void testFStringFragmentWithLiteralFormatPart() {
doTest(LanguageLevel.PYTHON36);
}
// PY-31442
public void testFStringFragmentWithNotParenthesizedLambda() {
doTest(LanguageLevel.PYTHON36);
}
// PY-31442
public void testFStringFragmentWithParenthesizedLambda() {
doTest(LanguageLevel.PYTHON36);
}
// PY-31442
public void testFStringFragmentWithDictLiteral() {
doTest(LanguageLevel.PYTHON36);
}
// PY-19036
public void testAwaitInNonAsyncNestedFunction() {
doTest(LanguageLevel.PYTHON35);