Try to better support quoted type hints

rewrite/rewrite/python/_parser_visitor.py

@@ -1534,35 +1534,19 @@ def visit_Starred(self, node):
 
 
     def visit_Subscript(self, node):
-        if isinstance(node.slice, (ast.Constant, ast.Slice)):
-            return j.ArrayAccess(
-                random_id(),
-                self.__whitespace(),
-                Markers.EMPTY,
-                self.__convert(node.value),
-                j.ArrayDimension(
-                    random_id(),
-                    self.__source_before('['),
-                    Markers.EMPTY,
-                    self.__pad_right(self.__convert(node.slice), self.__source_before(']'))
-                ),
-                self.__map_type(node)
-            )
-        else:
-            slices = node.slice.elts if isinstance(node.slice, ast.Tuple) else [node.slice]
-            return j.ParameterizedType(
+        return j.ArrayAccess(
+            random_id(),
+            self.__whitespace(),
+            Markers.EMPTY,
+            self.__convert(node.value),
+            j.ArrayDimension(
                 random_id(),
-                self.__whitespace(),
+                self.__source_before('['),
                 Markers.EMPTY,
-                self.__convert(node.value),
-                JContainer(
-                    self.__source_before('['),
-                    [self.__pad_list_element(self.__convert(s), last=i == len(slices) - 1, end_delim=']') for i, s in enumerate(slices)],
-                    Markers.EMPTY
-                ),
-                None,
-                None
-            )
+                self.__pad_right(self.__convert(node.slice), self.__source_before(']'))
+            ),
+            self.__map_type(node)
+        )
 
 
     def visit_Tuple(self, node):
@@ -1616,10 +1600,30 @@ def __convert_type_hint(self, node) -> Optional[TypeTree]:
                 self.__map_type(node),
                 None
             )
-        return self.__convert(node)
+        elif isinstance(node, ast.Subscript):
+            slices = node.slice.elts if isinstance(node.slice, ast.Tuple) else [node.slice]
+            return j.ParameterizedType(
+                random_id(),
+                self.__whitespace(),
+                Markers.EMPTY,
+                self.__convert(node.value),
+                JContainer(
+                    self.__source_before('['),
+                    [self.__pad_list_element(self.__convert_type_hint(s), last=i == len(slices) - 1, end_delim=']') for i, s in
+                     enumerate(slices)],
+                    Markers.EMPTY
+                ),
+                None,
+                None
+            )
+        return self.__convert_internal(node, self.__convert_type_hint)
 
 
     def __convert(self, node) -> Optional[J]:
+        return self.__convert_internal(node, self.__convert)
+
+
+    def __convert_internal(self, node, recursion) -> Optional[J]:
         if node:
             if isinstance(node, ast.expr) and not isinstance(node, (ast.Tuple, ast.GeneratorExp)):
                 save_cursor = self._cursor
@@ -1638,7 +1642,7 @@ def __convert(self, node) -> Optional[J]:
                         self.__pad_right(e.with_prefix(expr_prefix), r)
                     ), self._cursor))
                     # handle nested parens
-                    result = self.__convert(node)
+                    result = recursion(node)
                 else:
                     self._cursor = save_cursor
                     result = self.visit(cast(ast.AST, node))

rewrite/tests/python/all/array_test.py

@@ -1,5 +1,3 @@
-import pytest
-
 from rewrite.test import rewrite_run, python
 
 
@@ -43,13 +41,11 @@ def test_array_slice_full():
     rewrite_run(python("a = [1, 2][0:1:1]"))
 
 
-@pytest.mark.xfail(reason="Need to differentiate from parameterized types", strict=True)
 def test_array_slice_tuple_index_1():
     # language=python
     rewrite_run(python("a = [1, 2][0,1]"))
 
 
-@pytest.mark.xfail(reason="Need to differentiate from parameterized types", strict=True)
 def test_array_slice_tuple_index_2():
     # language=python
     rewrite_run(python("a = [1, 2][(0,1)]"))

rewrite/tests/python/all/type_hint_test.py

@@ -89,6 +89,11 @@ def test_variable_with_parameterized_type_hint():
     rewrite_run(python("""foo: Union[None, ...] = None"""))
 
 
+def test_variable_with_parameterized_type_hint_in_quotes():
+    # language=python
+    rewrite_run(python("""foo: Dict["Foo", str] = None"""))
+
+
 def test_variable_with_quoted_type_hint():
     # language=python
     rewrite_run(python("""foo: 'Foo' = None"""))