omdev 0.0.0.dev124__py3-none-any.whl → 0.0.0.dev126__py3-none-any.whl

omdev/amalg/amalg.py

@@ -222,22 +222,30 @@ class Typing:
     toks: Tokens = dc.field(repr=False)
 
 
-def _is_typing(lts: Tokens) -> bool:
+def _is_typing(
+        lts: Tokens,
+        *,
+        exclude_newtypes: bool = False,
+) -> bool:
     es = tks.join_toks(lts).strip()
     if any(es.endswith(sfx) for sfx in (TYPE_ALIAS_COMMENT, NOQA_TYPE_ALIAS_COMMENT)):
         return True
 
     wts = list(tks.ignore_ws(lts))
-    if (
+    if not (
             len(wts) >= 5 and
             wts[0].name == 'NAME' and
             wts[1].name == 'OP' and wts[1].src == '=' and
             wts[2].name == 'NAME' and wts[2].src == 'ta' and
             wts[3].name == 'OP' and wts[3].src == '.'
     ):
-        return True
+        return False
+
+    if exclude_newtypes:
+        if wts[4].name == 'NAME' and wts[4].src == 'NewType':
+            return False
 
-    return False
+    return True
 
 
 def make_typing(
@@ -248,7 +256,7 @@ def make_typing(
     if not lts or lts[0].name == 'UNIMPORTANT_WS':
         return None
 
-    if not _is_typing(lts):
+    if not _is_typing(lts, exclude_newtypes=True):
         return None
 
     ft = next(iter(tks.ignore_ws(lts)))

omdev/tokens.py

@@ -16,7 +16,13 @@ Tokens: ta.TypeAlias = ta.Sequence['trt.Token']
 ##
 
 
-WS_NAMES = ('UNIMPORTANT_WS', 'NEWLINE', 'COMMENT')
+WS_NAMES = (
+    'UNIMPORTANT_WS',
+    'NEWLINE',
+    'COMMENT',
+    'INDENT',
+    'DEDENT',
+)
 
 
 def is_ws(tok: 'trt.Token') -> bool:

{omdev-0.0.0.dev124.dist-info → omdev-0.0.0.dev126.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev124
+Version: 0.0.0.dev126
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev124
+Requires-Dist: omlish==0.0.0.dev126
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev124.dist-info → omdev-0.0.0.dev126.dist-info}/RECORD

@@ -10,11 +10,11 @@ omdev/imgur.py,sha256=il12R3t19tALolteYCZywvcdQUEOcgvPyUYgWtKiqt4,2993
 omdev/pip.py,sha256=7cZ_IOpekQvgPm_gKnX3Pr8xjqUid50PPScTlZCYVlM,2118
 omdev/revisions.py,sha256=U657hf4zeEN32y3g4CzqCAodx_HlfkHj2cIIKALNFDo,5009
 omdev/secrets.py,sha256=bcquaBIDKqX4UIKOzUuKrX7nxVCenj67rRHIMIrd9bk,540
-omdev/tokens.py,sha256=GusxQ1Cd_eiScuR8XTTtc9QFhOgYviYGBZmFnn3Hj7s,756
+omdev/tokens.py,sha256=Y-w-UdeWjHrVoP90-MZ_5KsNuwgC59AzEb8xfUPZVag,799
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=h94M-VqZ3AFBU2a8zOsjeKK7RF6uINhTHl6OiGbVMgw,163
-omdev/amalg/amalg.py,sha256=XX8StwuGTZYwd0HtxGRLNIAap0b1LVfxm4OqJJSPs5Y,15212
+omdev/amalg/amalg.py,sha256=Tyz7ZIc3IL0902ySNsNBFvZ5SAGwi3qEX7xk1RPQejM,15414
 omdev/antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/antlr/consts.py,sha256=8pR6r0m0P3hAiyiAoJZ-nptd2GYbZ98mxwPL9cpaRuw,279
 omdev/antlr/gen.py,sha256=QnPyVWUrJYqHoOc3XsXA8fJdoiwAj6pyUwdG-DVrIeA,2953
@@ -143,9 +143,9 @@ omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev124.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev124.dist-info/METADATA,sha256=Yond7TTkP1zjPWdojBH9KK5XK63UAumCO5zTeKuNrxY,1760
-omdev-0.0.0.dev124.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omdev-0.0.0.dev124.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev124.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev124.dist-info/RECORD,,
+omdev-0.0.0.dev126.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev126.dist-info/METADATA,sha256=qOJQgdik2Zbr-4frJTkKAalJC-_qE4n7yoGuigNCiAI,1760
+omdev-0.0.0.dev126.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omdev-0.0.0.dev126.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev126.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev126.dist-info/RECORD,,