Added NameStyles from Parser to Py.CU.

openrewrite · Jul 11, 2023 · 5149579 · 5149579
1 parent f487df7
commit 5149579
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/org/openrewrite/python/PythonParser.java b/src/main/java/org/openrewrite/python/PythonParser.java
@@ -33,14 +33,15 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.stream.Stream;
 
 @SuppressWarnings("unused")
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public class PythonParser implements Parser {
     private final LanguageLevel languageLevel;
-    private final List<NamedStyles> styles;
+    private final Collection<NamedStyles> styles;
     private final boolean logCompilationWarningsAndErrors;
     private final JavaTypeCache typeCache;
     @Override
@@ -71,7 +72,7 @@ public Stream<SourceFile> parseInputs(Iterable<Input> inputs, @Nullable Path rel
         return acceptedInputs(inputs).map(sourceFile -> {
             Path path = sourceFile.getRelativePath(relativeTo);
             try (EncodingDetectingInputStream is = sourceFile.getSource(ctx)) {
-                Py.CompilationUnit py = new PsiPythonMapper(path, is.getCharset(), is.isCharsetBomMarked(), mapLanguageLevel(languageLevel))
+                Py.CompilationUnit py = new PsiPythonMapper(path, is.getCharset(), is.isCharsetBomMarked(), styles, mapLanguageLevel(languageLevel))
                         .mapSource(is.readFully());
                 parsingListener.parsed(sourceFile, py);
                 return py;
@@ -189,7 +190,7 @@ public static class Builder extends Parser.Builder {
         private LanguageLevel languageLevel = LanguageLevel.PYTHON_312;
         private JavaTypeCache typeCache = new JavaTypeCache();
         private boolean logCompilationWarningsAndErrors;
-        private final List<NamedStyles> styles = new ArrayList<>();
+        private final Collection<NamedStyles> styles = new ArrayList<>();
 
         public Builder() {
             super(Py.CompilationUnit.class);

diff --git a/src/main/java/org/openrewrite/python/internal/PsiPythonMapper.java b/src/main/java/org/openrewrite/python/internal/PsiPythonMapper.java
@@ -35,6 +35,7 @@
 import org.openrewrite.python.marker.*;
 import org.openrewrite.python.tree.Py;
 import org.openrewrite.python.tree.PySpace;
+import org.openrewrite.style.NamedStyles;
 
 import java.nio.charset.Charset;
 import java.nio.file.Path;
@@ -55,15 +56,18 @@ public class PsiPythonMapper {
     private final Path path;
     private final Charset charset;
     private final boolean isCharsetBomMarked;
+    private final Collection<NamedStyles> styles;
     private final LanguageLevel languageLevel;
 
     public PsiPythonMapper(Path path,
                            Charset charset,
                            boolean isCharsetBomMarked,
+                           Collection<NamedStyles> styles,
                            LanguageLevel languageLevel) {
         this.path = path;
         this.charset = charset;
         this.isCharsetBomMarked = isCharsetBomMarked;
+        this.styles = styles;
         this.languageLevel = languageLevel;
     }
 
@@ -127,9 +131,9 @@ public Py.CompilationUnit mapFile(PyFile element) {
                 mapBlock(element, null, element.getStatements(), ctx)
         );
 
-        Markers markers = EMPTY;
+        Markers markers = Markers.build(styles);
         if (!element.getText().endsWith("\n")) {
-            markers = Markers.build(singletonList(new SuppressNewline(randomId())));
+            markers = markers.addIfAbsent(new SuppressNewline(randomId()));
         }
 
         Space eof = ctx.paddingCursor.consumeRemainingAndExpectEOF();