diff --git a/python/python-psi-impl/resources/messages/PyPsiBundle.properties b/python/python-psi-impl/resources/messages/PyPsiBundle.properties index 37fa80583232..c28eda5b0302 100644 --- a/python/python-psi-impl/resources/messages/PyPsiBundle.properties +++ b/python/python-psi-impl/resources/messages/PyPsiBundle.properties @@ -56,9 +56,9 @@ ANN.method.$0.removed.use.$1=Method ''{0}'' has been removed, use ''{1}'' instea ANN.method.$0.removed=Method ''{0}'' removed ### parsing -PARSE.expected.expression=expression expected +PARSE.expected.expression=Expression expected PARSE.expected.rbracket=']' expected -PARSE.expected.expr.or.comma.or.bracket=expected expression, ',' or ']' +PARSE.expected.expr.or.comma.or.bracket=Expected expression, ',' or ']' PARSE.expected.in='in' expected PARSE.expected.for.or.bracket=']' or 'for' expected PARSE.expected.comma=',' expected @@ -67,7 +67,7 @@ PARSE.expected.rpar=')' expected PARSE.expected.lpar='(' expected PARSE.expected.rbrace='}' expected PARSE.expected.tick='`' (backtick) expected -PARSE.expected.name=name expected +PARSE.expected.name=Name expected PARSE.expected.colon.or.rbracket=':' or ']' expected PARSE.expected.comma.or.rpar=',' or ')' expected PARSE.expected.else='else' expected @@ -76,7 +76,7 @@ PARSE.expected.identifier=Identifier expected PARSE.expected.comma.lpar.rpar=',' or '(' or ')' expected PARSE.expected.statement.break=Statement break expected PARSE.expected.@.or.def='@' or 'def' expected -PARSE.expected.formal.param.name=formal parameter name expected +PARSE.expected.formal.param.name=Formal parameter name expected PARSE.0.expected={0} expected PARSE.expected.ellipsis='...' expected PARSE.string.literal.expected=string literal expected @@ -87,6 +87,13 @@ PARSE.newline.expected=newline expected PARSE.eq.expected='=' expected PARSE.from.expected='from' expected PARSE.gt.expected='>' expected +PARSE.expected.fstring.quote={0} expected +PARSE.expected.fstring.rbrace='}' expected +PARSE.expected.fstring.colon.or.rbrace=: or '}' expected +PARSE.expected.fstring.type.conversion.or.colon.or.rbrace=Type conversion, ':' or '}' expected +PARSE.single.star.parameter.not.supported.py2=Single star parameter is not supported in Python 2 +PARSE.async.keyword.not.expected.here='async' keyword is not expected here +PARSE.keyword.cannot.be.used.as.identifier.py2=''{0}'' keyword can''t be used as identifier in Python 2 statement.expected.found.0=Statement expected, found {0} unexpected.indent=Unexpected indent @@ -102,21 +109,20 @@ import.expected='import' expected def.or.with.or.for.expected='def' or 'with' or 'for' expected rbracket.or.comma.expected=']' or ',' expected unexpected.expression.syntax=Unexpected expression syntax -tuple.expression.expected=tuple expression expected -value.expression.expected=value expression expected -unexpected.expression.part=unexpected expression part -unexpected.f.string.token=unexpected f-string token -can.t.assign.to.await.expression=can't assign to await expression +tuple.expression.expected=Tuple expression expected +value.expression.expected=Value expression expected +unexpected.expression.part=Unexpected expression part +unexpected.f.string.token=Unexpected f-string token +can.t.assign.to.await.expression=Can't assign to await expression for.expected='for' expected rarrow.expected='->' expected -unexpected.tokens=unexpected tokens +unexpected.tokens=Unexpected tokens enable.in.python.3=Enable in Python 3+ PARSE.function.type.annotations.py2=Type annotations are unsupported in Python 2 PARSE.function.return.type.annotations.py2=Return type annotations are unsupported in Python 2 PARSE.console.multiline.magic.warn=Multiline magic can't be used as an expression -PARSE.console.identifier.expected=Identifier expected. PARSE.console.help.request.warn=Help request must follow the name ### quick doc generator diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/functionTypeComments/PyFunctionTypeAnnotationParser.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/functionTypeComments/PyFunctionTypeAnnotationParser.java index e490de5b8aaa..6d1779da475c 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/functionTypeComments/PyFunctionTypeAnnotationParser.java +++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/functionTypeComments/PyFunctionTypeAnnotationParser.java @@ -16,6 +16,7 @@ package com.jetbrains.python.codeInsight.functionTypeComments; import com.intellij.lang.SyntaxTreeBuilder; +import com.intellij.openapi.util.NlsContexts.ParsingError; import com.intellij.psi.tree.IElementType; import com.jetbrains.python.PyElementTypes; import com.jetbrains.python.PyPsiBundle; @@ -26,7 +27,6 @@ import com.jetbrains.python.parsing.ParsingContext; import com.jetbrains.python.parsing.PyParser; import com.jetbrains.python.parsing.StatementParsing; import com.jetbrains.python.psi.LanguageLevel; -import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -119,7 +119,7 @@ public class PyFunctionTypeAnnotationParser extends PyParser { listMark.done(PyFunctionTypeAnnotationElementTypes.PARAMETER_TYPE_LIST); } - private void recoverUntilMatches(@NotNull @Nls String errorMessage, IElementType @NotNull ... types) { + private void recoverUntilMatches(@NotNull @ParsingError String errorMessage, IElementType @NotNull ... types) { final SyntaxTreeBuilder.Marker errorMarker = myBuilder.mark(); boolean hasNonWhitespaceTokens = false; while (!(atAnyOfTokens(types) || myBuilder.eof())) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/parsing/ExpressionParsing.java b/python/python-psi-impl/src/com/jetbrains/python/parsing/ExpressionParsing.java index 5aa11f9276c2..9f61440384b6 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/parsing/ExpressionParsing.java +++ b/python/python-psi-impl/src/com/jetbrains/python/parsing/ExpressionParsing.java @@ -18,6 +18,7 @@ package com.jetbrains.python.parsing; import com.intellij.lang.SyntaxTreeBuilder; import com.intellij.lang.WhitespacesAndCommentsBinder; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.util.NlsContexts.ParsingError; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import com.jetbrains.python.PyElementTypes; @@ -139,12 +140,12 @@ public class ExpressionParsing extends Parsing { } // Can be the end of an enclosing f-string, so leave it in the stream else { - builder.mark().error(message("PARSE.0.expected", openingQuotes)); + builder.mark().error(message("PARSE.expected.fstring.quote", openingQuotes)); } break; } else if (atToken(PyTokenTypes.STATEMENT_BREAK)) { - builder.mark().error(message("PARSE.0.expected", openingQuotes)); + builder.mark().error(message("PARSE.expected.fstring.quote", openingQuotes)); break; } else { @@ -191,11 +192,11 @@ public class ExpressionParsing extends Parsing { if (hasFormatPart) { parseFStringFragmentFormatPart(); } - String errorMessage = "} expected"; + @ParsingError String errorMessage = message("PARSE.expected.fstring.rbrace"); if (!hasFormatPart && !atToken(PyTokenTypes.FSTRING_END)) { - errorMessage = ": or " + errorMessage; + errorMessage = message("PARSE.expected.fstring.colon.or.rbrace"); if (!hasTypeConversion) { - errorMessage = "type conversion, " + errorMessage; + errorMessage = message("PARSE.expected.fstring.type.conversion.or.colon.or.rbrace"); } } diff --git a/python/python-psi-impl/src/com/jetbrains/python/parsing/FunctionParsing.java b/python/python-psi-impl/src/com/jetbrains/python/parsing/FunctionParsing.java index bdc70246a9cb..68f1c93b67a8 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/parsing/FunctionParsing.java +++ b/python/python-psi-impl/src/com/jetbrains/python/parsing/FunctionParsing.java @@ -214,7 +214,7 @@ public class FunctionParsing extends Parsing { if (myContext.getLanguageLevel().isPython2()) { parameter.rollbackTo(); parameter = myBuilder.mark(); - advanceError(myBuilder, "Single star parameter is not supported in Python 2"); + advanceError(myBuilder, message("PARSE.single.star.parameter.not.supported.py2")); } parameter.done(PyElementTypes.SINGLE_STAR_PARAMETER); return true; diff --git a/python/python-psi-impl/src/com/jetbrains/python/parsing/Parsing.java b/python/python-psi-impl/src/com/jetbrains/python/parsing/Parsing.java index 7411bdafb8f5..8c7e8a31b5da 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/parsing/Parsing.java +++ b/python/python-psi-impl/src/com/jetbrains/python/parsing/Parsing.java @@ -17,13 +17,13 @@ package com.jetbrains.python.parsing; import com.intellij.lang.SyntaxTreeBuilder; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.util.NlsContexts.ParsingError; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import com.jetbrains.python.PyElementTypes; import com.jetbrains.python.PyPsiBundle; import com.jetbrains.python.PyTokenTypes; import com.jetbrains.python.psi.PyElementType; -import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -56,7 +56,7 @@ public class Parsing { return getParsingContext().getFunctionParser(); } - protected boolean checkMatches(final IElementType token, @NotNull @Nls String message) { + protected boolean checkMatches(final IElementType token, @NotNull @ParsingError String message) { if (myBuilder.getTokenType() == token) { myBuilder.advanceLexer(); return true; @@ -118,7 +118,7 @@ public class Parsing { protected void advanceAsync(boolean falseAsync) { if (falseAsync) { - advanceError(myBuilder, "'async' keyword is not expected here"); + advanceError(myBuilder, PyPsiBundle.message("PARSE.async.keyword.not.expected.here")); } else { myBuilder.advanceLexer(); @@ -128,14 +128,14 @@ public class Parsing { protected static void advanceIdentifierLike(@NotNull SyntaxTreeBuilder builder) { if (isFalseIdentifier(builder)) { String tokenText = builder.getTokenText(); - advanceError(builder, "'" + tokenText + "' keyword can't be used as identifier in Python 2"); + advanceError(builder, PyPsiBundle.message("PARSE.keyword.cannot.be.used.as.identifier.py2", tokenText)); } else { builder.advanceLexer(); } } - protected static void advanceError(@NotNull SyntaxTreeBuilder builder, @NotNull String message) { + protected static void advanceError(@NotNull SyntaxTreeBuilder builder, @NotNull @ParsingError String message) { final SyntaxTreeBuilder.Marker err = builder.mark(); builder.advanceLexer(); err.error(message); diff --git a/python/python-psi-impl/src/com/jetbrains/python/parsing/StatementParsing.java b/python/python-psi-impl/src/com/jetbrains/python/parsing/StatementParsing.java index 3a6fdd1d13b4..f05548273766 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/parsing/StatementParsing.java +++ b/python/python-psi-impl/src/com/jetbrains/python/parsing/StatementParsing.java @@ -55,9 +55,6 @@ public class StatementParsing extends Parsing implements ITokenTypeRemapper { @NonNls public static final String TOK_ASYNC = PyNames.ASYNC; @NonNls protected static final String TOK_AWAIT = PyNames.AWAIT; - private static final String EXPRESSION_EXPECTED = "Expression expected"; - public static final String IDENTIFIER_EXPECTED = "Identifier expected"; - protected enum Phase {NONE, FROM, FUTURE, IMPORT} // 'from __future__ import' phase private Phase myFutureImportPhase = Phase.NONE; @@ -223,7 +220,7 @@ public class StatementParsing extends Parsing implements ITokenTypeRemapper { statementType = PyElementTypes.AUG_ASSIGNMENT_STATEMENT; builder.advanceLexer(); if (!getExpressionParser().parseYieldOrTupleExpression(false)) { - builder.error(EXPRESSION_EXPECTED); + builder.error(PyPsiBundle.message("PARSE.expected.expression")); } } else if (atToken(PyTokenTypes.EQ) || (atToken(PyTokenTypes.COLON) && checkLanguageLevel && myContext.getLanguageLevel().isPy3K())) { @@ -246,7 +243,7 @@ public class StatementParsing extends Parsing implements ITokenTypeRemapper { final boolean isYieldExpr = builder.getTokenType() == PyTokenTypes.YIELD_KEYWORD; if (!getExpressionParser().parseYieldOrTupleExpression(false)) { maybeExprMarker.drop(); - builder.error(EXPRESSION_EXPECTED); + builder.error(PyPsiBundle.message("PARSE.expected.expression")); break; } if (builder.getTokenType() == PyTokenTypes.EQ) { @@ -418,13 +415,13 @@ public class StatementParsing extends Parsing implements ITokenTypeRemapper { if (myBuilder.getTokenType() == PyTokenTypes.COMMA) { myBuilder.advanceLexer(); if (!getExpressionParser().parseSingleExpression(false)) { - myContext.getBuilder().error(EXPRESSION_EXPECTED); + myContext.getBuilder().error(PyPsiBundle.message("PARSE.expected.expression")); } } checkEndOfStatement(); } else { - myContext.getBuilder().error(EXPRESSION_EXPECTED); + myContext.getBuilder().error(PyPsiBundle.message("PARSE.expected.expression")); } assertStatement.done(PyElementTypes.ASSERT_STATEMENT); } @@ -559,7 +556,7 @@ public class StatementParsing extends Parsing implements ITokenTypeRemapper { return id_text; } else { - myBuilder.error(IDENTIFIER_EXPECTED); + myBuilder.error(PyPsiBundle.message("PARSE.expected.identifier")); idMarker.drop(); } return null; @@ -577,7 +574,7 @@ public class StatementParsing extends Parsing implements ITokenTypeRemapper { protected boolean parseDottedNameAsAware(boolean expect_as, boolean optional) { if (myBuilder.getTokenType() != PyTokenTypes.IDENTIFIER) { if (optional) return true; - myBuilder.error(IDENTIFIER_EXPECTED); + myBuilder.error(PyPsiBundle.message("PARSE.expected.identifier")); return false; } SyntaxTreeBuilder.Marker marker = myBuilder.mark(); @@ -588,7 +585,7 @@ public class StatementParsing extends Parsing implements ITokenTypeRemapper { while (myBuilder.getTokenType() == PyTokenTypes.DOT) { marker = marker.precede(); myBuilder.advanceLexer(); - checkMatches(PyTokenTypes.IDENTIFIER, IDENTIFIER_EXPECTED); + checkMatches(PyTokenTypes.IDENTIFIER, PyPsiBundle.message("PARSE.expected.identifier")); marker.done(getReferenceType()); } setExpectAsKeyword(old_expect_AS_kwd); @@ -710,7 +707,7 @@ public class StatementParsing extends Parsing implements ITokenTypeRemapper { final SyntaxTreeBuilder.Marker whilePart = myBuilder.mark(); myBuilder.advanceLexer(); if (!getExpressionParser().parseSingleExpression(false)) { - myBuilder.error(EXPRESSION_EXPECTED); + myBuilder.error(PyPsiBundle.message("PARSE.expected.expression")); } parseColonAndSuite(); whilePart.done(PyElementTypes.WHILE_PART); @@ -741,13 +738,13 @@ public class StatementParsing extends Parsing implements ITokenTypeRemapper { myBuilder.advanceLexer(); if (myBuilder.getTokenType() != PyTokenTypes.COLON) { if (!getExpressionParser().parseSingleExpression(false)) { - myBuilder.error(EXPRESSION_EXPECTED); + myBuilder.error(PyPsiBundle.message("PARSE.expected.expression")); } setExpectAsKeyword(true); if (myBuilder.getTokenType() == PyTokenTypes.COMMA || myBuilder.getTokenType() == PyTokenTypes.AS_KEYWORD) { myBuilder.advanceLexer(); if (!getExpressionParser().parseSingleExpression(true)) { - myBuilder.error(EXPRESSION_EXPECTED); + myBuilder.error(PyPsiBundle.message("PARSE.expected.expression")); } } } diff --git a/python/python-psi-impl/src/com/jetbrains/python/parsing/console/PyConsoleParsingContext.java b/python/python-psi-impl/src/com/jetbrains/python/parsing/console/PyConsoleParsingContext.java index fe8cc42db1b4..29a25ffe44f5 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/parsing/console/PyConsoleParsingContext.java +++ b/python/python-psi-impl/src/com/jetbrains/python/parsing/console/PyConsoleParsingContext.java @@ -178,7 +178,7 @@ public class PyConsoleParsingContext extends ParsingContext { else { expr.drop(); command.drop(); - myBuilder.error(PyPsiBundle.message("PARSE.console.identifier.expected")); + myBuilder.error(PyPsiBundle.message("PARSE.expected.identifier")); return false; } while (myBuilder.getTokenType() != null) { diff --git a/python/testData/console/ipython/psi/shellError.txt b/python/testData/console/ipython/psi/shellError.txt index 0db866426a85..848eb2c418f5 100644 --- a/python/testData/console/ipython/psi/shellError.txt +++ b/python/testData/console/ipython/psi/shellError.txt @@ -5,7 +5,7 @@ PyFile:shellError.py PsiErrorElement:End of statement expected PsiElement(Py:PLING)('!') - PsiErrorElement:Identifier expected. + PsiErrorElement:Identifier expected PsiErrorElement:Statement expected, found Py:PLING \ No newline at end of file diff --git a/python/testData/functionTypeComment/parsing/DanglingComma.txt b/python/testData/functionTypeComment/parsing/DanglingComma.txt index 16cf1ec6fb55..86fd224894b6 100644 --- a/python/testData/functionTypeComment/parsing/DanglingComma.txt +++ b/python/testData/functionTypeComment/parsing/DanglingComma.txt @@ -5,7 +5,7 @@ FunctionTypeComment:a.functionTypeComment PyReferenceExpression: int PsiElement(Py:IDENTIFIER)('int') PsiElement(Py:COMMA)(',') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:RPAR)(')') PsiWhiteSpace(' ') diff --git a/python/testData/functionTypeComment/parsing/DefAsFirstType.txt b/python/testData/functionTypeComment/parsing/DefAsFirstType.txt index be8ad74fa7f9..a979f3032178 100644 --- a/python/testData/functionTypeComment/parsing/DefAsFirstType.txt +++ b/python/testData/functionTypeComment/parsing/DefAsFirstType.txt @@ -4,7 +4,7 @@ FunctionTypeComment:a.functionTypeComment PsiElement(Py:LPAR)('(') PsiErrorElement:')' expected - PsiErrorElement:unexpected tokens + PsiErrorElement:Unexpected tokens PsiElement(Py:DEF_KEYWORD)('def') PsiWhiteSpace(' ') PsiElement(Py:IDENTIFIER)('foo') diff --git a/python/testData/functionTypeComment/parsing/NoReturnType.txt b/python/testData/functionTypeComment/parsing/NoReturnType.txt index 42faa915d030..68a4b85922e5 100644 --- a/python/testData/functionTypeComment/parsing/NoReturnType.txt +++ b/python/testData/functionTypeComment/parsing/NoReturnType.txt @@ -7,6 +7,6 @@ FunctionTypeComment:a.functionTypeComment PsiElement(Py:RPAR)(')') PsiWhiteSpace(' ') PsiElement(Py:RARROW)('->') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiWhiteSpace(' ') \ No newline at end of file diff --git a/python/testData/functionTypeComment/parsing/NoTypeAfterStar.txt b/python/testData/functionTypeComment/parsing/NoTypeAfterStar.txt index ca16a0b94360..81cdcaf9d674 100644 --- a/python/testData/functionTypeComment/parsing/NoTypeAfterStar.txt +++ b/python/testData/functionTypeComment/parsing/NoTypeAfterStar.txt @@ -4,7 +4,7 @@ FunctionTypeComment:a.functionTypeComment PsiElement(Py:LPAR)('(') PyStarExpression PsiElement(Py:MULT)('*') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:RPAR)(')') PsiWhiteSpace(' ') diff --git a/python/testData/highlighting/asyncAndAwaitAsIdentifiersIn37.py b/python/testData/highlighting/asyncAndAwaitAsIdentifiersIn37.py index 45a3fce6f409..5ea17876e52b 100644 --- a/python/testData/highlighting/asyncAndAwaitAsIdentifiersIn37.py +++ b/python/testData/highlighting/asyncAndAwaitAsIdentifiersIn37.py @@ -17,4 +17,4 @@ def await(): pass -await = 10 \ No newline at end of file +await = 10 \ No newline at end of file diff --git a/python/testData/highlighting/awaitInDictPy35.py b/python/testData/highlighting/awaitInDictPy35.py index 2006012ecdbf..aa25e0157505 100644 --- a/python/testData/highlighting/awaitInDictPy35.py +++ b/python/testData/highlighting/awaitInDictPy35.py @@ -1,5 +1,5 @@ async def f11(x): - y = {await: 10 for await in []} # fail + y = {await: 10 for await in []} # fail await x @@ -9,7 +9,7 @@ def f12(x): async def f21(x): - y = {mapper(await): 10 for await in []} # fail + y = {mapper(await): 10 for await in []} # fail await x @@ -19,8 +19,8 @@ def f22(x): async def f31(x): - await = [] # fail - y = {i: 10 for i in await} # fail + await = [] # fail + y = {i: 10 for i in await} # fail await x @@ -41,7 +41,7 @@ async def f42(x): async def f43(x): - y = {z: 10 for await z in []} # fail + y = {z: 10 for await z in []} # fail await x @@ -51,8 +51,8 @@ async def f44(x): async def f51(): - await = 5 # fail - return {await: 10} # fail + await = 5 # fail + return {await: 10} # fail def f52(): @@ -61,8 +61,8 @@ def f52(): async def f61(): - await = 5 # fail - return {"a": 10, await: 10, "b": 10} # fail + await = 5 # fail + return {"a": 10, await: 10, "b": 10} # fail def f62(): diff --git a/python/testData/highlighting/awaitInDictPy36.py b/python/testData/highlighting/awaitInDictPy36.py index 5ac1468c3f74..e212fb3a6926 100644 --- a/python/testData/highlighting/awaitInDictPy36.py +++ b/python/testData/highlighting/awaitInDictPy36.py @@ -1,5 +1,5 @@ async def f11(x): - y = {await: 10 for await in []} # fail + y = {await: 10 for await in []} # fail await x @@ -9,7 +9,7 @@ def f12(x): async def f21(x): - y = {mapper(await): 10 for await in []} # fail + y = {mapper(await): 10 for await in []} # fail await x @@ -19,8 +19,8 @@ def f22(x): async def f31(x): - await = [] # fail - y = {i: 10 for i in await} # fail + await = [] # fail + y = {i: 10 for i in await} # fail await x @@ -41,7 +41,7 @@ async def f42(x): async def f43(x): - y = {z: 10 for await z in []} # fail + y = {z: 10 for await z in []} # fail await x @@ -51,8 +51,8 @@ async def f44(x): async def f51(): - await = 5 # fail - return {await: 10} # fail + await = 5 # fail + return {await: 10} # fail def f52(): @@ -61,8 +61,8 @@ def f52(): async def f61(): - await = 5 # fail - return {"a": 10, await: 10, "b": 10} # fail + await = 5 # fail + return {"a": 10, await: 10, "b": 10} # fail def f62(): diff --git a/python/testData/highlighting/awaitInGenerator.py b/python/testData/highlighting/awaitInGenerator.py index c128dcb3178e..77a29dc5fea2 100644 --- a/python/testData/highlighting/awaitInGenerator.py +++ b/python/testData/highlighting/awaitInGenerator.py @@ -1,5 +1,5 @@ async def f11(x): - y = (await for await in []) # fail + y = (await for await in []) # fail await x @@ -9,7 +9,7 @@ def f12(x): async def f21(x): - y = (mapper(await) for await in []) # fail + y = (mapper(await) for await in []) # fail await x @@ -19,8 +19,8 @@ def f22(x): async def f31(x): - await = [] # fail - y = (i for i in await) # fail + await = [] # fail + y = (i for i in await) # fail await x @@ -41,7 +41,7 @@ async def f42(x): async def f43(x): - y = (z for await z in []) # fail + y = (z for await z in []) # fail await x diff --git a/python/testData/highlighting/awaitInListPy35.py b/python/testData/highlighting/awaitInListPy35.py index e6b645c68c46..8a5c812e3309 100644 --- a/python/testData/highlighting/awaitInListPy35.py +++ b/python/testData/highlighting/awaitInListPy35.py @@ -1,5 +1,5 @@ async def f11(x): - y = [await for await in []] # fail + y = [await for await in []] # fail await x @@ -9,7 +9,7 @@ def f12(x): async def f21(x): - y = [mapper(await) for await in []] # fail + y = [mapper(await) for await in []] # fail await x @@ -19,8 +19,8 @@ def f22(x): async def f31(x): - await = [] # fail - y = [i for i in await] # fail + await = [] # fail + y = [i for i in await] # fail await x @@ -41,7 +41,7 @@ async def f42(x): async def f43(x): - y = [z for await z in []] # fail + y = [z for await z in []] # fail await x @@ -51,8 +51,8 @@ async def f44(x): async def f51(): - await = 5 # fail - return [await] # fail + await = 5 # fail + return [await] # fail def f52(): @@ -61,8 +61,8 @@ def f52(): async def f61(): - await = 5 # fail - return ["a", await, "b"] # fail + await = 5 # fail + return ["a", await, "b"] # fail def f62(): diff --git a/python/testData/highlighting/awaitInListPy36.py b/python/testData/highlighting/awaitInListPy36.py index 9464e6c588b0..4bc15e75e926 100644 --- a/python/testData/highlighting/awaitInListPy36.py +++ b/python/testData/highlighting/awaitInListPy36.py @@ -1,5 +1,5 @@ async def f11(x): - y = [await for await in []] # fail + y = [await for await in []] # fail await x @@ -9,7 +9,7 @@ def f12(x): async def f21(x): - y = [mapper(await) for await in []] # fail + y = [mapper(await) for await in []] # fail await x @@ -19,8 +19,8 @@ def f22(x): async def f31(x): - await = [] # fail - y = [i for i in await] # fail + await = [] # fail + y = [i for i in await] # fail await x @@ -41,7 +41,7 @@ async def f42(x): async def f43(x): - y = [z for await z in []] # fail + y = [z for await z in []] # fail await x @@ -51,8 +51,8 @@ async def f44(x): async def f51(): - await = 5 # fail - return [await] # fail + await = 5 # fail + return [await] # fail def f52(): @@ -61,8 +61,8 @@ def f52(): async def f61(): - await = 5 # fail - return ["a", await, "b"] # fail + await = 5 # fail + return ["a", await, "b"] # fail def f62(): diff --git a/python/testData/highlighting/awaitInSetPy35.py b/python/testData/highlighting/awaitInSetPy35.py index 8786e8fd31a2..195935f46ebc 100644 --- a/python/testData/highlighting/awaitInSetPy35.py +++ b/python/testData/highlighting/awaitInSetPy35.py @@ -1,5 +1,5 @@ async def f11(x): - y = {await for await in []} # fail + y = {await for await in []} # fail await x @@ -9,7 +9,7 @@ def f12(x): async def f21(x): - y = {mapper(await) for await in []} # fail + y = {mapper(await) for await in []} # fail await x @@ -19,8 +19,8 @@ def f22(x): async def f31(x): - await = [] # fail - y = {i for i in await} # fail + await = [] # fail + y = {i for i in await} # fail await x @@ -41,7 +41,7 @@ async def f42(x): async def f43(x): - y = {z for await z in []} # fail + y = {z for await z in []} # fail await x @@ -51,8 +51,8 @@ async def f44(x): async def f51(): - await = 5 # fail - return {await} # fail + await = 5 # fail + return {await} # fail def f52(): @@ -61,8 +61,8 @@ def f52(): async def f61(): - await = 5 # fail - return {"a", await, "b"} # fail + await = 5 # fail + return {"a", await, "b"} # fail def f62(): diff --git a/python/testData/highlighting/awaitInSetPy36.py b/python/testData/highlighting/awaitInSetPy36.py index abf4a72d1d74..110be9379ca5 100644 --- a/python/testData/highlighting/awaitInSetPy36.py +++ b/python/testData/highlighting/awaitInSetPy36.py @@ -1,5 +1,5 @@ async def f11(x): - y = {await for await in []} # fail + y = {await for await in []} # fail await x @@ -9,7 +9,7 @@ def f12(x): async def f21(x): - y = {mapper(await) for await in []} # fail + y = {mapper(await) for await in []} # fail await x @@ -19,8 +19,8 @@ def f22(x): async def f31(x): - await = [] # fail - y = {i for i in await} # fail + await = [] # fail + y = {i for i in await} # fail await x @@ -41,7 +41,7 @@ async def f42(x): async def f43(x): - y = {z for await z in []} # fail + y = {z for await z in []} # fail await x @@ -51,8 +51,8 @@ async def f44(x): async def f51(): - await = 5 # fail - return {await} # fail + await = 5 # fail + return {await} # fail def f52(): @@ -61,8 +61,8 @@ def f52(): async def f61(): - await = 5 # fail - return {"a", await, "b"} # fail + await = 5 # fail + return {"a", await, "b"} # fail def f62(): diff --git a/python/testData/highlighting/awaitInTuple.py b/python/testData/highlighting/awaitInTuple.py index a6cccb1b881b..006c6797d07f 100644 --- a/python/testData/highlighting/awaitInTuple.py +++ b/python/testData/highlighting/awaitInTuple.py @@ -1,6 +1,6 @@ async def f51(): - await = 5 # fail - return (await) # fail + await = 5 # fail + return (await) # fail def f52(): @@ -9,8 +9,8 @@ def f52(): async def f61(): - await = 5 # fail - return ("a", await, "b") # fail + await = 5 # fail + return ("a", await, "b") # fail def f62(): diff --git a/python/testData/highlighting/fStringBackslashes.py b/python/testData/highlighting/fStringBackslashes.py index 27bbb24fadf3..075062450b90 100644 --- a/python/testData/highlighting/fStringBackslashes.py +++ b/python/testData/highlighting/fStringBackslashes.py @@ -1,6 +1,6 @@ -f'{\t}' -f'{\t' -f'{\N{GREEK SMALL LETTER ALPHA}}' +f'{\t}' +f'{\t' +f'{\N{GREEK SMALL LETTER ALPHA}}' f'{Formatable():\n\t}' -f'{42:{\t}}' +f'{42:{\t}}' f'{f"""{"\n"}"""}' \ No newline at end of file diff --git a/python/testData/highlighting/fStringEmptyExpressions.py b/python/testData/highlighting/fStringEmptyExpressions.py index fb96337333a4..43d1449b15d0 100644 --- a/python/testData/highlighting/fStringEmptyExpressions.py +++ b/python/testData/highlighting/fStringEmptyExpressions.py @@ -1,10 +1,10 @@ -f'{}' -f'{' -f'{ -f'{!r}' -f'{:2.3}' -f'{42:2.{}}' -f'{ }' -f'{42:{ }}' -f'{ :{ ' -f'{ !r:{ :42}}' \ No newline at end of file +f'{}' +f'{' +f'{ +f'{!r}' +f'{:2.3}' +f'{42:2.{}}' +f'{ }' +f'{42:{ }}' +f'{ :{ ' +f'{ !r:{ :42}}' \ No newline at end of file diff --git a/python/testData/highlighting/fStringHashSigns.py b/python/testData/highlighting/fStringHashSigns.py index 9e0390f280bd..9d3fed7304e9 100644 --- a/python/testData/highlighting/fStringHashSigns.py +++ b/python/testData/highlighting/fStringHashSigns.py @@ -1,9 +1,9 @@ -f'{#' -f'{# -f'{#foo#}' +f'{#' +f'{# +f'{#foo#}' f'{42:#}' -f'{42:{#}}' -f'{x ### foo}' +f'{42:{#}}' +f'{x ### foo}' f'{"###"}' f'''{[ 42 # foo diff --git a/python/testData/highlighting/fStringIllegalConversionCharacter.py b/python/testData/highlighting/fStringIllegalConversionCharacter.py index 15690fa61fe6..1dd36facf5fe 100644 --- a/python/testData/highlighting/fStringIllegalConversionCharacter.py +++ b/python/testData/highlighting/fStringIllegalConversionCharacter.py @@ -5,5 +5,5 @@ f'{42!foo}' f'{42!}' f'{42!:2}' -f'{42!' -f'{42! +f'{42!' +f'{42! diff --git a/python/testData/highlighting/fStringMissingRightBrace.py b/python/testData/highlighting/fStringMissingRightBrace.py index 05d91061c124..6bd10dc83598 100644 --- a/python/testData/highlighting/fStringMissingRightBrace.py +++ b/python/testData/highlighting/fStringMissingRightBrace.py @@ -3,8 +3,8 @@ f'{42!r}' f'{42!r:03}' f'{42:03}' f'{42!r:{y}.{z}}' -f'{' -f'{42:{' -f'{42!r:{' +f'{' +f'{42:{' +f'{42!r:{' f'{{' -f'{{{' \ No newline at end of file +f'{{{' \ No newline at end of file diff --git a/python/testData/highlighting/fStringTooDeeplyNestedExpressionFragments.py b/python/testData/highlighting/fStringTooDeeplyNestedExpressionFragments.py index d12fd2f8e0d9..12647a271ffe 100644 --- a/python/testData/highlighting/fStringTooDeeplyNestedExpressionFragments.py +++ b/python/testData/highlighting/fStringTooDeeplyNestedExpressionFragments.py @@ -1,7 +1,7 @@ -f'{x:{y:{}}}' -f'{x:{y:{# foo}}}' +f'{x:{y:{}}}' +f'{x:{y:{# foo}}}' f'{x:{y:{z!z}}}' f'{x:{y:{z:{42}}}}' -f'{:{:{:{}}}}' -f'{x:{y:{z' -f'{x:{y:{z \ No newline at end of file +f'{:{:{:{}}}}' +f'{x:{y:{z' +f'{x:{y:{z \ No newline at end of file diff --git a/python/testData/inspections/InspectionsDisabledInFunctionTypeComments/test.py b/python/testData/inspections/InspectionsDisabledInFunctionTypeComments/test.py index 5653a7b215a6..c1255f9cad83 100644 --- a/python/testData/inspections/InspectionsDisabledInFunctionTypeComments/test.py +++ b/python/testData/inspections/InspectionsDisabledInFunctionTypeComments/test.py @@ -4,5 +4,5 @@ def g(): - # type: "foo" + # type: "foo" pass diff --git a/python/testData/inspections/PyTypeCheckerInspection/BadSubscriptExpression.py b/python/testData/inspections/PyTypeCheckerInspection/BadSubscriptExpression.py index c332be9f7d66..ac3850227608 100644 --- a/python/testData/inspections/PyTypeCheckerInspection/BadSubscriptExpression.py +++ b/python/testData/inspections/PyTypeCheckerInspection/BadSubscriptExpression.py @@ -1,4 +1,4 @@ def test(): x = r"""\x"" - r"""[\t\r\v]""" + r"""[\t\r\v]""" """ diff --git a/python/testData/inspections/PyTypeCheckerInspection/NullArgumentMappedToPositionalParameter.py b/python/testData/inspections/PyTypeCheckerInspection/NullArgumentMappedToPositionalParameter.py index 6c81f7eb5d5b..1d682d9d2328 100644 --- a/python/testData/inspections/PyTypeCheckerInspection/NullArgumentMappedToPositionalParameter.py +++ b/python/testData/inspections/PyTypeCheckerInspection/NullArgumentMappedToPositionalParameter.py @@ -3,4 +3,4 @@ class Kvas: pass -Kvas()[] \ No newline at end of file +Kvas()[] \ No newline at end of file diff --git a/python/testData/inspections/PyUnusedLocalInspection/unusedFunction.py b/python/testData/inspections/PyUnusedLocalInspection/unusedFunction.py index 9d820d43e7dd..07de29eadfec 100644 --- a/python/testData/inspections/PyUnusedLocalInspection/unusedFunction.py +++ b/python/testData/inspections/PyUnusedLocalInspection/unusedFunction.py @@ -40,6 +40,6 @@ def unused_inner_function_with_unknown_decorator(): pass def unused_inner_function_with_incomplete_decorator(): - @ + @ def func(): # pass pass diff --git a/python/testData/psi/Await.txt b/python/testData/psi/Await.txt index 931213f93258..9713c89e8667 100644 --- a/python/testData/psi/Await.txt +++ b/python/testData/psi/Await.txt @@ -35,7 +35,7 @@ PyFile:Await.py PsiWhiteSpace('\n ') PyStatementList PyAssignmentStatement - PsiErrorElement:can't assign to await expression + PsiErrorElement:Can't assign to await expression PsiElement(Py:AWAIT_KEYWORD)('await') PsiWhiteSpace(' ') PyTargetExpression: x diff --git a/python/testData/psi/CommaAfterStarArg.txt b/python/testData/psi/CommaAfterStarArg.txt index d38686ef72e1..095202a18ee7 100644 --- a/python/testData/psi/CommaAfterStarArg.txt +++ b/python/testData/psi/CommaAfterStarArg.txt @@ -9,7 +9,7 @@ PyFile:CommaAfterStarArg.py PsiElement(Py:MULT)('*') PsiElement(Py:IDENTIFIER)('args') PsiElement(Py:COMMA)(',') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:RPAR)(')') PsiElement(Py:COLON)(':') @@ -30,7 +30,7 @@ PyFile:CommaAfterStarArg.py PsiElement(Py:EXP)('**') PsiElement(Py:IDENTIFIER)('kwargs') PsiElement(Py:COMMA)(',') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:RPAR)(')') PsiElement(Py:COLON)(':') diff --git a/python/testData/psi/ComprehensionErrors.txt b/python/testData/psi/ComprehensionErrors.txt index f7b9daa48ad7..4194abafbfa1 100644 --- a/python/testData/psi/ComprehensionErrors.txt +++ b/python/testData/psi/ComprehensionErrors.txt @@ -2,17 +2,17 @@ PyFile:ComprehensionErrors.py PyExpressionStatement PyListCompExpression PsiElement(Py:LBRACKET)('[') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:FOR_KEYWORD)('for') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiWhiteSpace(' ') PsiElement(Py:IN_KEYWORD)('in') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiWhiteSpace(' ') PsiElement(Py:IF_KEYWORD)('if') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:RBRACKET)(']') \ No newline at end of file diff --git a/python/testData/psi/DictMissingValue.txt b/python/testData/psi/DictMissingValue.txt index 671b519a7d4a..c33515eea0f1 100644 --- a/python/testData/psi/DictMissingValue.txt +++ b/python/testData/psi/DictMissingValue.txt @@ -19,6 +19,6 @@ PyFile:DictMissingValue.py PyReferenceExpression: key2 PsiElement(Py:IDENTIFIER)('key2') PsiElement(Py:COLON)(':') - PsiErrorElement:value expression expected + PsiErrorElement:Value expression expected PsiElement(Py:RBRACE)('}') \ No newline at end of file diff --git a/python/testData/psi/EmptySubscription.txt b/python/testData/psi/EmptySubscription.txt index 8cdffcb9a216..967e814ff8fa 100644 --- a/python/testData/psi/EmptySubscription.txt +++ b/python/testData/psi/EmptySubscription.txt @@ -9,6 +9,6 @@ PyFile:EmptySubscription.py PyStringLiteralExpression: PsiElement(Py:SINGLE_QUOTED_STRING)('''') PsiElement(Py:LBRACKET)('[') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:RBRACKET)(']') \ No newline at end of file diff --git a/python/testData/psi/ErrorInParameterList.txt b/python/testData/psi/ErrorInParameterList.txt index 38b8ad524b53..089cf3b15de7 100644 --- a/python/testData/psi/ErrorInParameterList.txt +++ b/python/testData/psi/ErrorInParameterList.txt @@ -16,7 +16,7 @@ PyFile:ErrorInParameterList.py PsiElement(Py:IDENTIFIER)('None') PsiElement(Py:COMMA)(',') PsiWhiteSpace(' ') - PsiErrorElement:formal parameter name expected + PsiErrorElement:Formal parameter name expected PsiElement(Py:FROM_KEYWORD)('from') PsiElement(Py:EQ)('=') PsiElement(Py:SINGLE_QUOTED_STRING)('''') diff --git a/python/testData/psi/FStringBackslashAfterExpression.txt b/python/testData/psi/FStringBackslashAfterExpression.txt index 1001175e4f25..ba21947a7593 100644 --- a/python/testData/psi/FStringBackslashAfterExpression.txt +++ b/python/testData/psi/FStringBackslashAfterExpression.txt @@ -13,7 +13,7 @@ PyFile:FStringBackslashAfterExpression.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyNumericLiteralExpression PsiElement(Py:INTEGER_LITERAL)('42') - PsiErrorElement:unexpected expression part + PsiErrorElement:Unexpected expression part PsiElement(Py:BACKSLASH)(' \') PsiWhiteSpace(' ') PsiElement(Py:FSTRING_FRAGMENT_END)('}') diff --git a/python/testData/psi/FStringBackslashBeforeExpression.txt b/python/testData/psi/FStringBackslashBeforeExpression.txt index 045e6407112b..58bbb778dcaa 100644 --- a/python/testData/psi/FStringBackslashBeforeExpression.txt +++ b/python/testData/psi/FStringBackslashBeforeExpression.txt @@ -11,7 +11,7 @@ PyFile:FStringBackslashBeforeExpression.py PsiElement(Py:FSTRING_TEXT)('foo') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:BACKSLASH)('\') PsiWhiteSpace(' ') PsiElement(Py:INTEGER_LITERAL)('42') diff --git a/python/testData/psi/FStringBackslashInsteadOfExpression.txt b/python/testData/psi/FStringBackslashInsteadOfExpression.txt index f3c931c9ecae..7882bb81e76b 100644 --- a/python/testData/psi/FStringBackslashInsteadOfExpression.txt +++ b/python/testData/psi/FStringBackslashInsteadOfExpression.txt @@ -11,7 +11,7 @@ PyFile:FStringBackslashInsteadOfExpression.py PsiElement(Py:FSTRING_TEXT)('foo') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:BACKSLASH)('\') PsiElement(Py:FSTRING_FRAGMENT_END)('}') PsiElement(Py:FSTRING_TEXT)('bar') diff --git a/python/testData/psi/FStringDeeplyNestedEmptyFragments.txt b/python/testData/psi/FStringDeeplyNestedEmptyFragments.txt index 48128ae32daf..90695aea68f0 100644 --- a/python/testData/psi/FStringDeeplyNestedEmptyFragments.txt +++ b/python/testData/psi/FStringDeeplyNestedEmptyFragments.txt @@ -10,25 +10,25 @@ PyFile:FStringDeeplyNestedEmptyFragments.py PsiElement(Py:FSTRING_START)('f'') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PyFStringFragmentFormatPart PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PyFStringFragmentFormatPart PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PyFStringFragmentFormatPart PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:FSTRING_FRAGMENT_END)('}') PsiElement(Py:FSTRING_FRAGMENT_END)('}') diff --git a/python/testData/psi/FStringEscapedSlashBeforeClosingQuoteInFormatPart.txt b/python/testData/psi/FStringEscapedSlashBeforeClosingQuoteInFormatPart.txt index 57481b80c69f..d8a9d48e40a9 100644 --- a/python/testData/psi/FStringEscapedSlashBeforeClosingQuoteInFormatPart.txt +++ b/python/testData/psi/FStringEscapedSlashBeforeClosingQuoteInFormatPart.txt @@ -15,6 +15,6 @@ PyFile:FStringEscapedSlashBeforeClosingQuoteInFormatPart.py PyFStringFragmentFormatPart PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':') PsiElement(Py:FSTRING_TEXT)('\\') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') \ No newline at end of file diff --git a/python/testData/psi/FStringFragmentIncompleteTypeConversionBeforeClosingQuote.txt b/python/testData/psi/FStringFragmentIncompleteTypeConversionBeforeClosingQuote.txt index 0c3da00150c5..4bbf05b51c76 100644 --- a/python/testData/psi/FStringFragmentIncompleteTypeConversionBeforeClosingQuote.txt +++ b/python/testData/psi/FStringFragmentIncompleteTypeConversionBeforeClosingQuote.txt @@ -13,6 +13,6 @@ PyFile:FStringFragmentIncompleteTypeConversionBeforeClosingQuote.py PyNumericLiteralExpression PsiElement(Py:INTEGER_LITERAL)('42') PsiElement(Py:FSTRING_FRAGMENT_TYPE_CONVERSION)('!') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') \ No newline at end of file diff --git a/python/testData/psi/FStringIncompleteFragment.txt b/python/testData/psi/FStringIncompleteFragment.txt index 30cb442bba91..c9b0774bb8af 100644 --- a/python/testData/psi/FStringIncompleteFragment.txt +++ b/python/testData/psi/FStringIncompleteFragment.txt @@ -12,6 +12,6 @@ PyFile:FStringIncompleteFragment.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyNumericLiteralExpression PsiElement(Py:INTEGER_LITERAL)('42') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') \ No newline at end of file diff --git a/python/testData/psi/FStringIncompleteFragmentWithFormatPart.txt b/python/testData/psi/FStringIncompleteFragmentWithFormatPart.txt index 7728db86468f..9359dc4f459d 100644 --- a/python/testData/psi/FStringIncompleteFragmentWithFormatPart.txt +++ b/python/testData/psi/FStringIncompleteFragmentWithFormatPart.txt @@ -19,6 +19,6 @@ PyFile:FStringIncompleteFragmentWithFormatPart.py PyReferenceExpression: width PsiElement(Py:IDENTIFIER)('width') PsiElement(Py:FSTRING_FRAGMENT_END)('}') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)('"') \ No newline at end of file diff --git a/python/testData/psi/FStringIncompleteFragmentWithTypeConversion.txt b/python/testData/psi/FStringIncompleteFragmentWithTypeConversion.txt index aae1992ae04d..020507dd927a 100644 --- a/python/testData/psi/FStringIncompleteFragmentWithTypeConversion.txt +++ b/python/testData/psi/FStringIncompleteFragmentWithTypeConversion.txt @@ -13,6 +13,6 @@ PyFile:FStringIncompleteFragmentWithTypeConversion.py PyNumericLiteralExpression PsiElement(Py:INTEGER_LITERAL)('42') PsiElement(Py:FSTRING_FRAGMENT_TYPE_CONVERSION)('!r') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') \ No newline at end of file diff --git a/python/testData/psi/FStringIncompleteFragmentWithTypeConversionAndFormatPart.txt b/python/testData/psi/FStringIncompleteFragmentWithTypeConversionAndFormatPart.txt index 77a4c261ccec..d93cc6efb3fa 100644 --- a/python/testData/psi/FStringIncompleteFragmentWithTypeConversionAndFormatPart.txt +++ b/python/testData/psi/FStringIncompleteFragmentWithTypeConversionAndFormatPart.txt @@ -20,6 +20,6 @@ PyFile:FStringIncompleteFragmentWithTypeConversionAndFormatPart.py PyReferenceExpression: width PsiElement(Py:IDENTIFIER)('width') PsiElement(Py:FSTRING_FRAGMENT_END)('}') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') \ No newline at end of file diff --git a/python/testData/psi/FStringTerminatedByLineBreakInExpression.txt b/python/testData/psi/FStringTerminatedByLineBreakInExpression.txt index b829fb7330da..a123c79a32ee 100644 --- a/python/testData/psi/FStringTerminatedByLineBreakInExpression.txt +++ b/python/testData/psi/FStringTerminatedByLineBreakInExpression.txt @@ -15,7 +15,7 @@ PyFile:FStringTerminatedByLineBreakInExpression.py PsiElement(Py:INTEGER_LITERAL)('1') PsiWhiteSpace(' ') PsiElement(Py:PLUS)('+') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiErrorElement:' expected diff --git a/python/testData/psi/FStringTerminatedByLineBreakInExpressionInFormatPart.txt b/python/testData/psi/FStringTerminatedByLineBreakInExpressionInFormatPart.txt index 64d95df75947..b0e4d946c007 100644 --- a/python/testData/psi/FStringTerminatedByLineBreakInExpressionInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByLineBreakInExpressionInFormatPart.txt @@ -21,7 +21,7 @@ PyFile:FStringTerminatedByLineBreakInExpressionInFormatPart.py PsiElement(Py:INTEGER_LITERAL)('1') PsiWhiteSpace(' ') PsiElement(Py:PLUS)('+') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiErrorElement:' expected diff --git a/python/testData/psi/FStringTerminatedByLineBreakInFormatPart.txt b/python/testData/psi/FStringTerminatedByLineBreakInFormatPart.txt index d80071e7f63d..45bb79871b91 100644 --- a/python/testData/psi/FStringTerminatedByLineBreakInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByLineBreakInFormatPart.txt @@ -16,7 +16,7 @@ PyFile:FStringTerminatedByLineBreakInFormatPart.py PyFStringFragmentFormatPart PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':') PsiElement(Py:FSTRING_TEXT)('bar') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiErrorElement:' expected diff --git a/python/testData/psi/FStringTerminatedByLineBreakInNestedExpression.txt b/python/testData/psi/FStringTerminatedByLineBreakInNestedExpression.txt index 5447ab95f0b2..6c2495393c4b 100644 --- a/python/testData/psi/FStringTerminatedByLineBreakInNestedExpression.txt +++ b/python/testData/psi/FStringTerminatedByLineBreakInNestedExpression.txt @@ -20,7 +20,7 @@ PyFile:FStringTerminatedByLineBreakInNestedExpression.py PsiElement(Py:INTEGER_LITERAL)('1') PsiWhiteSpace(' ') PsiElement(Py:PLUS)('+') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiErrorElement:' expected diff --git a/python/testData/psi/FStringTerminatedByLineBreakInNestedExpressionInFormatPart.txt b/python/testData/psi/FStringTerminatedByLineBreakInNestedExpressionInFormatPart.txt index e19cc61d372d..122774b49752 100644 --- a/python/testData/psi/FStringTerminatedByLineBreakInNestedExpressionInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByLineBreakInNestedExpressionInFormatPart.txt @@ -26,7 +26,7 @@ PyFile:FStringTerminatedByLineBreakInNestedExpressionInFormatPart.py PsiElement(Py:INTEGER_LITERAL)('1') PsiWhiteSpace(' ') PsiElement(Py:PLUS)('+') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiErrorElement:' expected diff --git a/python/testData/psi/FStringTerminatedByLineBreakInNestedFormatPart.txt b/python/testData/psi/FStringTerminatedByLineBreakInNestedFormatPart.txt index fc0af9d7a0f0..9b51b48c0247 100644 --- a/python/testData/psi/FStringTerminatedByLineBreakInNestedFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByLineBreakInNestedFormatPart.txt @@ -21,7 +21,7 @@ PyFile:FStringTerminatedByLineBreakInNestedFormatPart.py PyFStringFragmentFormatPart PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':') PsiElement(Py:FSTRING_TEXT)('bar') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiErrorElement:' expected diff --git a/python/testData/psi/FStringTerminatedByLineBreakInNestedLiteralPart.txt b/python/testData/psi/FStringTerminatedByLineBreakInNestedLiteralPart.txt index e09a8813496e..b3e561b3d342 100644 --- a/python/testData/psi/FStringTerminatedByLineBreakInNestedLiteralPart.txt +++ b/python/testData/psi/FStringTerminatedByLineBreakInNestedLiteralPart.txt @@ -16,7 +16,7 @@ PyFile:FStringTerminatedByLineBreakInNestedLiteralPart.py PsiElement(Py:FSTRING_TEXT)('foo') PsiErrorElement:' expected - PsiErrorElement:type conversion, : or } expected + PsiErrorElement:Type conversion, ':' or '}' expected PsiErrorElement:" expected diff --git a/python/testData/psi/FStringTerminatedByLineBreakInStringLiteral.txt b/python/testData/psi/FStringTerminatedByLineBreakInStringLiteral.txt index 99bd74d725ac..fd30b907d736 100644 --- a/python/testData/psi/FStringTerminatedByLineBreakInStringLiteral.txt +++ b/python/testData/psi/FStringTerminatedByLineBreakInStringLiteral.txt @@ -12,7 +12,7 @@ PyFile:FStringTerminatedByLineBreakInStringLiteral.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyStringLiteralExpression: PsiElement(Py:TRIPLE_QUOTED_STRING)('"""') - PsiErrorElement:type conversion, : or } expected + PsiErrorElement:Type conversion, ':' or '}' expected PsiErrorElement:' expected diff --git a/python/testData/psi/FStringTerminatedByLineBreakInStringLiteralInFormatPart.txt b/python/testData/psi/FStringTerminatedByLineBreakInStringLiteralInFormatPart.txt index 0f0ed9d1d79f..838e035a6376 100644 --- a/python/testData/psi/FStringTerminatedByLineBreakInStringLiteralInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByLineBreakInStringLiteralInFormatPart.txt @@ -18,7 +18,7 @@ PyFile:FStringTerminatedByLineBreakInStringLiteralInFormatPart.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyStringLiteralExpression: PsiElement(Py:TRIPLE_QUOTED_STRING)('"""') - PsiErrorElement:type conversion, : or } expected + PsiErrorElement:Type conversion, ':' or '}' expected PsiErrorElement:' expected diff --git a/python/testData/psi/FStringTerminatedByQuoteInFormatPart.txt b/python/testData/psi/FStringTerminatedByQuoteInFormatPart.txt index a975a34213bb..86e023061f91 100644 --- a/python/testData/psi/FStringTerminatedByQuoteInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByQuoteInFormatPart.txt @@ -14,7 +14,7 @@ PyFile:FStringTerminatedByQuoteInFormatPart.py PsiElement(Py:INTEGER_LITERAL)('42') PyFStringFragmentFormatPart PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') PsiErrorElement:End of statement expected diff --git a/python/testData/psi/FStringTerminatedByQuoteInNestedFormatPart.txt b/python/testData/psi/FStringTerminatedByQuoteInNestedFormatPart.txt index 3f3ffbc09105..651cede03a11 100644 --- a/python/testData/psi/FStringTerminatedByQuoteInNestedFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByQuoteInNestedFormatPart.txt @@ -19,7 +19,7 @@ PyFile:FStringTerminatedByQuoteInNestedFormatPart.py PsiElement(Py:INTEGER_LITERAL)('42') PyFStringFragmentFormatPart PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiErrorElement:" expected diff --git a/python/testData/psi/FStringTerminatedByQuoteInNestedLiteralPart.txt b/python/testData/psi/FStringTerminatedByQuoteInNestedLiteralPart.txt index 9675ec2bd3e5..382cb53b306f 100644 --- a/python/testData/psi/FStringTerminatedByQuoteInNestedLiteralPart.txt +++ b/python/testData/psi/FStringTerminatedByQuoteInNestedLiteralPart.txt @@ -17,7 +17,7 @@ PyFile:FStringTerminatedByQuoteInNestedLiteralPart.py PsiElement(Py:FSTRING_TEXT)('baz') PsiErrorElement:" expected - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') PsiErrorElement:End of statement expected diff --git a/python/testData/psi/FStringTerminatedByQuoteInsideFStringLiteral.txt b/python/testData/psi/FStringTerminatedByQuoteInsideFStringLiteral.txt index bf884986177d..683276087197 100644 --- a/python/testData/psi/FStringTerminatedByQuoteInsideFStringLiteral.txt +++ b/python/testData/psi/FStringTerminatedByQuoteInsideFStringLiteral.txt @@ -16,7 +16,7 @@ PyFile:FStringTerminatedByQuoteInsideFStringLiteral.py PsiElement(Py:FSTRING_START)('f"') PsiErrorElement:" expected - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') PsiElement(Py:SINGLE_QUOTED_STRING)('"}baz'') \ No newline at end of file diff --git a/python/testData/psi/FStringTerminatedByQuoteInsideFStringLiteralInFormatPart.txt b/python/testData/psi/FStringTerminatedByQuoteInsideFStringLiteralInFormatPart.txt index cbb21b7f499c..204b6df8985b 100644 --- a/python/testData/psi/FStringTerminatedByQuoteInsideFStringLiteralInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByQuoteInsideFStringLiteralInFormatPart.txt @@ -21,7 +21,7 @@ PyFile:FStringTerminatedByQuoteInsideFStringLiteralInFormatPart.py PsiElement(Py:FSTRING_START)('f"') PsiErrorElement:" expected - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') PsiElement(Py:SINGLE_QUOTED_STRING)('"}}'') \ No newline at end of file diff --git a/python/testData/psi/FStringTerminatedByQuoteInsideNestedFStringLiteral.txt b/python/testData/psi/FStringTerminatedByQuoteInsideNestedFStringLiteral.txt index 37db2f2c21e2..fb4f93af1345 100644 --- a/python/testData/psi/FStringTerminatedByQuoteInsideNestedFStringLiteral.txt +++ b/python/testData/psi/FStringTerminatedByQuoteInsideNestedFStringLiteral.txt @@ -20,7 +20,7 @@ PyFile:FStringTerminatedByQuoteInsideNestedFStringLiteral.py PsiElement(Py:FSTRING_START)('f"') PsiErrorElement:" expected - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiErrorElement:""" expected diff --git a/python/testData/psi/FStringTerminatedByQuoteInsideNestedFStringLiteralInFormatPart.txt b/python/testData/psi/FStringTerminatedByQuoteInsideNestedFStringLiteralInFormatPart.txt index 743ec94e6c7e..de0aab8678f5 100644 --- a/python/testData/psi/FStringTerminatedByQuoteInsideNestedFStringLiteralInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByQuoteInsideNestedFStringLiteralInFormatPart.txt @@ -26,7 +26,7 @@ PyFile:FStringTerminatedByQuoteInsideNestedFStringLiteralInFormatPart.py PsiElement(Py:FSTRING_START)('f"') PsiErrorElement:" expected - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiErrorElement:""" expected diff --git a/python/testData/psi/FStringTerminatedByQuoteInsideNestedStringLiteral.txt b/python/testData/psi/FStringTerminatedByQuoteInsideNestedStringLiteral.txt index 097b5798a111..e548547b67da 100644 --- a/python/testData/psi/FStringTerminatedByQuoteInsideNestedStringLiteral.txt +++ b/python/testData/psi/FStringTerminatedByQuoteInsideNestedStringLiteral.txt @@ -17,7 +17,7 @@ PyFile:FStringTerminatedByQuoteInsideNestedStringLiteral.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyStringLiteralExpression: PsiElement(Py:SINGLE_QUOTED_STRING)('"') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiErrorElement:""" expected diff --git a/python/testData/psi/FStringTerminatedByQuoteInsideNestedStringLiteralInFormatPart.txt b/python/testData/psi/FStringTerminatedByQuoteInsideNestedStringLiteralInFormatPart.txt index 158e00596978..b5dfca23a383 100644 --- a/python/testData/psi/FStringTerminatedByQuoteInsideNestedStringLiteralInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByQuoteInsideNestedStringLiteralInFormatPart.txt @@ -23,7 +23,7 @@ PyFile:FStringTerminatedByQuoteInsideNestedStringLiteralInFormatPart.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyStringLiteralExpression: PsiElement(Py:SINGLE_QUOTED_STRING)('"') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiErrorElement:""" expected diff --git a/python/testData/psi/FStringTerminatedByQuoteInsideStringLiteral.txt b/python/testData/psi/FStringTerminatedByQuoteInsideStringLiteral.txt index 7fb645839a54..1d3ef5b161af 100644 --- a/python/testData/psi/FStringTerminatedByQuoteInsideStringLiteral.txt +++ b/python/testData/psi/FStringTerminatedByQuoteInsideStringLiteral.txt @@ -13,7 +13,7 @@ PyFile:FStringTerminatedByQuoteInsideStringLiteral.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyStringLiteralExpression: PsiElement(Py:SINGLE_QUOTED_STRING)('"') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') PsiElement(Py:SINGLE_QUOTED_STRING)('"}baz'') \ No newline at end of file diff --git a/python/testData/psi/FStringTerminatedByQuoteInsideStringLiteralInFormatPart.txt b/python/testData/psi/FStringTerminatedByQuoteInsideStringLiteralInFormatPart.txt index 3530a0992d28..11f89b8948e4 100644 --- a/python/testData/psi/FStringTerminatedByQuoteInsideStringLiteralInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByQuoteInsideStringLiteralInFormatPart.txt @@ -18,7 +18,7 @@ PyFile:FStringTerminatedByQuoteInsideStringLiteralInFormatPart.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyStringLiteralExpression: PsiElement(Py:SINGLE_QUOTED_STRING)('"') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') PsiElement(Py:SINGLE_QUOTED_STRING)('"}}'') \ No newline at end of file diff --git a/python/testData/psi/FStringTerminatedByQuoteOfFStringLiteral.txt b/python/testData/psi/FStringTerminatedByQuoteOfFStringLiteral.txt index 3a39b0205262..f70e1a90d208 100644 --- a/python/testData/psi/FStringTerminatedByQuoteOfFStringLiteral.txt +++ b/python/testData/psi/FStringTerminatedByQuoteOfFStringLiteral.txt @@ -13,7 +13,7 @@ PyFile:FStringTerminatedByQuoteOfFStringLiteral.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyReferenceExpression: f PsiElement(Py:IDENTIFIER)('f') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') PsiErrorElement:End of statement expected diff --git a/python/testData/psi/FStringTerminatedByQuoteOfFStringLiteralInFormatPart.txt b/python/testData/psi/FStringTerminatedByQuoteOfFStringLiteralInFormatPart.txt index aa25103ec809..ae88f4d8edbf 100644 --- a/python/testData/psi/FStringTerminatedByQuoteOfFStringLiteralInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByQuoteOfFStringLiteralInFormatPart.txt @@ -18,7 +18,7 @@ PyFile:FStringTerminatedByQuoteOfFStringLiteralInFormatPart.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyReferenceExpression: f PsiElement(Py:IDENTIFIER)('f') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') PsiErrorElement:End of statement expected diff --git a/python/testData/psi/FStringTerminatedByQuoteOfNestedFStringLiteral.txt b/python/testData/psi/FStringTerminatedByQuoteOfNestedFStringLiteral.txt index a65b59fc800f..19233ed7c379 100644 --- a/python/testData/psi/FStringTerminatedByQuoteOfNestedFStringLiteral.txt +++ b/python/testData/psi/FStringTerminatedByQuoteOfNestedFStringLiteral.txt @@ -17,7 +17,7 @@ PyFile:FStringTerminatedByQuoteOfNestedFStringLiteral.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyReferenceExpression: f PsiElement(Py:IDENTIFIER)('f') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiErrorElement:" expected diff --git a/python/testData/psi/FStringTerminatedByQuoteOfNestedFStringLiteralInFormatPart.txt b/python/testData/psi/FStringTerminatedByQuoteOfNestedFStringLiteralInFormatPart.txt index e5bee10dfd78..127c7b375298 100644 --- a/python/testData/psi/FStringTerminatedByQuoteOfNestedFStringLiteralInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByQuoteOfNestedFStringLiteralInFormatPart.txt @@ -23,7 +23,7 @@ PyFile:FStringTerminatedByQuoteOfNestedFStringLiteralInFormatPart.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyReferenceExpression: f PsiElement(Py:IDENTIFIER)('f') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiErrorElement:" expected diff --git a/python/testData/psi/FStringTerminatedByQuoteOfNestedStringLiteral.txt b/python/testData/psi/FStringTerminatedByQuoteOfNestedStringLiteral.txt index 02e2610e08cd..2a74814881de 100644 --- a/python/testData/psi/FStringTerminatedByQuoteOfNestedStringLiteral.txt +++ b/python/testData/psi/FStringTerminatedByQuoteOfNestedStringLiteral.txt @@ -15,9 +15,9 @@ PyFile:FStringTerminatedByQuoteOfNestedStringLiteral.py PsiElement(Py:FSTRING_START)('f"') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiErrorElement:" expected diff --git a/python/testData/psi/FStringTerminatedByQuoteOfNestedStringLiteralInFormatPart.txt b/python/testData/psi/FStringTerminatedByQuoteOfNestedStringLiteralInFormatPart.txt index d9687aac176c..2fe870bdae2d 100644 --- a/python/testData/psi/FStringTerminatedByQuoteOfNestedStringLiteralInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByQuoteOfNestedStringLiteralInFormatPart.txt @@ -21,9 +21,9 @@ PyFile:FStringTerminatedByQuoteOfNestedStringLiteralInFormatPart.py PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiErrorElement:" expected diff --git a/python/testData/psi/FStringTerminatedByQuoteOfStringLiteral.txt b/python/testData/psi/FStringTerminatedByQuoteOfStringLiteral.txt index 97debda75fbb..5e1fd681be94 100644 --- a/python/testData/psi/FStringTerminatedByQuoteOfStringLiteral.txt +++ b/python/testData/psi/FStringTerminatedByQuoteOfStringLiteral.txt @@ -11,9 +11,9 @@ PyFile:FStringTerminatedByQuoteOfStringLiteral.py PsiElement(Py:FSTRING_TEXT)('foo') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') PsiErrorElement:End of statement expected diff --git a/python/testData/psi/FStringTerminatedByQuoteOfStringLiteralInFormatPart.txt b/python/testData/psi/FStringTerminatedByQuoteOfStringLiteralInFormatPart.txt index 6747e8531b5f..272c6a4fa425 100644 --- a/python/testData/psi/FStringTerminatedByQuoteOfStringLiteralInFormatPart.txt +++ b/python/testData/psi/FStringTerminatedByQuoteOfStringLiteralInFormatPart.txt @@ -16,9 +16,9 @@ PyFile:FStringTerminatedByQuoteOfStringLiteralInFormatPart.py PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') PsiErrorElement:End of statement expected diff --git a/python/testData/psi/FStringTrailingWhitespaceInIncompleteFragmentInFormatPart.txt b/python/testData/psi/FStringTrailingWhitespaceInIncompleteFragmentInFormatPart.txt index ceabcc400ca4..9087400c35df 100644 --- a/python/testData/psi/FStringTrailingWhitespaceInIncompleteFragmentInFormatPart.txt +++ b/python/testData/psi/FStringTrailingWhitespaceInIncompleteFragmentInFormatPart.txt @@ -16,8 +16,8 @@ PyFile:FStringTrailingWhitespaceInIncompleteFragmentInFormatPart.py PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiWhiteSpace(' ') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''') \ No newline at end of file diff --git a/python/testData/psi/IncompleteDict.txt b/python/testData/psi/IncompleteDict.txt index cc2cdc5fdb20..252ef6a0d087 100644 --- a/python/testData/psi/IncompleteDict.txt +++ b/python/testData/psi/IncompleteDict.txt @@ -12,7 +12,7 @@ PyFile:IncompleteDict.py PyStringLiteralExpression: key PsiElement(Py:SINGLE_QUOTED_STRING)(''key'') PsiElement(Py:COLON)(':') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiWhiteSpace(' ') PsiElement(Py:RBRACE)('}') \ No newline at end of file diff --git a/python/testData/psi/InvalidAssignmentExpressions.txt b/python/testData/psi/InvalidAssignmentExpressions.txt index 652c2f77c0af..ac530e5e0c66 100644 --- a/python/testData/psi/InvalidAssignmentExpressions.txt +++ b/python/testData/psi/InvalidAssignmentExpressions.txt @@ -95,7 +95,7 @@ PyFile:InvalidAssignmentExpressions.py PsiWhiteSpace(' ') PyPrefixExpression PsiElement(Py:MINUS)('-') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:RPAR)(')') PsiWhiteSpace('\n') @@ -107,7 +107,7 @@ PyFile:InvalidAssignmentExpressions.py PsiElement(Py:IDENTIFIER)('x') PsiWhiteSpace(' ') PsiElement(Py:COLONEQ)(':=') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiWhiteSpace(' ') PsiElement(Py:RPAR)(')') diff --git a/python/testData/psi/KeywordAsDefaultParameterValue.txt b/python/testData/psi/KeywordAsDefaultParameterValue.txt index 2c0c3bb02689..deb051678b01 100644 --- a/python/testData/psi/KeywordAsDefaultParameterValue.txt +++ b/python/testData/psi/KeywordAsDefaultParameterValue.txt @@ -12,7 +12,7 @@ PyFile:KeywordAsDefaultParameterValue.py PyNamedParameter('fields') PsiElement(Py:IDENTIFIER)('fields') PsiElement(Py:EQ)('=') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:FROM_KEYWORD)('from') PsiElement(Py:RPAR)(')') PsiElement(Py:COLON)(':') diff --git a/python/testData/psi/KeywordAsNamedParameter.txt b/python/testData/psi/KeywordAsNamedParameter.txt index 51d4413bd2eb..e81b8a318785 100644 --- a/python/testData/psi/KeywordAsNamedParameter.txt +++ b/python/testData/psi/KeywordAsNamedParameter.txt @@ -5,7 +5,7 @@ PyFile:KeywordAsNamedParameter.py PsiElement(Py:IDENTIFIER)('f') PyParameterList PsiElement(Py:LPAR)('(') - PsiErrorElement:formal parameter name expected + PsiErrorElement:Formal parameter name expected PsiElement(Py:FROM_KEYWORD)('from') PsiElement(Py:EQ)('=') PsiElement(Py:INTEGER_LITERAL)('1') diff --git a/python/testData/psi/LoneStar.txt b/python/testData/psi/LoneStar.txt index 8dc1b17e3d36..3683ccade791 100644 --- a/python/testData/psi/LoneStar.txt +++ b/python/testData/psi/LoneStar.txt @@ -8,6 +8,6 @@ PyFile:LoneStar.py PyParenthesizedExpression PsiElement(Py:LPAR)('(') PsiElement(Py:MULT)('*') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:RPAR)(')') \ No newline at end of file diff --git a/python/testData/psi/MissingDefaultValue.txt b/python/testData/psi/MissingDefaultValue.txt index dc9533a942fe..17bd46c47598 100644 --- a/python/testData/psi/MissingDefaultValue.txt +++ b/python/testData/psi/MissingDefaultValue.txt @@ -8,7 +8,7 @@ PyFile:MissingDefaultValue.py PyNamedParameter('a') PsiElement(Py:IDENTIFIER)('a') PsiElement(Py:EQ)('=') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiElement(Py:RPAR)(')') PsiElement(Py:COLON)(':') diff --git a/python/testData/psi/MissingParenInCall.txt b/python/testData/psi/MissingParenInCall.txt index 649a59be768b..294783a30e73 100644 --- a/python/testData/psi/MissingParenInCall.txt +++ b/python/testData/psi/MissingParenInCall.txt @@ -24,7 +24,7 @@ PyFile:MissingParenInCall.py PsiElement(Py:DOT)('.') PsiElement(Py:IDENTIFIER)('instance') PsiElement(Py:COMMA)(',') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiWhiteSpace('\n\n') PyStatementList diff --git a/python/testData/psi/MultilineFStringContainsCommentInsteadOfExpression.txt b/python/testData/psi/MultilineFStringContainsCommentInsteadOfExpression.txt index 0757aeea17e4..7db2bccbe788 100644 --- a/python/testData/psi/MultilineFStringContainsCommentInsteadOfExpression.txt +++ b/python/testData/psi/MultilineFStringContainsCommentInsteadOfExpression.txt @@ -12,7 +12,7 @@ PyFile:MultilineFStringContainsCommentInsteadOfExpression.py PsiElement(Py:FSTRING_START)('f'''') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiWhiteSpace('\n ') PsiComment(Py:END_OF_LINE_COMMENT)('# comment') PsiWhiteSpace('\n') diff --git a/python/testData/psi/MultilineFStringTerminatedByQuotesInsideParenthesizedExpression.txt b/python/testData/psi/MultilineFStringTerminatedByQuotesInsideParenthesizedExpression.txt index 8b63eb327bd3..3881a8e41391 100644 --- a/python/testData/psi/MultilineFStringTerminatedByQuotesInsideParenthesizedExpression.txt +++ b/python/testData/psi/MultilineFStringTerminatedByQuotesInsideParenthesizedExpression.txt @@ -20,7 +20,7 @@ PyFile:MultilineFStringTerminatedByQuotesInsideParenthesizedExpression.py PyNamedParameter('x') PsiElement(Py:IDENTIFIER)('x') PsiElement(Py:COLON)(':') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiWhiteSpace(' ') PsiElement(Py:FSTRING_END)(''') diff --git a/python/testData/psi/MultilineFStringTerminatedByQuotesOfStringLiteral.txt b/python/testData/psi/MultilineFStringTerminatedByQuotesOfStringLiteral.txt index 00b5164fba7c..57ab02dbac00 100644 --- a/python/testData/psi/MultilineFStringTerminatedByQuotesOfStringLiteral.txt +++ b/python/testData/psi/MultilineFStringTerminatedByQuotesOfStringLiteral.txt @@ -12,9 +12,9 @@ PyFile:MultilineFStringTerminatedByQuotesOfStringLiteral.py PsiElement(Py:FSTRING_START)('f'''') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiWhiteSpace('\n ') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiElement(Py:FSTRING_END)(''''') PsiElement(Py:TRIPLE_QUOTED_STRING)(''''\n}'''') \ No newline at end of file diff --git a/python/testData/psi/RaiseFromNoExpr.txt b/python/testData/psi/RaiseFromNoExpr.txt index 9fe06bd5eb75..e13fd7c3052e 100644 --- a/python/testData/psi/RaiseFromNoExpr.txt +++ b/python/testData/psi/RaiseFromNoExpr.txt @@ -16,5 +16,5 @@ PyFile:RaiseFromNoExpr.py PsiElement(Py:IDENTIFIER)('AttributeError') PsiWhiteSpace(' ') PsiElement(Py:FROM_KEYWORD)('from') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected \ No newline at end of file diff --git a/python/testData/psi/SingleLineFStringContainsCommentInsideExpression.txt b/python/testData/psi/SingleLineFStringContainsCommentInsideExpression.txt index c814104e108c..1d6a2c919683 100644 --- a/python/testData/psi/SingleLineFStringContainsCommentInsideExpression.txt +++ b/python/testData/psi/SingleLineFStringContainsCommentInsideExpression.txt @@ -12,7 +12,7 @@ PyFile:SingleLineFStringContainsCommentInsideExpression.py PsiElement(Py:FSTRING_FRAGMENT_START)('{') PyNumericLiteralExpression PsiElement(Py:INTEGER_LITERAL)('42') - PsiErrorElement:type conversion, : or } expected + PsiErrorElement:Type conversion, ':' or '}' expected PsiWhiteSpace(' ') PsiComment(Py:END_OF_LINE_COMMENT)('# comment}'') diff --git a/python/testData/psi/SingleLineFStringContainsCommentInsteadOfExpression.txt b/python/testData/psi/SingleLineFStringContainsCommentInsteadOfExpression.txt index 5d6c8c935987..d6ebbb0995e2 100644 --- a/python/testData/psi/SingleLineFStringContainsCommentInsteadOfExpression.txt +++ b/python/testData/psi/SingleLineFStringContainsCommentInsteadOfExpression.txt @@ -10,9 +10,9 @@ PyFile:SingleLineFStringContainsCommentInsteadOfExpression.py PsiElement(Py:FSTRING_START)('f'') PyFStringFragment PsiElement(Py:FSTRING_FRAGMENT_START)('{') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiComment(Py:END_OF_LINE_COMMENT)('# comment}'') - PsiErrorElement:type conversion, : or } expected + PsiErrorElement:Type conversion, ':' or '}' expected PsiErrorElement:' expected \ No newline at end of file diff --git a/python/testData/psi/SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInExpression.txt b/python/testData/psi/SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInExpression.txt index f34976740209..dc0858fb1831 100644 --- a/python/testData/psi/SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInExpression.txt +++ b/python/testData/psi/SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInExpression.txt @@ -20,7 +20,7 @@ PyFile:SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInExpressio PsiElement(Py:INTEGER_LITERAL)('1') PsiWhiteSpace(' ') PsiElement(Py:PLUS)('+') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiErrorElement:' expected diff --git a/python/testData/psi/SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInExpressionInParentheses.txt b/python/testData/psi/SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInExpressionInParentheses.txt index a37ee8a2f6cb..4e81557a5db2 100644 --- a/python/testData/psi/SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInExpressionInParentheses.txt +++ b/python/testData/psi/SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInExpressionInParentheses.txt @@ -22,7 +22,7 @@ PyFile:SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInExpressio PsiElement(Py:INTEGER_LITERAL)('1') PsiWhiteSpace(' ') PsiElement(Py:PLUS)('+') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected PsiErrorElement:' expected diff --git a/python/testData/psi/SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInText.txt b/python/testData/psi/SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInText.txt index 2957ab61690d..9819d5ba468b 100644 --- a/python/testData/psi/SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInText.txt +++ b/python/testData/psi/SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInText.txt @@ -16,7 +16,7 @@ PyFile:SingleQuotedFStringInsideMultilineFStringTerminatedByLineBreakInText.py PsiElement(Py:FSTRING_TEXT)('foo') PsiErrorElement:' expected - PsiErrorElement:type conversion, : or } expected + PsiErrorElement:Type conversion, ':' or '}' expected PsiErrorElement:""" expected diff --git a/python/testData/psi/UnterminatedFStringWithTrailingBackslashInFormatPart.txt b/python/testData/psi/UnterminatedFStringWithTrailingBackslashInFormatPart.txt index 4d866f16b1a1..f5d48614969e 100644 --- a/python/testData/psi/UnterminatedFStringWithTrailingBackslashInFormatPart.txt +++ b/python/testData/psi/UnterminatedFStringWithTrailingBackslashInFormatPart.txt @@ -15,7 +15,7 @@ PyFile:UnterminatedFStringWithTrailingBackslashInFormatPart.py PyFStringFragmentFormatPart PsiElement(Py:FSTRING_FRAGMENT_FORMAT_START)(':') PsiElement(Py:FSTRING_TEXT)('\') - PsiErrorElement:} expected + PsiErrorElement:'}' expected PsiErrorElement:' expected \ No newline at end of file diff --git a/python/testData/psi/YieldFromNoExpr.txt b/python/testData/psi/YieldFromNoExpr.txt index 3f9ccbd28bb8..6898d13f4eeb 100644 --- a/python/testData/psi/YieldFromNoExpr.txt +++ b/python/testData/psi/YieldFromNoExpr.txt @@ -14,5 +14,5 @@ PyFile:YieldFromNoExpr.py PsiElement(Py:YIELD_KEYWORD)('yield') PsiWhiteSpace(' ') PsiElement(Py:FROM_KEYWORD)('from') - PsiErrorElement:expression expected + PsiErrorElement:Expression expected \ No newline at end of file