Change end of line and column to be same as start of node

python · mschoettle · Mar 9, 2024 · Mar 9, 2024 · May 6, 2024 · May 6, 2024
commit c780ac1e8766ed84b665efe59aa530a11a9dcccd
diff --git a/mypy/checker.py b/mypy/checker.py
@@ -1493,6 +1493,9 @@ def is_unannotated_any(t: Type) -> bool:
         show_untyped = not self.is_typeshed_stub or self.options.warn_incomplete_stub
         check_incomplete_defs = self.options.disallow_incomplete_defs and has_explicit_annotation
         if show_untyped and (self.options.disallow_untyped_defs or check_incomplete_defs):
+            # TODO: changing end line and column here changes this information for the node itself
+            # fdef.end_line = fdef.line
+            # fdef.end_column = fdef.column + 1
             if fdef.type is None and self.options.disallow_untyped_defs:
                 if not fdef.arguments or (
                     len(fdef.arguments) == 1

diff --git a/mypy/messages.py b/mypy/messages.py
@@ -256,16 +256,28 @@ def span_from_context(ctx: Context) -> Iterable[int]:
             assert origen_span is not None
             origen_span = itertools.chain(origen_span, span_from_context(secondary_context))
 
+        column = context.column if context else -1
+        end_line = context.end_line if context else -1
+        end_column = context.end_column if context else -1
+
+        # set end line and column to same as start of context for function definitions
+        # this avoids errors being reported in IDEs for the whole function
+        # TODO: figure out if it's possible to find the end of the function definition line
+        if isinstance(context, FuncDef):
+            end_line = context.line
+            # column is 1-based, see also format_messages in errors.py
+            end_column = column + 1
+
         self.errors.report(
             context.line if context else -1,
-            context.column if context else -1,
+            column,
             msg,
             severity=severity,
             file=file,
             offset=offset,
             origen_span=origen_span,
-            end_line=context.end_line if context else -1,
-            end_column=context.end_column if context else -1,
+            end_line=end_line,
+            end_column=end_column,
             code=code,
             allow_dups=allow_dups,
         )

diff --git a/test-data/unit/check-columns.test b/test-data/unit/check-columns.test
@@ -187,8 +187,8 @@ if int():
     def g(x):
         pass
 [out]
-main:3:5:3:15: error: Function is missing a return type annotation
-main:6:5:6:10: error: Function is missing a type annotation
+main:3:5:3:5: error: Function is missing a return type annotation
+main:6:5:6:5: error: Function is missing a type annotation
 
 [case testColumnNameIsNotDefined]
 ((x)) # E:3: Name "x" is not defined