Better context completions for finally/except/else/elif

Fixes #837

test/completion/completion.py

@@ -24,3 +24,27 @@ class MyClass:
 tuple,
           ):
         return 1
+
+
+if x:
+    pass
+#? ['else']
+else
+
+try:
+    pass
+#? ['except', 'Exception']
+except
+
+try:
+    pass
+#? 6 ['except', 'Exception']
+except AttributeError:
+    pass
+#? ['finally']
+finally
+
+for x in y:
+    pass
+#? ['else']
+else

test/test_api/test_completion.py

@@ -38,3 +38,12 @@ def test_indent_context():
     code = 'if 1:\nisinstanc'
     comp, = Script(code).completions()
     assert comp.name == 'isinstance'
+
+
+def test_keyword_context():
+    def get_names(*args, **kwargs):
+        return [d.name for d in Script(*args, **kwargs).completions()]
+
+    names = get_names('if 1:\n pass\n')
+    assert 'if' in names
+    assert 'elif' in names