Merge pull request #49 from benber86/fix/neg_sign

Fix spacing error with unitary operator spacing before signed number

src/mamushi/formatting/whitespace.py

@@ -24,7 +24,6 @@ def whitespace(leaf: Leaf) -> str:
     DOUBLESPACE: Final = "  "
     t = leaf.type
     p = leaf.parent
-    v = leaf.value
 
     if t in ALWAYS_NO_SPACE:
         return NO
@@ -123,7 +122,7 @@ def whitespace(leaf: Leaf) -> str:
         # decorators
         return NO
 
-    elif v.isnumeric() and p.type in tokens.UNARY:
+    elif t in tokens.NUMBERS and p.type in tokens.UNARY:
         # no space for signed numbers
         return NO
 

src/mamushi/parsing/tokens.py

@@ -9,11 +9,12 @@
 NAME = "NAME"
 RBRACE = "RBRACE"
 LBRACE = "LBRACE"
+FLOAT_NUMBER = "FLOAT_NUMBER"
 DEC_NUMBER = "DEC_NUMBER"
 HEX_NUMBER = "HEX_NUMBER"
 BIN_NUMBER = "BIN_NUMBER"
 OCT_NUMBER = "OCT_NUMBER"
-NUMBERS = {DEC_NUMBER, HEX_NUMBER, BIN_NUMBER, OCT_NUMBER}
+NUMBERS = {DEC_NUMBER, FLOAT_NUMBER, HEX_NUMBER, BIN_NUMBER, OCT_NUMBER}
 AT = "AT"
 BRACKET_MAP = {LPAR: RPAR, LSQB: RSQB, LBRACE: RBRACE}
 OPENING_BRACKETS = set(BRACKET_MAP.keys())

tests/data/assignments/operator_negative_numbers_spacing.vy

@@ -0,0 +1,15 @@
+@external
+def foo(x: int256) -> int256:
+    if x <= -  41_446_531_673_892_822_313:
+        return empty(int256)
+    a: int256 = x + (  - 123)
+    b: int256 = 100 * - 2
+    return a * - b * -convert(1e-8, int256)
+# output
+@external
+def foo(x: int256) -> int256:
+    if x <= -41_446_531_673_892_822_313:
+        return empty(int256)
+    a: int256 = x + (-123)
+    b: int256 = 100 * -2
+    return a * -b * -convert(1e-8, int256)