Merge pull request #29 from openrewrite/release-fixes-04

fix ws and float literals
openrewrite · Mar 21, 2023 · 7ac360d · 7ac360d
2 parents cc64895 + 65c8ce8
commit 7ac360d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/src/main/java/org/openrewrite/python/internal/PsiPythonMapper.java b/src/main/java/org/openrewrite/python/internal/PsiPythonMapper.java
@@ -1363,21 +1363,16 @@ public <T extends PsiElement> J.Block mapBlock(
         PsiPaddingCursor paddingCursor = outerCtx.paddingCursor;
         List<JRightPadded<Statement>> statements = new ArrayList<>(pyStatements.size());
 
+        @Nullable Space blockPrefix;
+        BlockContext innerCtx;
+
         if (colonToken != null) {
+            blockPrefix = paddingCursor.consumeUntilNewlineOrRollback();;
+            if (blockPrefix == null) {
+                blockPrefix = Space.EMPTY;
+            }
             paddingCursor.resetToSpaceAfter(colonToken);
-        }
-
-        @Nullable Space blockPrefix = paddingCursor.consumeUntilNewlineOrRollback();
-        if (colonToken == null) {
-            blockPrefix = paddingCursor.consumeRemaining();
-        }
 
-        BlockContext innerCtx;
-
-        if (blockPrefix == null) {
-            blockPrefix = Space.EMPTY;
-            innerCtx = new BlockContext("", true, paddingCursor);
-        } else {
             Space firstPrefix = paddingCursor.withRollback(paddingCursor::consumeRemaining);
             final String containerIndent = outerCtx.fullIndent;
             final String fullIndent = firstPrefix.getIndent();
@@ -1392,6 +1387,9 @@ public <T extends PsiElement> J.Block mapBlock(
             blockPrefix = appendWhitespace(blockPrefix, "\n" + blockIndent);
 
             innerCtx = new BlockContext(fullIndent, false, paddingCursor);
+        } else {
+            blockPrefix = appendWhitespace(paddingCursor.consumeRemaining(), "\n");
+            innerCtx = new BlockContext("", true, paddingCursor);
         }
 
         boolean precededBySemicolon = false;
@@ -2492,7 +2490,9 @@ public J.Literal mapNumericLiteral(PyNumericLiteralExpression element) {
                 randomId(),
                 spaceBefore(element),
                 EMPTY,
-                element.getLongValue(),
+                element.isIntegerLiteral()
+                        ? element.getLongValue()
+                        : element.getBigDecimalValue(),
                 element.getText(),
                 emptyList(),
                 JavaType.Primitive.Long

diff --git a/src/test/java/org/openrewrite/python/tree/LiteralTest.java b/src/test/java/org/openrewrite/python/tree/LiteralTest.java
@@ -27,7 +27,8 @@ class LiteralTest implements RewriteTest {
     @ParameterizedTest
     //language=py
     @ValueSource(strings = {
-      "None", "True", "False", "42.2", "42", "\"hello world\"",
+      "None", "True", "False", "42.2", "42", "123456789.123456789E123456789",
+      "\"hello world\"",
       "\"hello \\\"world\\\"\"", "'hello world'",
       "'hello \\'world\\''"
     })

diff --git a/src/test/java/org/openrewrite/python/tree/ReindentationTest.java b/src/test/java/org/openrewrite/python/tree/ReindentationTest.java
@@ -96,6 +96,7 @@ def f():
                 
                 def g():
                     pass
+            
             @decorator
             @anotherdec
             def f():

diff --git a/src/test/java/org/openrewrite/python/tree/WhitespaceTest.java b/src/test/java/org/openrewrite/python/tree/WhitespaceTest.java
@@ -15,6 +15,7 @@
  */
 package org.openrewrite.python.tree;
 
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.openrewrite.test.RewriteTest;
@@ -23,6 +24,17 @@
 
 class WhitespaceTest implements RewriteTest {
 
+    @Test
+    void hashbang() {
+        rewriteRun(python(
+          """
+            #!/usr/bin/env python3.6
+            
+            print(42)
+            """
+        ));
+    }
+
     @ParameterizedTest
     @ValueSource(strings = {
       "",