Merge pull request #640 from eddieantonio/fix-variable-annotations

Fix variable annotations

2 files changed, 23 insertions, 2 deletions

diff --git a/pycodestyle.py b/pycodestyle.py
index 8afa286..5b7a39c 100755
--- a/pycodestyle.py
+++ b/pycodestyle.py
@@ -132,10 +132,10 @@ KEYWORD_REGEX = re.compile(r'(\s*)\b(?:%s)\b(\s*)' % r'|'.join(KEYWORDS))
 OPERATOR_REGEX = re.compile(r'(?:[^,\s])(\s*)(?:[-+*/|!<=>%&^]+)(\s*)')
 LAMBDA_REGEX = re.compile(r'\blambda\b')
 HUNK_REGEX = re.compile(r'^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@.*$')
-STARTSWITH_DEF_REGEX = re.compile(r'^(async\s+def|def)')
+STARTSWITH_DEF_REGEX = re.compile(r'^(async\s+def|def)\b')
 STARTSWITH_TOP_LEVEL_REGEX = re.compile(r'^(async\s+def\s+|def\s+|class\s+|@)')
 STARTSWITH_INDENT_STATEMENT_REGEX = re.compile(
-    r'^\s*({0})'.format('|'.join(s.replace(' ', r'\s+') for s in (
+    r'^\s*({0})\b'.format('|'.join(s.replace(' ', r'\s+') for s in (
         'def', 'async def',
         'for', 'async for',
         'if', 'elif', 'else',
diff --git a/testsuite/python3.py b/testsuite/python3.py
index fde4281..be7c58f 100644
--- a/testsuite/python3.py
+++ b/testsuite/python3.py
@@ -12,7 +12,28 @@ CONST: int = 42
 
 
 class Class:
+    # Camel-caes
     cls_var: ClassVar[str]
+    for_var: ClassVar[str]
+    while_var: ClassVar[str]
+    def_var: ClassVar[str]
+    if_var: ClassVar[str]
+    elif_var: ClassVar[str]
+    else_var: ClassVar[str]
+    try_var: ClassVar[str]
+    except_var: ClassVar[str]
+    finally_var: ClassVar[str]
+    with_var: ClassVar[str]
+    forVar: ClassVar[str]
+    whileVar: ClassVar[str]
+    defVar: ClassVar[str]
+    ifVar: ClassVar[str]
+    elifVar: ClassVar[str]
+    elseVar: ClassVar[str]
+    tryVar: ClassVar[str]
+    exceptVar: ClassVar[str]
+    finallyVar: ClassVar[str]
+    withVar: ClassVar[str]
 
     def m(self):
         xs: List[int] = []