Fix post-merge

Author: JelleZijlstra

pyi.py

@@ -3,7 +3,6 @@
 
 import argparse
 import ast
-import contextlib
 import logging
 import re
 import sys
@@ -1016,8 +1015,6 @@ def __init__(self, filename: str) -> None:
         self.string_literals_allowed = NestingCounter()
         self.long_strings_allowed = NestingCounter()
         self.in_function = NestingCounter()
-        self.in_class = NestingCounter()
-        self.in_protocol = NestingCounter()
         self.visiting_arg = NestingCounter()
         self.Y061_suppressed = NestingCounter()
 
@@ -1744,8 +1741,8 @@ def visit_ClassDef(self, node: ast.ClassDef) -> None:
 
         self.generic_visit(node)
         self._check_class_bases(node.bases)
-        self.check_class_pass_and_ellipsis(node)
         self.enclosing_class_ctx = old_context
+        self.check_class_pass_and_ellipsis(node)
 
     def check_class_pass_and_ellipsis(self, node: ast.ClassDef) -> None:
         # empty class body should contain "..." not "pass"
@@ -2126,7 +2123,7 @@ def check_self_typevars(self, node: ast.FunctionDef | ast.AsyncFunctionDef) -> N
                 return_annotation=return_annotation,
             )
 
-    def check_arg_kinds(self, node: ast.FunctionDef | ast.AsyncFunctionDef) -> None:
+    def check_protocol_param_kinds(self, node: ast.FunctionDef | ast.AsyncFunctionDef) -> None:
         for pos_or_kw in node.args.args[1:]:  # exclude "self"
             if pos_or_kw.arg.startswith("__"):
                 continue
@@ -2187,8 +2184,8 @@ def _visit_function(self, node: ast.FunctionDef | ast.AsyncFunctionDef) -> None:
         self._check_pep570_syntax_used_where_applicable(node)
         if self.enclosing_class_ctx is not None:
             self.check_self_typevars(node)
-            if self.in_protocol.active:
-                self.check_arg_kinds(node)
+            if self.enclosing_class_ctx.is_protocol_class:
+                self.check_protocol_param_kinds(node)
 
     def visit_arg(self, node: ast.arg) -> None:
         if _is_NoReturn(node.annotation):

tests/protocol_arg.pyi

@@ -1,9 +1,9 @@
 from typing import Protocol
 
 class P(Protocol):
-    def method1(self, arg: int) -> None: ...  # Y062 Argument "arg" to protocol method "method1" should not be positional-or-keyword (suggestion: make it positional-only)
+    def method1(self, arg: int) -> None: ...  # Y067 Argument "arg" to protocol method "method1" should probably not be positional-or-keyword. Make it positional-only, since usually you don't want to mandate a specific argument name
     def method2(self, arg: str, /) -> None: ...
     def method3(self, *, arg: str) -> None: ...
-    def method4(self, __arg: int) -> None: ...
-    def method5(self, __arg: int, *, foo: str) -> None: ...
+    def method4(self, arg: int, /) -> None: ...
+    def method5(self, arg: int, /, *, foo: str) -> None: ...
     def method6(self, arg, /, *, foo: str) -> None: ...