Ensure that parse errors have the appropriate relative path

pway99 · Dec 6, 2022 · cc97c47 · cc97c47
1 parent f07c964
commit cc97c47
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 16 deletions.
diff --git a/rewrite-core/src/main/java/org/openrewrite/binary/BinaryParser.java b/rewrite-core/src/main/java/org/openrewrite/binary/BinaryParser.java
@@ -48,7 +48,7 @@ public List<Binary> parseInputs(Iterable<Input> sources, @Nullable Path relative
                         null,
                         readAllBytes(source.getSource(ctx))));
             } catch (Exception e) {
-                ParsingExecutionContextView.view(ctx).parseFailure(source, this, e);
+                ParsingExecutionContextView.view(ctx).parseFailure(source, relativeTo, this, e);
                 ctx.getOnError().accept(e);
             }
         }

diff --git a/rewrite-core/src/main/java/org/openrewrite/text/PlainTextParser.java b/rewrite-core/src/main/java/org/openrewrite/text/PlainTextParser.java
@@ -50,7 +50,7 @@ public List<PlainText> parseInputs(Iterable<Input> sources, @Nullable Path relat
                 plainTexts.add(plainText);
                 parsingListener.parsed(source, plainText);
             } catch (Throwable t) {
-                ParsingExecutionContextView.view(ctx).parseFailure(source, this, t);
+                ParsingExecutionContextView.view(ctx).parseFailure(source, relativeTo, this, t);
                 ctx.getOnError().accept(t);
             }
         }

diff --git a/rewrite-core/src/main/java/org/openrewrite/tree/ParsingExecutionContextView.java b/rewrite-core/src/main/java/org/openrewrite/tree/ParsingExecutionContextView.java
@@ -57,8 +57,8 @@ public ParsingEventListener getParsingListener() {
         return getMessage(PARSING_LISTENER, ParsingEventListener.NOOP);
     }
 
-    public ParsingExecutionContextView parseFailure(Parser.Input input, Parser<?> parser, Throwable t) {
-        PlainText pt = new PlainText(randomId(), input.getPath(), Markers.EMPTY, null, false,
+    public ParsingExecutionContextView parseFailure(Parser.Input input, @Nullable Path relativeTo, Parser<?> parser, Throwable t) {
+        PlainText pt = new PlainText(randomId(), input.getRelativePath(relativeTo), Markers.EMPTY, null, false,
                 null, null, input.getSource(this).readFully());
         return parseFailure(pt, parser, t);
     }

diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParser.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParser.java
@@ -112,7 +112,7 @@ public List<G.CompilationUnit> parseInputs(Iterable<Input> sources, @Nullable Pa
                 cus.add(gcu);
                 parsingListener.parsed(compiled.getInput(), gcu);
             } catch (Throwable t) {
-                pctx.parseFailure(compiled.getInput(), this, t);
+                pctx.parseFailure(compiled.getInput(), relativeTo, this, t);
                 ctx.getOnError().accept(t);
             }
         }
@@ -164,7 +164,7 @@ List<CompiledGroovySource> parseInputsToCompilerAst(Iterable<Input> sources, @Nu
 
                 cus.add(new CompiledGroovySource(input, unit, ast));
             } catch (Throwable t) {
-                ctx.parseFailure(input, this, t);
+                ctx.parseFailure(input, relativeTo, this, t);
                 ctx.getOnError().accept(t);
             } finally {
                 if (logCompilationWarningsAndErrors && (errorCollector.hasErrors() || errorCollector.hasWarnings())) {

diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclParser.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclParser.java
@@ -83,7 +83,7 @@ public List<Hcl.ConfigFile> parseInputs(Iterable<Input> sourceFiles, @Nullable P
                         return configFile;
                     } catch (Throwable t) {
                         sample.stop(MetricsHelper.errorTags(timer, t).register(Metrics.globalRegistry));
-                        ParsingExecutionContextView.view(ctx).parseFailure(sourceFile, this, t);
+                        ParsingExecutionContextView.view(ctx).parseFailure(sourceFile, relativeTo, this, t);
                         ctx.getOnError().accept(t);
                         return null;
                     }

diff --git a/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11Parser.java b/rewrite-java-11/src/main/java/org/openrewrite/java/isolated/ReloadableJava11Parser.java
@@ -191,7 +191,7 @@ public List<J.CompilationUnit> parseInputs(Iterable<Input> sourceFiles, @Nullabl
                                                 .tag("file.type", "Java")
                                                 .tag("step", "(3) Map to Rewrite AST"), t)
                                 .register(Metrics.globalRegistry));
-                        ParsingExecutionContextView.view(ctx).parseFailure(input, this, t);
+                        ParsingExecutionContextView.view(ctx).parseFailure(input, relativeTo, this, t);
                         ctx.getOnError().accept(t);
                         return null;
                     }

diff --git a/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17Parser.java b/rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17Parser.java
@@ -191,7 +191,7 @@ public List<J.CompilationUnit> parseInputs(Iterable<Input> sourceFiles, @Nullabl
                                                 .tag("file.type", "Java")
                                                 .tag("step", "(3) Map to Rewrite AST"), t)
                                 .register(Metrics.globalRegistry));
-                        ParsingExecutionContextView.view(ctx).parseFailure(input, this, t);
+                        ParsingExecutionContextView.view(ctx).parseFailure(input, relativeTo, this, t);
                         ctx.getOnError().accept(t);
                         return null;
                     }

diff --git a/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8Parser.java b/rewrite-java-8/src/main/java/org/openrewrite/java/ReloadableJava8Parser.java
@@ -220,7 +220,7 @@ public List<J.CompilationUnit> parseInputs(Iterable<Input> sourceFiles, @Nullabl
                                                 .tag("file.type", "Java")
                                                 .tag("step", "(3) Map to Rewrite AST"), t)
                                 .register(Metrics.globalRegistry));
-                        ParsingExecutionContextView.view(ctx).parseFailure(input, this, t);
+                        ParsingExecutionContextView.view(ctx).parseFailure(input, relativeTo, this, t);
                         ctx.getOnError().accept(t);
                         return null;
                     }

diff --git a/rewrite-json/src/main/java/org/openrewrite/json/JsonParser.java b/rewrite-json/src/main/java/org/openrewrite/json/JsonParser.java
@@ -65,7 +65,7 @@ public List<Json.Document> parseInputs(Iterable<Input> sourceFiles, @Nullable Pa
                         return document;
                     } catch (Throwable t) {
                         sample.stop(MetricsHelper.errorTags(timer, t).register(Metrics.globalRegistry));
-                        ParsingExecutionContextView.view(ctx).parseFailure(sourceFile, this, t);
+                        ParsingExecutionContextView.view(ctx).parseFailure(sourceFile, relativeTo, this, t);
                         ctx.getOnError().accept(new IllegalStateException(sourceFile.getPath() + " " + t.getMessage(), t));
                         return null;
                     }

diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/MavenParser.java b/rewrite-maven/src/main/java/org/openrewrite/maven/MavenParser.java
@@ -102,7 +102,7 @@ public List<Xml.Document> parseInputs(Iterable<Input> sources, @Nullable Path re
                 projectPoms.put(xml, pom);
                 projectPomsByPath.put(pomPath, pom);
             } catch (Throwable t) {
-                ParsingExecutionContextView.view(ctx).parseFailure(source, this, t);
+                ParsingExecutionContextView.view(ctx).parseFailure(source, relativeTo, this, t);
                 ctx.getOnError().accept(t);
             }
         }

diff --git a/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesParser.java b/rewrite-properties/src/main/java/org/openrewrite/properties/PropertiesParser.java
@@ -62,7 +62,7 @@ public List<Properties.File> parseInputs(Iterable<Input> sourceFiles, @Nullable
                         return file;
                     } catch (Throwable t) {
                         sample.stop(MetricsHelper.errorTags(timer, t).register(Metrics.globalRegistry));
-                        ParsingExecutionContextView.view(ctx).parseFailure(sourceFile, this, t);
+                        ParsingExecutionContextView.view(ctx).parseFailure(sourceFile, relativeTo, this, t);
                         ctx.getOnError().accept(new IllegalStateException(sourceFile.getPath() + " " + t.getMessage(), t));
                         return null;
                     }

diff --git a/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/ProtoParser.java b/rewrite-protobuf/src/main/java/org/openrewrite/protobuf/ProtoParser.java
@@ -74,7 +74,7 @@ public List<Proto.Document> parseInputs(Iterable<Input> sourceFiles, @Nullable P
                         return document;
                     } catch (Throwable t) {
                         sample.stop(MetricsHelper.errorTags(timer, t).register(Metrics.globalRegistry));
-                        ParsingExecutionContextView.view(ctx).parseFailure(sourceFile, this, t);
+                        ParsingExecutionContextView.view(ctx).parseFailure(sourceFile, relativeTo, this, t);
                         ctx.getOnError().accept(new IllegalStateException(path + " " + t.getMessage(), t));
                         return null;
                     }

diff --git a/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java b/rewrite-xml/src/main/java/org/openrewrite/xml/XmlParser.java
@@ -72,7 +72,7 @@ public List<Xml.Document> parseInputs(Iterable<Input> sourceFiles, @Nullable Pat
                         return document;
                     } catch (Throwable t) {
                         sample.stop(MetricsHelper.errorTags(timer, t).register(Metrics.globalRegistry));
-                        ParsingExecutionContextView.view(ctx).parseFailure(sourceFile, this, t);
+                        ParsingExecutionContextView.view(ctx).parseFailure(sourceFile, relativeTo, this, t);
                         ctx.getOnError().accept(new IllegalStateException(path + " " + t.getMessage(), t));
                         return null;
                     }

diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/YamlParser.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/YamlParser.java
@@ -79,7 +79,7 @@ public List<Yaml.Documents> parseInputs(Iterable<Input> sourceFiles, @Nullable P
                         return yaml;
                     } catch (Throwable t) {
                         sample.stop(MetricsHelper.errorTags(timer, t).register(Metrics.globalRegistry));
-                        ParsingExecutionContextView.view(ctx).parseFailure(sourceFile, this, t);
+                        ParsingExecutionContextView.view(ctx).parseFailure(sourceFile, relativeTo, this, t);
                         ctx.getOnError().accept(new IllegalStateException(path + " " + t.getMessage(), t));
                         return null;
                     }