From 08fc28f6826bab7189d1e588cc216eb827f1c3aa Mon Sep 17 00:00:00 2001 From: Lada Gagina Date: Sun, 4 Sep 2016 21:25:48 +0300 Subject: [PATCH] PY-20610 Fix function annotation highlighting Fix PyTypeCheckerInspection so it doesn't highlight arrow in python 3 type annotations. --- .../jetbrains/python/inspections/PyTypeCheckerInspection.java | 2 +- .../PyTypeCheckerInspection/FunctionReturnTypePy3.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/src/com/jetbrains/python/inspections/PyTypeCheckerInspection.java b/python/src/com/jetbrains/python/inspections/PyTypeCheckerInspection.java index 4908b5db0c18..4fd6dbc3c440 100644 --- a/python/src/com/jetbrains/python/inspections/PyTypeCheckerInspection.java +++ b/python/src/com/jetbrains/python/inspections/PyTypeCheckerInspection.java @@ -126,7 +126,7 @@ public class PyTypeCheckerInspection extends PyInspection { final PyType expected = myTypeEvalContext.getReturnType(node); final String expectedName = PythonDocumentationProvider.getTypeName(expected, myTypeEvalContext); if (expected != null && !(expected instanceof PyNoneType)) { - registerProblem(annotation != null ? annotation : node.getTypeComment(), + registerProblem(annotation != null ? annotation.getValue() : node.getTypeComment(), String.format("Expected to return '%s', got no return", expectedName)); } } diff --git a/python/testData/inspections/PyTypeCheckerInspection/FunctionReturnTypePy3.py b/python/testData/inspections/PyTypeCheckerInspection/FunctionReturnTypePy3.py index a008ae0ea8be..57da61172fc1 100644 --- a/python/testData/inspections/PyTypeCheckerInspection/FunctionReturnTypePy3.py +++ b/python/testData/inspections/PyTypeCheckerInspection/FunctionReturnTypePy3.py @@ -36,7 +36,7 @@ def h(x) -> int: def i() -> Union[int, str]: pass -def j(x) -> Union[int, str]: +def j(x) -> Union[int, str]: x = 42 def k() -> None: