Small typing and variables cleanup

pixee · Nov 9, 2023 · e604a21 · e604a21
1 parent bf49fef
commit e604a21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/src/codemodder/codemods/utils.py b/src/codemodder/codemods/utils.py
@@ -76,13 +76,7 @@ def __init__(
         self,
         replacements: dict[
             cst.CSTNode,
-            dict[
-                str,
-                cst.CSTNode
-                | cst.FlattenSentinel
-                | cst.RemovalSentinel
-                | dict[str, Any],
-            ],
+            cst.CSTNode | cst.FlattenSentinel | cst.RemovalSentinel | dict[str, Any],
         ],
     ):
         self.replacements = replacements

diff --git a/src/core_codemods/sql_parameterization.py b/src/core_codemods/sql_parameterization.py
@@ -1,5 +1,5 @@
 import re
-from typing import Optional, Tuple
+from typing import Any, Optional, Tuple
 import itertools
 import libcst as cst
 from libcst import FormattedString, SimpleWhitespace, ensure_type, matchers
@@ -38,10 +38,6 @@
 
 parameter_token = "?"
 
-literal_number = matchers.Integer() | matchers.Float() | matchers.Imaginary()
-literal_string = matchers.SimpleString()
-literal = literal_number | literal_string
-
 quote_pattern = re.compile(r"(?<!\\)\\'|(?<!\\)'")
 raw_quote_pattern = re.compile(r"(?<!\\)'")
 
@@ -78,7 +74,8 @@ def __init__(
         *codemod_args,
     ) -> None:
         self.changed_nodes: dict[
-            cst.CSTNode, cst.CSTNode | cst.RemovalSentinel | cst.FlattenSentinel
+            cst.CSTNode,
+            cst.CSTNode | cst.RemovalSentinel | cst.FlattenSentinel | dict[str, Any],
         ] = {}
         BaseCodemod.__init__(self, file_context, *codemod_args)
         UtilsMixin.__init__(self, [])
@@ -237,7 +234,7 @@ def _fix_injection(
 
         new_raw_value = raw_value[quote_span.end() :]
         append_raw_value = raw_value[: quote_span.start()]
-        match end:
+        match current_end:
             case cst.SimpleString():
                 # gather string up to quote to parameter
                 if append_raw_value: