) resource;
- if (resourceType.equals(ResourceType.fromSpec((String) resourceMap.get("type")))) {
+ if (resourceType == ResourceType.fromSpec((String) resourceMap.get("type"))) {
resources.add(resourceMap);
}
}
diff --git a/rewrite-core/src/main/java/org/openrewrite/format/LineBreaks.java b/rewrite-core/src/main/java/org/openrewrite/format/LineBreaks.java
new file mode 100644
index 00000000000..da2bdfc05ea
--- /dev/null
+++ b/rewrite-core/src/main/java/org/openrewrite/format/LineBreaks.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.format;
+
+public class LineBreaks {
+ public static String normalizeNewLines(String text, boolean useCrlf) {
+ if (!text.contains("\n")) {
+ return text;
+ }
+ StringBuilder normalized = new StringBuilder();
+ for (int i = 0; i < text.length(); i++) {
+ char c = text.charAt(i);
+ if (useCrlf && c == '\n' && (i == 0 || text.charAt(i - 1) != '\r')) {
+ normalized.append('\r').append('\n');
+ } else if (useCrlf || c != '\r') {
+ normalized.append(c);
+ }
+ }
+ return normalized.toString();
+ }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/ListUtils.java b/rewrite-core/src/main/java/org/openrewrite/internal/ListUtils.java
index a18cc8bf585..5de88dc8c50 100644
--- a/rewrite-core/src/main/java/org/openrewrite/internal/ListUtils.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/ListUtils.java
@@ -261,6 +261,7 @@ public static List insert(@Nullable List ls, @Nullable T t, int index)
/**
* For backwards compatibility; prefer {@link #map(List, Function)}.
*/
+ @Contract("null, _ -> null; !null, _ -> !null")
public static @Nullable List map(@Nullable List ls, UnaryOperator<@Nullable T> map) {
return map(ls, (Function) map);
}
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/NameCaseConvention.java b/rewrite-core/src/main/java/org/openrewrite/internal/NameCaseConvention.java
index 74639b39b89..038a065c074 100755
--- a/rewrite-core/src/main/java/org/openrewrite/internal/NameCaseConvention.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/NameCaseConvention.java
@@ -96,6 +96,9 @@ public boolean matches(String str) {
}
public static boolean matches(NameCaseConvention convention, String str) {
+ if (str.isEmpty()) {
+ return false;
+ }
switch (convention) {
case LOWER_CAMEL:
if (!Character.isLowerCase(str.charAt(0)) && str.charAt(0) != '$') {
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/ReflectionUtils.java b/rewrite-core/src/main/java/org/openrewrite/internal/ReflectionUtils.java
index 8cda946a88d..b207a7232e9 100644
--- a/rewrite-core/src/main/java/org/openrewrite/internal/ReflectionUtils.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/ReflectionUtils.java
@@ -36,7 +36,18 @@ public class ReflectionUtils {
* Cache for {@link Class#getDeclaredMethods()} plus equivalent default methods
* from Java 8 based interfaces, allowing for fast iteration.
*/
- private static final Map, Method[]> declaredMethodsCache = new ConcurrentHashMap<>(256);
+ private static final Map, Method[]> DECLARED_METHODS_CACHE = new ConcurrentHashMap<>(256);
+
+ public static boolean isClassAvailable(String fullyQualifiedClassName) {
+ try {
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ ClassLoader classLoader = contextClassLoader == null ? ReflectionUtils.class.getClassLoader() : contextClassLoader;
+ Class.forName(fullyQualifiedClassName, false, classLoader);
+ return true;
+ } catch (ClassNotFoundException e) {
+ return false;
+ }
+ }
public static @Nullable Method findMethod(Class clazz, String name, Class... paramTypes) {
Class searchType = clazz;
@@ -54,7 +65,7 @@ public class ReflectionUtils {
}
private static Method[] getDeclaredMethods(Class clazz) {
- Method[] result = declaredMethodsCache.get(clazz);
+ Method[] result = DECLARED_METHODS_CACHE.get(clazz);
if (result == null) {
try {
Method[] declaredMethods = clazz.getDeclaredMethods();
@@ -70,7 +81,7 @@ private static Method[] getDeclaredMethods(Class clazz) {
} else {
result = declaredMethods;
}
- declaredMethodsCache.put(clazz, (result.length == 0 ? EMPTY_METHOD_ARRAY : result));
+ DECLARED_METHODS_CACHE.put(clazz, (result.length == 0 ? EMPTY_METHOD_ARRAY : result));
} catch (Throwable ex) {
throw new IllegalStateException("Failed to introspect Class [" + clazz.getName() +
"] from ClassLoader [" + clazz.getClassLoader() + "]", ex);
diff --git a/rewrite-core/src/main/java/org/openrewrite/internal/StringUtils.java b/rewrite-core/src/main/java/org/openrewrite/internal/StringUtils.java
index 7cafdeb341a..e06c1d58281 100644
--- a/rewrite-core/src/main/java/org/openrewrite/internal/StringUtils.java
+++ b/rewrite-core/src/main/java/org/openrewrite/internal/StringUtils.java
@@ -692,7 +692,13 @@ public static int indexOfNextNonWhitespace(int cursor, String source) {
continue;
} else if (length > cursor + 1) {
char next = source.charAt(cursor + 1);
- if (current == '/' && next == '/') {
+ if (inMultiLineComment) {
+ if (current == '*' && next == '/') {
+ inMultiLineComment = false;
+ cursor++;
+ continue;
+ }
+ } else if (current == '/' && next == '/') {
inSingleLineComment = true;
cursor++;
continue;
@@ -700,10 +706,6 @@ public static int indexOfNextNonWhitespace(int cursor, String source) {
inMultiLineComment = true;
cursor++;
continue;
- } else if (current == '*' && next == '/') {
- inMultiLineComment = false;
- cursor++;
- continue;
}
}
if (!inMultiLineComment && !Character.isWhitespace(current)) {
@@ -720,4 +722,14 @@ public static String formatUriForPropertiesFile(String uri) {
public static boolean hasLineBreak(@Nullable String s) {
return s != null && LINE_BREAK.matcher(s).find();
}
+
+ public static boolean containsWhitespace(String s) {
+ for (int i = 0; i < s.length(); ++i) {
+ if (Character.isWhitespace(s.charAt(i))) {
+ return true;
+ }
+ }
+
+ return false;
+ }
}
diff --git a/rewrite-core/src/main/java/org/openrewrite/remote/RemoteArchive.java b/rewrite-core/src/main/java/org/openrewrite/remote/RemoteArchive.java
index 23de1da8810..6e553fdac4b 100644
--- a/rewrite-core/src/main/java/org/openrewrite/remote/RemoteArchive.java
+++ b/rewrite-core/src/main/java/org/openrewrite/remote/RemoteArchive.java
@@ -34,6 +34,7 @@
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.List;
import java.util.UUID;
import java.util.regex.Pattern;
@@ -92,6 +93,9 @@ public InputStream getInputStream(ExecutionContext ctx) {
try {
Path localArchive = cache.compute(uri, () -> {
//noinspection resource
+ if ("file".equals(uri.getScheme())) {
+ return Files.newInputStream(Paths.get(uri));
+ }
HttpSender.Response response = httpSender.send(httpSender.get(uri.toString()).build());
if (response.isSuccessful()) {
return response.getBody();
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/LatestMinor.java b/rewrite-core/src/main/java/org/openrewrite/semver/LatestMinor.java
new file mode 100644
index 00000000000..17737b52488
--- /dev/null
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/LatestMinor.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver;
+
+import lombok.Value;
+import org.jspecify.annotations.Nullable;
+import org.openrewrite.Validated;
+
+@Value
+public class LatestMinor implements VersionComparator {
+ @Nullable
+ String metadataPattern;
+
+ @Override
+ public boolean isValid(@Nullable String currentVersion, String version) {
+ Validated validated = currentVersion == null ?
+ LatestRelease.buildLatestRelease("latest.release", metadataPattern) :
+ TildeRange.build("~" + Semver.majorVersion(currentVersion), metadataPattern);
+
+ if (validated.isValid()) {
+ VersionComparator comparator = validated.getValue();
+ if (comparator != null) {
+ return comparator.isValid(currentVersion, version);
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public int compare(@Nullable String currentVersion, String v1, String v2) {
+ if(currentVersion == null) {
+ return new LatestRelease(null)
+ .compare(null, v1, v2);
+ }
+
+ //noinspection ConstantConditions
+ return TildeRange.build("~" + Semver.majorVersion(currentVersion) + "." + Semver.minorVersion(currentVersion), metadataPattern)
+ .getValue()
+ .compare(currentVersion, v1, v2);
+ }
+
+ public static Validated build(String toVersion, @Nullable String metadataPattern) {
+ return "latest.minor".equalsIgnoreCase(toVersion) ?
+ Validated.valid("latestMinor", new LatestMinor(metadataPattern)) :
+ Validated.invalid("latestMinor", toVersion, "not latest release");
+ }
+}
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/LatestRelease.java b/rewrite-core/src/main/java/org/openrewrite/semver/LatestRelease.java
index 18fc5d4b12e..0b1fa2b0095 100644
--- a/rewrite-core/src/main/java/org/openrewrite/semver/LatestRelease.java
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/LatestRelease.java
@@ -140,9 +140,8 @@ public int compare(@Nullable String currentVersion, String v1, String v2) {
// parts are the same:
//
// HyphenRange [25-28] should include "28-jre" and "28-android" as possible candidates.
- String normalized1 = metadataPattern == null ? nv1 : nv1.replace(metadataPattern, "");
- String normalized2 = metadataPattern == null ? nv2 : nv1.replace(metadataPattern, "");
-
+ String normalized1 = metadataPattern == null ? nv1 : nv1.replaceAll(metadataPattern, "");
+ String normalized2 = metadataPattern == null ? nv2 : nv2.replaceAll(metadataPattern, "");
try {
for (int i = 1; i <= Math.max(vp1, vp2); i++) {
String v1Part = v1Gav.group(i);
@@ -168,7 +167,7 @@ public int compare(@Nullable String currentVersion, String v1, String v2) {
}
public static Validated buildLatestRelease(String toVersion, @Nullable String metadataPattern) {
- return "latest.release".equalsIgnoreCase(toVersion) ?
+ return "latest.release".equalsIgnoreCase(toVersion) || "latest.major".equalsIgnoreCase(toVersion) ?
Validated.valid("latestRelease", new LatestRelease(metadataPattern)) :
Validated.invalid("latestRelease", toVersion, "not latest release");
}
diff --git a/rewrite-core/src/main/java/org/openrewrite/semver/Semver.java b/rewrite-core/src/main/java/org/openrewrite/semver/Semver.java
index d4d6388702a..e47ec996629 100644
--- a/rewrite-core/src/main/java/org/openrewrite/semver/Semver.java
+++ b/rewrite-core/src/main/java/org/openrewrite/semver/Semver.java
@@ -59,6 +59,7 @@ public static Validated validate(String toVersion, @Nullable
).and(Validated.none()
.or(LatestRelease.buildLatestRelease(toVersion, metadataPattern))
.or(LatestIntegration.build(toVersion, metadataPattern))
+ .or(LatestMinor.build(toVersion, metadataPattern))
.or(LatestPatch.build(toVersion, metadataPattern))
.or(HyphenRange.build(toVersion, metadataPattern))
.or(XRange.build(toVersion, metadataPattern))
diff --git a/rewrite-core/src/main/java/org/openrewrite/text/Find.java b/rewrite-core/src/main/java/org/openrewrite/text/Find.java
index 90450be6d64..24ef0290980 100644
--- a/rewrite-core/src/main/java/org/openrewrite/text/Find.java
+++ b/rewrite-core/src/main/java/org/openrewrite/text/Find.java
@@ -17,6 +17,7 @@
import lombok.EqualsAndHashCode;
import lombok.Value;
+import org.apache.commons.lang3.BooleanUtils;
import org.jspecify.annotations.Nullable;
import org.openrewrite.*;
import org.openrewrite.binary.Binary;
@@ -27,7 +28,6 @@
import org.openrewrite.table.TextMatches;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -85,12 +85,18 @@ public String getDescription() {
description = "A glob expression that can be used to constrain which directories or source files should be searched. " +
"Multiple patterns may be specified, separated by a semicolon `;`. " +
"If multiple patterns are supplied any of the patterns matching will be interpreted as a match. " +
- "When not set, all source files are searched. ",
+ "When not set, all source files are searched.",
required = false,
example = "**/*.java")
@Nullable
String filePattern;
+ @Option(displayName = "Description",
+ description = "Add the matched value(s) as description on the search result marker. Default `false`.",
+ required = false)
+ @Nullable
+ Boolean description;
+
@Override
public TreeVisitor getVisitor() {
@@ -122,46 +128,64 @@ public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
if (!matcher.find()) {
return sourceFile;
}
- matcher.reset();
+
+ String sourceFilePath = sourceFile.getSourcePath().toString();
+
List snippets = new ArrayList<>();
int previousEnd = 0;
- while (matcher.find()) {
+
+ int lastNewLineIndex = -1;
+ int nextNewLineIndex = -1;
+ boolean isFirstMatch = true;
+
+ do {
int matchStart = matcher.start();
snippets.add(snippet(rawText.substring(previousEnd, matchStart)));
- snippets.add(SearchResult.found(snippet(rawText.substring(matchStart, matcher.end()))));
+ String text = rawText.substring(matchStart, matcher.end());
+ snippets.add(SearchResult.found(snippet(text), BooleanUtils.isTrue(description) ? text : null));
previousEnd = matcher.end();
- int startLine = Math.max(0, rawText.substring(0, matchStart).lastIndexOf('\n') + 1);
+ // For the first match, search backwards
+ if (isFirstMatch) {
+ lastNewLineIndex = rawText.lastIndexOf('\n', matchStart);
+ nextNewLineIndex = rawText.indexOf('\n', lastNewLineIndex + 1);
+ isFirstMatch = false;
+ } else if (nextNewLineIndex != -1 && nextNewLineIndex < matchStart) {
+ // Advance lastNewLineIndex while before match start
+ while (nextNewLineIndex != -1 && nextNewLineIndex < matchStart) {
+ lastNewLineIndex = nextNewLineIndex;
+ nextNewLineIndex = rawText.indexOf('\n', lastNewLineIndex + 1);
+ }
+ }
+
+ int startLine = lastNewLineIndex + 1;
int endLine = rawText.indexOf('\n', matcher.end());
if (endLine == -1) {
endLine = rawText.length();
}
+ //noinspection StringBufferReplaceableByString
textMatches.insertRow(ctx, new TextMatches.Row(
- sourceFile.getSourcePath().toString(),
- rawText.substring(startLine, matcher.start()) + "~~>" +
- rawText.substring(matcher.start(), endLine)
+ sourceFilePath,
+ new StringBuilder(endLine - startLine + 3)
+ .append(rawText, startLine, matchStart)
+ .append("~~>")
+ .append(rawText, matchStart, endLine)
+ .toString()
));
- }
+ } while (matcher.find());
snippets.add(snippet(rawText.substring(previousEnd)));
return plainText.withText("").withSnippets(snippets);
}
};
- //noinspection DuplicatedCode
if (filePattern != null) {
- //noinspection unchecked
- TreeVisitor check = Preconditions.or(Arrays.stream(filePattern.split(";"))
- .map(FindSourceFiles::new)
- .map(Recipe::getVisitor)
- .toArray(TreeVisitor[]::new));
-
- visitor = Preconditions.check(check, visitor);
+ visitor = Preconditions.check(new FindSourceFiles(filePattern), visitor);
}
return visitor;
}
-
private static PlainText.Snippet snippet(String text) {
return new PlainText.Snippet(Tree.randomId(), Markers.EMPTY, text);
}
+
}
diff --git a/rewrite-core/src/main/java/org/openrewrite/text/FindAndReplace.java b/rewrite-core/src/main/java/org/openrewrite/text/FindAndReplace.java
index 0842da78a57..5a284180a62 100644
--- a/rewrite-core/src/main/java/org/openrewrite/text/FindAndReplace.java
+++ b/rewrite-core/src/main/java/org/openrewrite/text/FindAndReplace.java
@@ -27,7 +27,6 @@
import org.openrewrite.quark.Quark;
import org.openrewrite.remote.Remote;
-import java.util.Arrays;
import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -95,7 +94,7 @@ public String getDescription() {
description = "A glob expression that can be used to constrain which directories or source files should be searched. " +
"Multiple patterns may be specified, separated by a semicolon `;`. " +
"If multiple patterns are supplied any of the patterns matching will be interpreted as a match. " +
- "When not set, all source files are searched. ",
+ "When not set, all source files are searched.",
required = false,
example = "**/*.java")
@Nullable
@@ -153,15 +152,8 @@ public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
.withMarkers(sourceFile.getMarkers().add(new AlreadyReplaced(randomId(), find, replace)));
}
};
- //noinspection DuplicatedCode
if (filePattern != null) {
- //noinspection unchecked
- TreeVisitor check = Preconditions.or(Arrays.stream(filePattern.split(";"))
- .map(FindSourceFiles::new)
- .map(Recipe::getVisitor)
- .toArray(TreeVisitor[]::new));
-
- visitor = Preconditions.check(check, visitor);
+ visitor = Preconditions.check(new FindSourceFiles(filePattern), visitor);
}
if (Boolean.TRUE.equals(plaintextOnly)) {
diff --git a/rewrite-core/src/main/java/org/openrewrite/text/PlainText.java b/rewrite-core/src/main/java/org/openrewrite/text/PlainText.java
index 6ccab32adf8..623122d9921 100644
--- a/rewrite-core/src/main/java/org/openrewrite/text/PlainText.java
+++ b/rewrite-core/src/main/java/org/openrewrite/text/PlainText.java
@@ -16,14 +16,17 @@
package org.openrewrite.text;
import lombok.*;
+import lombok.experimental.NonFinal;
import org.jspecify.annotations.Nullable;
import org.openrewrite.*;
import org.openrewrite.marker.Markers;
+import java.lang.ref.SoftReference;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.List;
+import java.util.Objects;
import java.util.UUID;
import java.util.function.Predicate;
@@ -35,8 +38,8 @@
*/
@Value
@Builder
-@AllArgsConstructor
-public class PlainText implements SourceFile, Tree {
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class PlainText implements SourceFileWithReferences, Tree {
@Builder.Default
@With
@@ -79,16 +82,41 @@ public SourceFile withCharset(Charset charset) {
@Builder.Default
String text = "";
+ @Nullable
+ List snippets;
+
+ @Nullable
+ @NonFinal
+ @ToString.Exclude
+ transient SoftReference references;
+
+ public PlainText(UUID id, Path sourcePath, Markers markers, @Nullable String charsetName, boolean charsetBomMarked,
+ @Nullable FileAttributes fileAttributes, @Nullable Checksum checksum, String text, @Nullable List snippets) {
+ this.id = id;
+ this.sourcePath = sourcePath;
+ this.markers = markers;
+ this.charsetName = charsetName;
+ this.charsetBomMarked = charsetBomMarked;
+ this.fileAttributes = fileAttributes;
+ this.checksum = checksum;
+ this.text = text;
+ this.snippets = snippets;
+ }
+
+ @Override
+ public References getReferences() {
+ this.references = build(this.references);
+ return Objects.requireNonNull(this.references.get());
+ }
+
public PlainText withText(String text) {
if (!text.equals(this.text)) {
return new PlainText(this.id, this.sourcePath, this.markers, this.charsetName, this.charsetBomMarked,
- this.fileAttributes, this.checksum, text, this.snippets);
+ this.fileAttributes, this.checksum, text, this.snippets, this.references);
}
return this;
}
- List snippets;
-
@Override
public boolean isAcceptable(TreeVisitor v, P p) {
return v.isAdaptableTo(PlainTextVisitor.class);
@@ -123,7 +151,7 @@ public PlainText withSnippets(@Nullable List snippets) {
if (this.snippets == snippets) {
return this;
}
- return new PlainText(id, sourcePath, markers, charsetName, charsetBomMarked, fileAttributes, checksum, text, snippets);
+ return new PlainText(id, sourcePath, markers, charsetName, charsetBomMarked, fileAttributes, checksum, text, snippets, null);
}
@Value
diff --git a/rewrite-core/src/main/java/org/openrewrite/text/PlainTextParser.java b/rewrite-core/src/main/java/org/openrewrite/text/PlainTextParser.java
index d7da58e2be6..a1a105e9331 100644
--- a/rewrite-core/src/main/java/org/openrewrite/text/PlainTextParser.java
+++ b/rewrite-core/src/main/java/org/openrewrite/text/PlainTextParser.java
@@ -20,7 +20,6 @@
import org.openrewrite.Parser;
import org.openrewrite.SourceFile;
import org.openrewrite.internal.EncodingDetectingInputStream;
-import org.openrewrite.marker.Markers;
import org.openrewrite.tree.ParseError;
import org.openrewrite.tree.ParsingEventListener;
import org.openrewrite.tree.ParsingExecutionContextView;
@@ -34,8 +33,6 @@
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-import static org.openrewrite.Tree.randomId;
-
public class PlainTextParser implements Parser {
/**
@@ -73,17 +70,13 @@ public Stream parseInputs(Iterable {
enum Kind {
TYPE,
- PACKAGE
+ PACKAGE,
+ IMAGE
}
Kind getKind();
@@ -57,6 +59,20 @@ interface Provider {
boolean isAcceptable(SourceFile sourceFile);
}
+ abstract class AbstractProvider implements Provider {
+ protected abstract SimpleTraitMatcher getMatcher();
+
+ @Override
+ public Set getReferences(SourceFile sourceFile) {
+ Set references = new HashSet<>();
+ getMatcher().asVisitor(reference -> {
+ references.add(reference);
+ return reference.getTree();
+ }).visit(sourceFile, 0);
+ return references;
+ }
+ }
+
interface Matcher {
boolean matchesReference(Reference value);
diff --git a/rewrite-core/src/test/java/org/openrewrite/ExecutionContextTest.java b/rewrite-core/src/test/java/org/openrewrite/ExecutionContextTest.java
index ab9ad0ef731..fa7aaa25d7c 100644
--- a/rewrite-core/src/test/java/org/openrewrite/ExecutionContextTest.java
+++ b/rewrite-core/src/test/java/org/openrewrite/ExecutionContextTest.java
@@ -17,6 +17,7 @@
import org.junit.jupiter.api.Test;
import org.openrewrite.test.RewriteTest;
+import org.openrewrite.test.TypeValidation;
import org.openrewrite.text.PlainText;
import org.openrewrite.text.PlainTextVisitor;
@@ -41,7 +42,8 @@ public PlainText visitText(PlainText text, ExecutionContext ctx) {
cycles.incrementAndGet();
return text;
}
- }).withCausesAnotherCycle(true)),
+ }).withCausesAnotherCycle(true))
+ .typeValidationOptions(TypeValidation.all().immutableExecutionContext(false)),
text("hello world")
);
assertThat(cycles.get()).isEqualTo(2);
diff --git a/rewrite-core/src/test/java/org/openrewrite/GitRemoteTest.java b/rewrite-core/src/test/java/org/openrewrite/GitRemoteTest.java
index 410eb17df9b..37581c2f934 100644
--- a/rewrite-core/src/test/java/org/openrewrite/GitRemoteTest.java
+++ b/rewrite-core/src/test/java/org/openrewrite/GitRemoteTest.java
@@ -232,11 +232,21 @@ void shouldNotStripJgit() {
assertThat(remote.getPath()).isEqualTo("openrewrite/jgit");
}
+ @Test
+ void shouldNotReplaceExistingWellKnownServer(){
+ GitRemote.Parser parser = new GitRemote.Parser()
+ .registerRemote(GitRemote.Service.GitHub, URI.create("https://github.com"), List.of(URI.create("ssh://notgithub.com")));
+
+ assertThat(parser.findRemoteServer("github.com").getUris())
+ .containsExactlyInAnyOrder(URI.create("https://github.com"), URI.create("ssh://git@github.com"));
+ }
+
@Test
void findRemote() {
GitRemote.Parser parser = new GitRemote.Parser()
.registerRemote(GitRemote.Service.Bitbucket, URI.create("scm.company.com/stash"), Collections.emptyList());
assertThat(parser.findRemoteServer("github.com").getService()).isEqualTo(GitRemote.Service.GitHub);
+ assertThat(parser.findRemoteServer("https://github.com").getService()).isEqualTo(GitRemote.Service.GitHub);
assertThat(parser.findRemoteServer("gitlab.com").getService()).isEqualTo(GitRemote.Service.GitLab);
assertThat(parser.findRemoteServer("bitbucket.org").getService()).isEqualTo(GitRemote.Service.BitbucketCloud);
assertThat(parser.findRemoteServer("dev.azure.com").getService()).isEqualTo(GitRemote.Service.AzureDevOps);
@@ -265,18 +275,18 @@ void parseOriginCaseInsensitive(String cloneUrl, String expectedOrigin, String e
@ParameterizedTest
@CsvSource(textBlock = """
- GitHub, GitHub
- GITLAB, GitLab
- bitbucket, Bitbucket
- BitbucketCloud, BitbucketCloud
- Bitbucket Cloud, BitbucketCloud
- BITBUCKET_CLOUD, BitbucketCloud
- AzureDevOps, AzureDevOps
- AZURE_DEVOPS, AzureDevOps
- Azure DevOps, AzureDevOps
- idontknow, Unknown
- """)
- void findServiceForName(String name, GitRemote.Service service){
+ GitHub, GitHub
+ GITLAB, GitLab
+ bitbucket, Bitbucket
+ BitbucketCloud, BitbucketCloud
+ Bitbucket Cloud, BitbucketCloud
+ BITBUCKET_CLOUD, BitbucketCloud
+ AzureDevOps, AzureDevOps
+ AZURE_DEVOPS, AzureDevOps
+ Azure DevOps, AzureDevOps
+ idontknow, Unknown
+ """)
+ void findServiceForName(String name, GitRemote.Service service) {
assertThat(GitRemote.Service.forName(name)).isEqualTo(service);
}
diff --git a/rewrite-core/src/test/java/org/openrewrite/internal/ReflectionUtilsTest.java b/rewrite-core/src/test/java/org/openrewrite/internal/ReflectionUtilsTest.java
new file mode 100644
index 00000000000..83eb1763c75
--- /dev/null
+++ b/rewrite-core/src/test/java/org/openrewrite/internal/ReflectionUtilsTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.internal;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class ReflectionUtilsTest {
+
+ @Test
+ void classAvailable() {
+ boolean result = ReflectionUtils.isClassAvailable("org.openrewrite.internal.ReflectionUtilsTest");
+ assertTrue(result);
+ }
+
+ @Test
+ void classNotAvailable() {
+ boolean result = ReflectionUtils.isClassAvailable("org.openrewrite.internal.ReflectionUtilsTest2");
+ assertFalse(result);
+ }
+
+ @Test
+ void classNotAvailableWhenFQNOmitted() {
+ boolean result = ReflectionUtils.isClassAvailable("ReflectionUtilsTest");
+ assertFalse(result);
+ }
+}
diff --git a/rewrite-core/src/test/java/org/openrewrite/remote/RemoteArchiveTest.java b/rewrite-core/src/test/java/org/openrewrite/remote/RemoteArchiveTest.java
index f96eea97f00..e09fc8454f5 100644
--- a/rewrite-core/src/test/java/org/openrewrite/remote/RemoteArchiveTest.java
+++ b/rewrite-core/src/test/java/org/openrewrite/remote/RemoteArchiveTest.java
@@ -21,10 +21,12 @@
import org.openrewrite.ExecutionContext;
import org.openrewrite.HttpSenderExecutionContextView;
import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.PrintOutputCapture;
import org.openrewrite.test.MockHttpSender;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Paths;
import java.util.concurrent.*;
@@ -40,10 +42,6 @@ class RemoteArchiveTest {
void gradleWrapper(String version) throws Exception {
URL distributionUrl = requireNonNull(RemoteArchiveTest.class.getClassLoader().getResource("gradle-" + version + "-bin.zip"));
ExecutionContext ctx = new InMemoryExecutionContext();
- RemoteExecutionContextView.view(ctx).setArtifactCache(new LocalRemoteArtifactCache(
- Paths.get(System.getProperty("user.home") + "/.rewrite/remote/gradleWrapper")));
- HttpSenderExecutionContextView.view(ctx)
- .setLargeFileHttpSender(new MockHttpSender(distributionUrl::openStream));
RemoteArchive remoteArchive = Remote
.builder(
@@ -58,10 +56,9 @@ void gradleWrapper(String version) throws Exception {
@Test
void gradleWrapperDownloadFails() throws Exception {
- URL distributionUrl = requireNonNull(RemoteArchiveTest.class.getClassLoader().getResource("gradle-7.4.2-bin.zip"));
+ URL distributionUrl = new URL("http://example");
ExecutionContext ctx = new InMemoryExecutionContext();
- RemoteExecutionContextView.view(ctx).setArtifactCache(new LocalRemoteArtifactCache(
- Paths.get(System.getProperty("user.home") + "/.rewrite/remote/gradleWrapperDownloadFails")));
+
HttpSenderExecutionContextView.view(ctx)
.setLargeFileHttpSender(new MockHttpSender(408));
@@ -116,6 +113,21 @@ void gradleWrapperConcurrent(String version) throws Exception {
executorService.shutdown();
}
+ @Test
+ void printingRemoteArchive() throws URISyntaxException {
+ URL zipUrl = requireNonNull(RemoteArchiveTest.class.getClassLoader().getResource("zipfile.zip"));
+
+ RemoteArchive remoteArchive = Remote
+ .builder(
+ Paths.get("content.txt"),
+ zipUrl.toURI()
+ )
+ .build("content.txt");
+
+ String printed = remoteArchive.printAll(new PrintOutputCapture<>(0, PrintOutputCapture.MarkerPrinter.DEFAULT));
+ assertThat(printed).isEqualTo("this is a zipped file");
+ }
+
private Long getInputStreamSize(InputStream is) {
BlackHoleOutputStream out = new BlackHoleOutputStream();
try {
diff --git a/rewrite-core/src/test/java/org/openrewrite/remote/RemoteFileTest.java b/rewrite-core/src/test/java/org/openrewrite/remote/RemoteFileTest.java
index 6e335a1eee3..de1b23476c8 100644
--- a/rewrite-core/src/test/java/org/openrewrite/remote/RemoteFileTest.java
+++ b/rewrite-core/src/test/java/org/openrewrite/remote/RemoteFileTest.java
@@ -55,10 +55,8 @@ void gradleWrapperProperties() throws Exception {
@Test
void gradleWrapperDownloadFails() throws Exception {
- URL distributionUrl = requireNonNull(RemoteFileTest.class.getClassLoader().getResource("gradle-wrapper.properties"));
+ URL distributionUrl = new URL("http://example.com");
ExecutionContext ctx = new InMemoryExecutionContext();
- RemoteExecutionContextView.view(ctx).setArtifactCache(new LocalRemoteArtifactCache(
- Paths.get(System.getProperty("user.home") + "/.rewrite/remote/gradleWrapperDownloadFails")));
HttpSenderExecutionContextView.view(ctx)
.setLargeFileHttpSender(new MockHttpSender(408));
diff --git a/rewrite-core/src/test/java/org/openrewrite/semver/LatestMinorTest.java b/rewrite-core/src/test/java/org/openrewrite/semver/LatestMinorTest.java
new file mode 100644
index 00000000000..ef551e1d882
--- /dev/null
+++ b/rewrite-core/src/test/java/org/openrewrite/semver/LatestMinorTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.semver;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class LatestMinorTest {
+ private final LatestMinor latestMinor = new LatestMinor(null);
+
+ @Test
+ void isValidWhenCurrentIsNull() {
+ assertThat(latestMinor.isValid(null, "1.0.0")).isTrue();
+ }
+ @Test
+ void isValid() {
+ assertThat(latestMinor.isValid("1.0.0", "1.0.0")).isTrue();
+ assertThat(latestMinor.isValid("1.0.0", "1.0.0.1")).isTrue();
+ assertThat(latestMinor.isValid("1.0.0", "1.0.1")).isTrue();
+ assertThat(latestMinor.isValid("1.0", "1.0.1")).isTrue();
+ assertThat(latestMinor.isValid("1.0.0", "1.1.0")).isTrue();
+ assertThat(latestMinor.isValid("1.0.0", "2.0.0")).isFalse();
+ }
+}
diff --git a/rewrite-core/src/test/java/org/openrewrite/text/FindTest.java b/rewrite-core/src/test/java/org/openrewrite/text/FindTest.java
index 0bfae8cadbb..1e628c1b681 100644
--- a/rewrite-core/src/test/java/org/openrewrite/text/FindTest.java
+++ b/rewrite-core/src/test/java/org/openrewrite/text/FindTest.java
@@ -29,7 +29,7 @@ class FindTest implements RewriteTest {
@Test
void dataTable() {
rewriteRun(
- spec -> spec.recipe(new Find("text", null, null, null, null, null))
+ spec -> spec.recipe(new Find("text", null, null, null, null, null, null))
.dataTable(TextMatches.Row.class, rows -> {
assertThat(rows).hasSize(1);
assertThat(rows.get(0).getMatch()).isEqualTo("This is ~~>text.");
@@ -53,7 +53,7 @@ void dataTable() {
@Test
void regex() {
rewriteRun(
- spec -> spec.recipe(new Find("[T\\s]", true, true, null, null, null)),
+ spec -> spec.recipe(new Find("[T\\s]", true, true, null, null, null, null)),
text(
"""
This is\ttext.
@@ -68,7 +68,7 @@ void regex() {
@Test
void plainText() {
rewriteRun(
- spec -> spec.recipe(new Find("\\s", null, null, null, null, null)),
+ spec -> spec.recipe(new Find("\\s", null, null, null, null, null, null)),
text(
"""
This i\\s text.
@@ -83,7 +83,7 @@ void plainText() {
@Test
void caseInsensitive() {
rewriteRun(
- spec -> spec.recipe(new Find("text", null, null, null, null, "**/foo/**;**/baz/**")),
+ spec -> spec.recipe(new Find("text", null, null, null, null, "**/foo/**;**/baz/**", null)),
dir("foo",
text(
"""
@@ -111,4 +111,136 @@ void caseInsensitive() {
)
);
}
+
+ @Test
+ void regexBasicMultiLine() {
+ rewriteRun(
+ spec -> spec.recipe(new Find("[T\\s]", true, true, true, null, null, null)),
+ text(
+ """
+ This is\ttext.
+ This is\ttext.
+ """,
+ """
+ ~~>This~~> is~~>\ttext.~~>
+ ~~>This~~> is~~>\ttext.
+ """
+ )
+ );
+ }
+
+ @Test
+ void regexWithoutMultilineAndDotall() {
+ rewriteRun(
+ spec -> spec.recipe(new Find("^This.*below\\.$", true, true, false, false, null, null)),
+ text(
+ """
+ This is text.
+ This is a line below.
+ This is a line above.
+ This is text.
+ This is a line below.
+ """
+ )
+ );
+ }
+
+ @Test
+ void regexMatchingWhitespaceWithoutMultilineWithDotall() {
+ rewriteRun(
+ spec -> spec.recipe(new Find("One.Two$", true, true, false, true, null, null)),
+ //language=csv
+ text( // the `.` above matches the space character on the same line
+ """
+ Zero
+ One Two
+ Three
+ """
+ )
+ );
+ }
+
+ @Test
+ void regexWithoutMultilineAndWithDotAll() {
+ rewriteRun(
+ spec -> spec.recipe(new Find("^This.*below\\.$", true, true, false, true, null, null)),
+ text(
+ """
+ This is text.
+ This is a line below.
+ This is a line above.
+ This is text.
+ This is a line below.
+ """,
+ """
+ ~~>This is text.
+ This is a line below.
+ This is a line above.
+ This is text.
+ This is a line below.
+ """
+ )
+ );
+ }
+
+ @Test
+ void regexWithMultilineAndWithoutDotall() {
+ rewriteRun(
+ spec -> spec.recipe(new Find("^This.*below\\.$", true, true, true, false, null, null)),
+ text(
+ """
+ This is text.
+ This is a line below.
+ This is a line above.
+ This is text.
+ This is a line below.
+ """,
+ """
+ This is text.
+ ~~>This is a line below.
+ This is a line above.
+ This is text.
+ ~~>This is a line below.
+ """
+ )
+ );
+ }
+
+ @Test
+ void regexWithBothMultilineAndDotAll() {
+ rewriteRun(
+ spec -> spec.recipe(new Find("^This.*below\\.$", true, true, true, true, null, null)),
+ text(
+ """
+ The first line.
+ This is a line below.
+ This is a line above.
+ This is text.
+ This is a line below.
+ """,
+ """
+ The first line.
+ ~~>This is a line below.
+ This is a line above.
+ This is text.
+ This is a line below.
+ """
+ )
+ );
+ }
+
+ @Test
+ void description() {
+ rewriteRun(
+ spec -> spec.recipe(new Find("text", null, null, null, null, null, true)),
+ text(
+ """
+ This is text.
+ """,
+ """
+ This is ~~(text)~~>text.
+ """
+ )
+ );
+ }
}
diff --git a/rewrite-core/src/test/resources/zipfile.zip b/rewrite-core/src/test/resources/zipfile.zip
new file mode 100644
index 00000000000..028830c420e
Binary files /dev/null and b/rewrite-core/src/test/resources/zipfile.zip differ
diff --git a/rewrite-gradle/build.gradle.kts b/rewrite-gradle/build.gradle.kts
index 9f18146b3b0..9df2c9c9477 100644
--- a/rewrite-gradle/build.gradle.kts
+++ b/rewrite-gradle/build.gradle.kts
@@ -57,6 +57,7 @@ dependencies {
testImplementation(project(":rewrite-test")) {
// because gradle-api fatjars this implementation already
exclude("ch.qos.logback", "logback-classic")
+ exclude("org.slf4j", "slf4j-nop")
}
testImplementation("org.openrewrite.gradle.tooling:model:$latest")
diff --git a/rewrite-gradle/src/main/groovy/RewriteGradleProject.groovy b/rewrite-gradle/src/main/groovy/RewriteGradleProject.groovy
index e3283fd5733..ee780d3d430 100644
--- a/rewrite-gradle/src/main/groovy/RewriteGradleProject.groovy
+++ b/rewrite-gradle/src/main/groovy/RewriteGradleProject.groovy
@@ -78,6 +78,7 @@ interface DependencyHandlerSpec extends DependencyHandler {
Dependency earlib(Object... dependencyNotation)
Dependency earlib(Object dependencyNotation, @DelegatesTo(strategy=Closure.DELEGATE_ONLY, value= ExternalDependency) Closure closure)
+ @Override
void constraints(Action configureAction)
}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/AddDependency.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/AddDependency.java
index 990a0606d65..59084bd7cec 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/AddDependency.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/AddDependency.java
@@ -34,6 +34,7 @@
import java.util.*;
+import static java.util.Collections.*;
import static java.util.Objects.requireNonNull;
@Value
@@ -171,14 +172,14 @@ private boolean usesType(SourceFile sourceFile, ExecutionContext ctx) {
return tree;
}
SourceFile sourceFile = (SourceFile) tree;
- sourceFile.getMarkers().findFirst(JavaProject.class).ifPresent(javaProject ->
- sourceFile.getMarkers().findFirst(JavaSourceSet.class).ifPresent(sourceSet -> {
- if (usesType(sourceFile, ctx)) {
- acc.usingType = true;
- }
- Set configurations = acc.configurationsByProject.computeIfAbsent(javaProject, ignored -> new HashSet<>());
- configurations.add("main".equals(sourceSet.getName()) ? "implementation" : sourceSet.getName() + "Implementation");
- }));
+ sourceFile.getMarkers().findFirst(JavaProject.class).ifPresent(javaProject -> {
+ if (usesType(sourceFile, ctx)) {
+ acc.usingType = true;
+ }
+ Set configurations = acc.configurationsByProject.computeIfAbsent(javaProject, ignored -> new HashSet<>());
+ sourceFile.getMarkers().findFirst(JavaSourceSet.class).ifPresent(sourceSet ->
+ configurations.add("main".equals(sourceSet.getName()) ? "implementation" : sourceSet.getName() + "Implementation"));
+ });
return tree;
}
};
@@ -216,7 +217,12 @@ public TreeVisitor getVisitor(Scanned acc) {
GradleProject gp = maybeGp.get();
- Set resolvedConfigurations = StringUtils.isBlank(configuration) ? acc.configurationsByProject.get(jp) : new HashSet<>(Collections.singletonList(configuration));
+ Set resolvedConfigurations = StringUtils.isBlank(configuration) ?
+ acc.configurationsByProject.getOrDefault(jp, new HashSet<>()) :
+ new HashSet<>(singletonList(configuration));
+ if (resolvedConfigurations.isEmpty()) {
+ resolvedConfigurations.add("implementation");
+ }
Set tmpConfigurations = new HashSet<>(resolvedConfigurations);
for (String tmpConfiguration : tmpConfigurations) {
GradleDependencyConfiguration gdc = gp.getConfiguration(tmpConfiguration);
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/AddDependencyVisitor.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/AddDependencyVisitor.java
index 61659730458..64e58977947 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/AddDependencyVisitor.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/AddDependencyVisitor.java
@@ -290,22 +290,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}
} else {
Space originalPrefix = addDependencyInvocation.getPrefix();
- if (currentStatement instanceof J.VariableDeclarations) {
- J.VariableDeclarations variableDeclarations = (J.VariableDeclarations) currentStatement;
- if (variableDeclarations.getTypeExpression() != null) {
- addDependencyInvocation = addDependencyInvocation.withPrefix(variableDeclarations.getTypeExpression().getPrefix());
- }
- } else {
- addDependencyInvocation = addDependencyInvocation.withPrefix(currentStatement.getPrefix());
- }
+ addDependencyInvocation = addDependencyInvocation.withPrefix(currentStatement.getPrefix());
if (addDependencyInvocation.getSimpleName().equals(beforeDependency.getSimpleName())) {
- if (currentStatement instanceof J.VariableDeclarations) {
- J.VariableDeclarations variableDeclarations = (J.VariableDeclarations) currentStatement;
- if (variableDeclarations.getTypeExpression() != null && !variableDeclarations.getTypeExpression().getPrefix().equals(originalPrefix)) {
- statements.set(i, variableDeclarations.withTypeExpression(variableDeclarations.getTypeExpression().withPrefix(originalPrefix)));
- }
- } else if (!currentStatement.getPrefix().equals(originalPrefix)) {
+ if (!currentStatement.getPrefix().equals(originalPrefix)) {
statements.set(i, currentStatement.withPrefix(originalPrefix));
}
}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependency.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependency.java
index 0ff50885dee..9312fa96c3b 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependency.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependency.java
@@ -180,14 +180,16 @@ public G.CompilationUnit visitCompilationUnit(G.CompilationUnit cu, ExecutionCon
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
- GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
+ GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
+ .groupId(oldGroupId)
+ .artifactId(oldArtifactId);
if (!gradleDependencyMatcher.get(getCursor()).isPresent()) {
return m;
}
List depArgs = m.getArguments();
- if (depArgs.get(0) instanceof J.Literal || depArgs.get(0) instanceof G.GString || depArgs.get(0) instanceof G.MapEntry) {
+ if (depArgs.get(0) instanceof J.Literal || depArgs.get(0) instanceof G.GString || depArgs.get(0) instanceof G.MapEntry || depArgs.get(0) instanceof G.MapLiteral) {
m = updateDependency(m, ctx);
} else if (depArgs.get(0) instanceof J.MethodInvocation &&
(((J.MethodInvocation) depArgs.get(0)).getSimpleName().equals("platform") ||
@@ -204,7 +206,7 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m, ExecutionConte
String gav = (String) ((J.Literal) depArgs.get(0)).getValue();
if (gav != null) {
Dependency original = DependencyStringNotationConverter.parse(gav);
- if (original != null && depMatcher.matches(original.getGroupId(), original.getArtifactId())) {
+ if (original != null) {
Dependency updated = original;
if (!StringUtils.isBlank(newGroupId) && !updated.getGroupId().equals(newGroupId)) {
updated = updated.withGroupId(newGroupId);
@@ -238,7 +240,7 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m, ExecutionConte
J.Literal literal = (J.Literal) strings.get(0);
Dependency original = DependencyStringNotationConverter.parse((String) requireNonNull(literal.getValue()));
- if (original != null && depMatcher.matches(original.getGroupId(), original.getArtifactId())) {
+ if (original != null) {
Dependency updated = original;
if (!StringUtils.isBlank(newGroupId) && !updated.getGroupId().equals(newGroupId)) {
updated = updated.withGroupId(newGroupId);
@@ -352,6 +354,92 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m, ExecutionConte
return arg;
}));
}
+ } else if (m.getArguments().get(0) instanceof G.MapLiteral) {
+ G.MapLiteral map = (G.MapLiteral) depArgs.get(0);
+ G.MapEntry groupEntry = null;
+ G.MapEntry artifactEntry = null;
+ G.MapEntry versionEntry = null;
+ String groupId = null;
+ String artifactId = null;
+ String version = null;
+
+ for (G.MapEntry arg : map.getElements()) {
+ if (!(arg.getKey() instanceof J.Literal) || !(arg.getValue() instanceof J.Literal)) {
+ continue;
+ }
+ J.Literal key = (J.Literal) arg.getKey();
+ J.Literal value = (J.Literal) arg.getValue();
+ if (!(key.getValue() instanceof String) || !(value.getValue() instanceof String)) {
+ continue;
+ }
+ String keyValue = (String) key.getValue();
+ String valueValue = (String) value.getValue();
+ switch (keyValue) {
+ case "group":
+ groupEntry = arg;
+ groupId = valueValue;
+ break;
+ case "name":
+ artifactEntry = arg;
+ artifactId = valueValue;
+ break;
+ case "version":
+ versionEntry = arg;
+ version = valueValue;
+ break;
+ }
+ }
+ if (groupId == null || artifactId == null) {
+ return m;
+ }
+ if (!depMatcher.matches(groupId, artifactId)) {
+ return m;
+ }
+ String updatedGroupId = groupId;
+ if (!StringUtils.isBlank(newGroupId) && !updatedGroupId.equals(newGroupId)) {
+ updatedGroupId = newGroupId;
+ }
+ String updatedArtifactId = artifactId;
+ if (!StringUtils.isBlank(newArtifactId) && !updatedArtifactId.equals(newArtifactId)) {
+ updatedArtifactId = newArtifactId;
+ }
+ String updatedVersion = version;
+ if (!StringUtils.isBlank(newVersion) && (!StringUtils.isBlank(version) || Boolean.TRUE.equals(overrideManagedVersion))) {
+ String resolvedVersion;
+ try {
+ resolvedVersion = new DependencyVersionSelector(null, gradleProject, null)
+ .select(new GroupArtifact(updatedGroupId, updatedArtifactId), m.getSimpleName(), newVersion, versionPattern, ctx);
+ } catch (MavenDownloadingException e) {
+ return e.warn(m);
+ }
+ if (resolvedVersion != null && !resolvedVersion.equals(updatedVersion)) {
+ updatedVersion = resolvedVersion;
+ }
+ }
+
+ if (!updatedGroupId.equals(groupId) || !updatedArtifactId.equals(artifactId) || updatedVersion != null && !updatedVersion.equals(version)) {
+ G.MapEntry finalGroup = groupEntry;
+ String finalGroupIdValue = updatedGroupId;
+ G.MapEntry finalArtifact = artifactEntry;
+ String finalArtifactIdValue = updatedArtifactId;
+ G.MapEntry finalVersion = versionEntry;
+ String finalVersionValue = updatedVersion;
+ m = m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> {
+ G.MapLiteral mapLiteral = (G.MapLiteral) arg;
+ return mapLiteral.withElements(ListUtils.map(mapLiteral.getElements(), e -> {
+ if (e == finalGroup) {
+ return finalGroup.withValue(ChangeStringLiteral.withStringValue((J.Literal) finalGroup.getValue(), finalGroupIdValue));
+ }
+ if (e == finalArtifact) {
+ return finalArtifact.withValue(ChangeStringLiteral.withStringValue((J.Literal) finalArtifact.getValue(), finalArtifactIdValue));
+ }
+ if (e == finalVersion) {
+ return finalVersion.withValue(ChangeStringLiteral.withStringValue((J.Literal) finalVersion.getValue(), finalVersionValue));
+ }
+ return e;
+ }));
+ }));
+ }
}
return m;
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyArtifactId.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyArtifactId.java
index ba98f950ca9..02e028fd305 100755
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyArtifactId.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyArtifactId.java
@@ -25,21 +25,18 @@
import org.openrewrite.gradle.util.ChangeStringLiteral;
import org.openrewrite.gradle.util.Dependency;
import org.openrewrite.gradle.util.DependencyStringNotationConverter;
-import org.openrewrite.groovy.GroovyVisitor;
+import org.openrewrite.groovy.GroovyIsoVisitor;
import org.openrewrite.groovy.tree.G;
import org.openrewrite.internal.ListUtils;
import org.openrewrite.internal.StringUtils;
-import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.J;
-import org.openrewrite.maven.tree.GroupArtifact;
-import org.openrewrite.maven.tree.ResolvedDependency;
import org.openrewrite.semver.DependencyMatcher;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.Optional;
import static java.util.Objects.requireNonNull;
@@ -90,38 +87,42 @@ public Validated validate() {
@Override
public TreeVisitor getVisitor() {
- return Preconditions.check(new IsBuildGradle<>(), new GroovyVisitor() {
+ return Preconditions.check(new IsBuildGradle<>(), new GroovyIsoVisitor() {
final DependencyMatcher depMatcher = requireNonNull(DependencyMatcher.build(groupId + ":" + artifactId).getValue());
- final MethodMatcher dependencyDsl = new MethodMatcher("DependencyHandlerSpec *(..)");
- final Map updatedDependencies = new HashMap<>();
+ GradleProject gradleProject;
@Override
- public G visitCompilationUnit(G.CompilationUnit compilationUnit, ExecutionContext ctx) {
- G.CompilationUnit cu = (G.CompilationUnit) super.visitCompilationUnit(compilationUnit, ctx);
- if(cu != compilationUnit) {
- cu = cu.withMarkers(cu.getMarkers().withMarkers(ListUtils.map(cu.getMarkers().getMarkers(), m -> {
- if (m instanceof GradleProject) {
- return updateModel((GradleProject) m, updatedDependencies);
- }
- return m;
- })));
+ public G.CompilationUnit visitCompilationUnit(G.CompilationUnit cu, ExecutionContext ctx) {
+ Optional maybeGp = cu.getMarkers().findFirst(GradleProject.class);
+ if (!maybeGp.isPresent()) {
+ return cu;
+ }
+
+ gradleProject = maybeGp.get();
+
+ G.CompilationUnit g = super.visitCompilationUnit(cu, ctx);
+ if (g != cu) {
+ g = g.withMarkers(g.getMarkers().setByType(updateGradleModel(gradleProject)));
}
- return cu;
+ return g;
}
@Override
- public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
- J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
+ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+ J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
- GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
+ GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
+ .configuration(configuration)
+ .groupId(groupId)
+ .artifactId(artifactId);
- if (!((gradleDependencyMatcher.get(getCursor()).isPresent() || dependencyDsl.matches(m)) && (StringUtils.isBlank(configuration) || m.getSimpleName().equals(configuration)))) {
+ if (!gradleDependencyMatcher.get(getCursor()).isPresent()) {
return m;
}
List depArgs = m.getArguments();
- if (depArgs.get(0) instanceof J.Literal || depArgs.get(0) instanceof G.GString || depArgs.get(0) instanceof G.MapEntry) {
+ if (depArgs.get(0) instanceof J.Literal || depArgs.get(0) instanceof G.GString || depArgs.get(0) instanceof G.MapEntry || depArgs.get(0) instanceof G.MapLiteral) {
m = updateDependency(m);
} else if (depArgs.get(0) instanceof J.MethodInvocation &&
(((J.MethodInvocation) depArgs.get(0)).getSimpleName().equals("platform") ||
@@ -138,11 +139,8 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m) {
String gav = (String) ((J.Literal) depArgs.get(0)).getValue();
if (gav != null) {
Dependency dependency = DependencyStringNotationConverter.parse(gav);
- if (dependency != null && !newArtifactId.equals(dependency.getArtifactId()) &&
- ((dependency.getVersion() == null && depMatcher.matches(dependency.getGroupId(), dependency.getArtifactId())) ||
- (dependency.getVersion() != null && depMatcher.matches(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion())))) {
+ if (dependency != null && !newArtifactId.equals(dependency.getArtifactId())) {
Dependency newDependency = dependency.withArtifactId(newArtifactId);
- updatedDependencies.put(dependency.getGav().asGroupArtifact(), newDependency.getGav().asGroupArtifact());
m = m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> ChangeStringLiteral.withStringValue((J.Literal) arg, newDependency.toStringNotation())));
}
}
@@ -151,10 +149,8 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m) {
if (strings.size() >= 2 &&
strings.get(0) instanceof J.Literal) {
Dependency dependency = DependencyStringNotationConverter.parse((String) requireNonNull(((J.Literal) strings.get(0)).getValue()));
- if (dependency != null && !newArtifactId.equals(dependency.getArtifactId()) &&
- depMatcher.matches(dependency.getGroupId(), dependency.getArtifactId())) {
+ if (dependency != null && !newArtifactId.equals(dependency.getArtifactId())) {
Dependency newDependency = dependency.withArtifactId(newArtifactId);
- updatedDependencies.put(dependency.getGav().asGroupArtifact(), newDependency.getGav().asGroupArtifact());
String replacement = newDependency.toStringNotation();
m = m.withArguments(ListUtils.mapFirst(depArgs, arg -> {
G.GString gString = (G.GString) arg;
@@ -166,7 +162,6 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m) {
G.MapEntry artifactEntry = null;
String groupId = null;
String artifactId = null;
- String version = null;
String versionStringDelimiter = "'";
for (Expression e : depArgs) {
@@ -192,13 +187,9 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m) {
}
artifactEntry = arg;
artifactId = valueValue;
- } else if ("version".equals(keyValue)) {
- version = valueValue;
}
}
- if (groupId == null || artifactId == null ||
- (version == null && !depMatcher.matches(groupId, artifactId)) ||
- (version != null && !depMatcher.matches(groupId, artifactId, version))) {
+ if (groupId == null || artifactId == null) {
return m;
}
String delimiter = versionStringDelimiter;
@@ -211,35 +202,86 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m) {
}
return arg;
}));
+ } else if (depArgs.get(0) instanceof G.MapLiteral) {
+ G.MapLiteral map = (G.MapLiteral) depArgs.get(0);
+ G.MapEntry artifactEntry = null;
+ String groupId = null;
+ String artifactId = null;
+
+ String versionStringDelimiter = "'";
+ for (G.MapEntry arg : map.getElements()) {
+ if (!(arg.getKey() instanceof J.Literal) || !(arg.getValue() instanceof J.Literal)) {
+ continue;
+ }
+ J.Literal key = (J.Literal) arg.getKey();
+ J.Literal value = (J.Literal) arg.getValue();
+ if (!(key.getValue() instanceof String) || !(value.getValue() instanceof String)) {
+ continue;
+ }
+ String keyValue = (String) key.getValue();
+ String valueValue = (String) value.getValue();
+ if ("group".equals(keyValue)) {
+ groupId = valueValue;
+ } else if ("name".equals(keyValue) && !newArtifactId.equals(valueValue)) {
+ if (value.getValueSource() != null) {
+ versionStringDelimiter = value.getValueSource().substring(0, value.getValueSource().indexOf(valueValue));
+ }
+ artifactEntry = arg;
+ artifactId = valueValue;
+ }
+ }
+ if (groupId == null || artifactId == null) {
+ return m;
+ }
+ String delimiter = versionStringDelimiter;
+ G.MapEntry finalArtifact = artifactEntry;
+ m = m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> {
+ G.MapLiteral mapLiteral = (G.MapLiteral) arg;
+ return mapLiteral.withElements(ListUtils.map(mapLiteral.getElements(), e -> {
+ if (e == finalArtifact) {
+ return finalArtifact.withValue(((J.Literal) finalArtifact.getValue())
+ .withValue(newArtifactId)
+ .withValueSource(delimiter + newArtifactId + delimiter));
+ }
+ return e;
+ }));
+ }));
}
return m;
}
- });
- }
- private GradleProject updateModel(GradleProject gp, Map updatedDependencies) {
- Map nameToConfigurations = gp.getNameToConfiguration();
- Map updatedNameToConfigurations = new HashMap<>();
- for (Map.Entry nameToConfiguration : nameToConfigurations.entrySet()) {
- String configurationName = nameToConfiguration.getKey();
- GradleDependencyConfiguration configuration = nameToConfiguration.getValue();
-
- List newRequested = configuration.getRequested()
- .stream()
- .map(requested -> requested.withGav(requested.getGav()
- .withGroupArtifact(updatedDependencies.getOrDefault(requested.getGav().asGroupArtifact(), requested.getGav().asGroupArtifact()))))
- .collect(Collectors.toList());
-
- List newResolved = configuration.getResolved().stream()
- .map(resolved ->
- resolved.withGav(resolved.getGav()
- .withGroupArtifact(updatedDependencies.getOrDefault(resolved.getGav().asGroupArtifact(), resolved.getGav().asGroupArtifact()))))
- .collect(Collectors.toList());
-
- updatedNameToConfigurations.put(configurationName, configuration.withRequested(newRequested).withDirectResolved(newResolved));
- }
-
- return gp.withNameToConfiguration(updatedNameToConfigurations);
+ private GradleProject updateGradleModel(GradleProject gp) {
+ Map nameToConfiguration = gp.getNameToConfiguration();
+ Map newNameToConfiguration = new HashMap<>(nameToConfiguration.size());
+ boolean anyChanged = false;
+ for (GradleDependencyConfiguration gdc : nameToConfiguration.values()) {
+ if (!StringUtils.isBlank(configuration) && configuration.equals(gdc.getName())) {
+ newNameToConfiguration.put(gdc.getName(), gdc);
+ continue;
+ }
+
+ GradleDependencyConfiguration newGdc = gdc;
+ newGdc = newGdc.withRequested(ListUtils.map(gdc.getRequested(), requested -> {
+ if (depMatcher.matches(requested.getGroupId(), requested.getArtifactId())) {
+ return requested.withGav(requested.getGav().withArtifactId(newArtifactId));
+ }
+ return requested;
+ }));
+ newGdc = newGdc.withDirectResolved(ListUtils.map(gdc.getDirectResolved(), resolved -> {
+ if (depMatcher.matches(resolved.getGroupId(), resolved.getArtifactId())) {
+ return resolved.withGav(resolved.getGav().withArtifactId(newArtifactId));
+ }
+ return resolved;
+ }));
+ anyChanged |= newGdc != gdc;
+ newNameToConfiguration.put(newGdc.getName(), newGdc);
+ }
+ if (anyChanged) {
+ gp = gp.withNameToConfiguration(newNameToConfiguration);
+ }
+ return gp;
+ }
+ });
}
}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyClassifier.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyClassifier.java
index c11f7ccd68d..007f0c45ef4 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyClassifier.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyClassifier.java
@@ -19,21 +19,21 @@
import lombok.Value;
import org.jspecify.annotations.Nullable;
import org.openrewrite.*;
+import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
+import org.openrewrite.gradle.marker.GradleProject;
import org.openrewrite.gradle.trait.GradleDependency;
import org.openrewrite.gradle.util.ChangeStringLiteral;
import org.openrewrite.gradle.util.Dependency;
import org.openrewrite.gradle.util.DependencyStringNotationConverter;
-import org.openrewrite.groovy.GroovyVisitor;
+import org.openrewrite.groovy.GroovyIsoVisitor;
import org.openrewrite.groovy.tree.G;
import org.openrewrite.internal.ListUtils;
import org.openrewrite.internal.StringUtils;
-import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.tree.*;
import org.openrewrite.marker.Markers;
import org.openrewrite.semver.DependencyMatcher;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import static java.util.Objects.requireNonNull;
@@ -86,16 +86,36 @@ public Validated validate() {
@Override
public TreeVisitor getVisitor() {
- return Preconditions.check(new IsBuildGradle<>(), new GroovyVisitor() {
+ return Preconditions.check(new IsBuildGradle<>(), new GroovyIsoVisitor() {
final DependencyMatcher depMatcher = requireNonNull(DependencyMatcher.build(groupId + ":" + artifactId).getValue());
- final MethodMatcher dependencyDsl = new MethodMatcher("DependencyHandlerSpec *(..)");
+
+ GradleProject gradleProject;
@Override
- public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
- J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
- GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
+ public G.CompilationUnit visitCompilationUnit(G.CompilationUnit cu, ExecutionContext ctx) {
+ Optional maybeGp = cu.getMarkers().findFirst(GradleProject.class);
+ if (!maybeGp.isPresent()) {
+ return cu;
+ }
+
+ gradleProject = maybeGp.get();
- if (!((gradleDependencyMatcher.get(getCursor()).isPresent() || dependencyDsl.matches(m)) && (StringUtils.isBlank(configuration) || m.getSimpleName().equals(configuration)))) {
+ G.CompilationUnit g = super.visitCompilationUnit(cu, ctx);
+ if (g != cu) {
+ g = g.withMarkers(g.getMarkers().setByType(updateGradleModel(gradleProject)));
+ }
+ return g;
+ }
+
+ @Override
+ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+ J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
+ GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
+ .configuration(configuration)
+ .groupId(groupId)
+ .artifactId(artifactId);
+
+ if (!gradleDependencyMatcher.get(getCursor()).isPresent()) {
return m;
}
@@ -104,8 +124,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
String gav = (String) ((J.Literal) depArgs.get(0)).getValue();
if (gav != null) {
Dependency dependency = DependencyStringNotationConverter.parse(gav);
- if (dependency != null && dependency.getVersion() != null && !Objects.equals(newClassifier, dependency.getClassifier()) &&
- depMatcher.matches(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion())) {
+ if (dependency != null && dependency.getVersion() != null && !Objects.equals(newClassifier, dependency.getClassifier())) {
Dependency newDependency = dependency.withClassifier(newClassifier);
m = m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> ChangeStringLiteral.withStringValue((J.Literal) arg, newDependency.toStringNotation())));
}
@@ -157,10 +176,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
}
index++;
}
- if (groupId == null || artifactId == null ||
- (version == null && !depMatcher.matches(groupId, artifactId)) ||
- (version != null && !depMatcher.matches(groupId, artifactId, version)) ||
- Objects.equals(newClassifier, classifier)) {
+ if (groupId == null || artifactId == null || Objects.equals(newClassifier, classifier)) {
return m;
}
@@ -187,12 +203,118 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
}));
}
}
+ } else if (depArgs.get(0) instanceof G.MapLiteral) {
+ G.MapLiteral map = (G.MapLiteral) depArgs.get(0);
+ G.MapEntry classifierEntry = null;
+ String groupId = null;
+ String artifactId = null;
+ String classifier = null;
+
+ String groupDelimiter = "'";
+ G.MapEntry mapEntry = null;
+ String classifierStringDelimiter = null;
+ int index = 0;
+ for (G.MapEntry arg : map.getElements()) {
+ if (!(arg.getKey() instanceof J.Literal) || !(arg.getValue() instanceof J.Literal)) {
+ continue;
+ }
+ J.Literal key = (J.Literal) arg.getKey();
+ J.Literal value = (J.Literal) arg.getValue();
+ if (!(key.getValue() instanceof String) || !(value.getValue() instanceof String)) {
+ continue;
+ }
+ String keyValue = (String) key.getValue();
+ String valueValue = (String) value.getValue();
+ if ("group".equals(keyValue)) {
+ groupId = valueValue;
+ if (value.getValueSource() != null) {
+ groupDelimiter = value.getValueSource().substring(0, value.getValueSource().indexOf(valueValue));
+ }
+ } else if ("name".equals(keyValue)) {
+ if (index > 0 && mapEntry == null) {
+ mapEntry = arg;
+ }
+ artifactId = valueValue;
+ } else if ("classifier".equals(keyValue)) {
+ if (value.getValueSource() != null) {
+ classifierStringDelimiter = value.getValueSource().substring(0, value.getValueSource().indexOf(valueValue));
+ }
+ classifierEntry = arg;
+ classifier = valueValue;
+ }
+ index++;
+ }
+ if (groupId == null || artifactId == null || Objects.equals(newClassifier, classifier)) {
+ return m;
+ }
+ if (classifier == null) {
+ String delimiter = groupDelimiter;
+ G.MapEntry finalMapEntry = mapEntry;
+ J.Literal keyLiteral = new J.Literal(Tree.randomId(), mapEntry == null ? Space.EMPTY : mapEntry.getKey().getPrefix(), Markers.EMPTY, "classifier", "classifier", null, JavaType.Primitive.String);
+ J.Literal valueLiteral = new J.Literal(Tree.randomId(), mapEntry == null ? Space.EMPTY : mapEntry.getValue().getPrefix(), Markers.EMPTY, newClassifier, delimiter + newClassifier + delimiter, null, JavaType.Primitive.String);
+ m = m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> {
+ G.MapLiteral mapLiteral = (G.MapLiteral) arg;
+ return mapLiteral.withElements(ListUtils.concat(mapLiteral.getElements(), new G.MapEntry(Tree.randomId(), finalMapEntry == null ? Space.EMPTY : finalMapEntry.getPrefix(), Markers.EMPTY, JRightPadded.build(keyLiteral), valueLiteral, null)));
+ }));
+ } else {
+ G.MapEntry finalClassifier = classifierEntry;
+ if (newClassifier == null) {
+ m = m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> {
+ G.MapLiteral mapLiteral = (G.MapLiteral) arg;
+ return mapLiteral.withElements(ListUtils.map(mapLiteral.getElements(), e -> e == finalClassifier ? null : e));
+ }));
+ } else {
+ String delimiter = classifierStringDelimiter; // `classifierStringDelimiter` cannot be null
+ m = m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> {
+ G.MapLiteral mapLiteral = (G.MapLiteral) arg;
+ return mapLiteral.withElements(ListUtils.map(mapLiteral.getElements(), e -> {
+ if (e == finalClassifier) {
+ return finalClassifier.withValue(((J.Literal) finalClassifier.getValue())
+ .withValue(newClassifier)
+ .withValueSource(delimiter + newClassifier + delimiter));
+ }
+ return e;
+ }));
+ }));
+ }
+ }
}
return m;
}
+
+ private GradleProject updateGradleModel(GradleProject gp) {
+ Map nameToConfiguration = gp.getNameToConfiguration();
+ Map newNameToConfiguration = new HashMap<>(nameToConfiguration.size());
+ boolean anyChanged = false;
+ for (GradleDependencyConfiguration gdc : nameToConfiguration.values()) {
+ if (!StringUtils.isBlank(configuration) && !configuration.equals(gdc.getName())) {
+ newNameToConfiguration.put(gdc.getName(), gdc);
+ continue;
+ }
+
+ GradleDependencyConfiguration newGdc = gdc;
+ newGdc = newGdc.withRequested(ListUtils.map(gdc.getRequested(), requested -> {
+ if (depMatcher.matches(requested.getGroupId(), requested.getArtifactId()) && !Objects.equals(requested.getClassifier(), newClassifier)) {
+ return requested.withClassifier(newClassifier);
+ }
+ return requested;
+ }));
+ newGdc = newGdc.withDirectResolved(ListUtils.map(gdc.getDirectResolved(), resolved -> {
+ if (depMatcher.matches(resolved.getGroupId(), resolved.getArtifactId()) && !Objects.equals(resolved.getClassifier(), newClassifier)) {
+ return resolved.withClassifier(newClassifier);
+ }
+ return resolved;
+ }));
+ anyChanged |= newGdc != gdc;
+ newNameToConfiguration.put(newGdc.getName(), newGdc);
+ }
+ if (anyChanged) {
+ gp = gp.withNameToConfiguration(newNameToConfiguration);
+ }
+ return gp;
+ }
});
}
-
}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyConfiguration.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyConfiguration.java
index dd2e0275e5c..ad6747d3a41 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyConfiguration.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyConfiguration.java
@@ -22,9 +22,8 @@
import org.openrewrite.gradle.trait.GradleDependency;
import org.openrewrite.gradle.util.Dependency;
import org.openrewrite.gradle.util.DependencyStringNotationConverter;
-import org.openrewrite.groovy.GroovyVisitor;
+import org.openrewrite.groovy.GroovyIsoVisitor;
import org.openrewrite.groovy.tree.G;
-import org.openrewrite.internal.StringUtils;
import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.J;
@@ -86,16 +85,18 @@ public Duration getEstimatedEffortPerOccurrence() {
@Override
public TreeVisitor getVisitor() {
- return Preconditions.check(new IsBuildGradle<>(), new GroovyVisitor() {
+ return Preconditions.check(new IsBuildGradle<>(), new GroovyIsoVisitor() {
+ // Still need to be able to change the configuration for project dependencies which are not yet supported by the `GradleDependency.Matcher`
final MethodMatcher dependencyDsl = new MethodMatcher("DependencyHandlerSpec *(..)");
@Override
- public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
- J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
+ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+ J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
- GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
+ GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
+ .configuration(configuration);
- if (!((gradleDependencyMatcher.get(getCursor()).isPresent() || dependencyDsl.matches(m)) && (StringUtils.isBlank(configuration) || m.getSimpleName().equals(configuration)))) {
+ if (!(gradleDependencyMatcher.get(getCursor()).isPresent() || dependencyDsl.matches(m))) {
return m;
}
@@ -127,19 +128,65 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
if (dependency == null || !dependencyMatcher.matches(dependency.getGroupId(), dependency.getArtifactId())) {
return m;
}
- } else if (args.get(0) instanceof G.MapEntry && args.size() >= 2) {
- Expression groupValue = ((G.MapEntry) args.get(0)).getValue();
- Expression artifactValue = ((G.MapEntry) args.get(1)).getValue();
- if (!(groupValue instanceof J.Literal) || !(artifactValue instanceof J.Literal)) {
+ } else if (args.get(0) instanceof G.MapEntry) {
+ if (args.size() < 2) {
return m;
}
- J.Literal groupLiteral = (J.Literal) groupValue;
- J.Literal artifactLiteral = (J.Literal) artifactValue;
- if (!(groupLiteral.getValue() instanceof String) || !(artifactLiteral.getValue() instanceof String)) {
+
+ String groupId = null;
+ String artifactId = null;
+ for (Expression e : args) {
+ if (!(e instanceof G.MapEntry)) {
+ continue;
+ }
+ G.MapEntry arg = (G.MapEntry) e;
+ if (!(arg.getKey() instanceof J.Literal) || !(arg.getValue() instanceof J.Literal)) {
+ continue;
+ }
+ J.Literal key = (J.Literal) arg.getKey();
+ J.Literal value = (J.Literal) arg.getValue();
+ if (!(key.getValue() instanceof String) || !(value.getValue() instanceof String)) {
+ continue;
+ }
+ String keyValue = (String) key.getValue();
+ String valueValue = (String) value.getValue();
+ if ("group".equals(keyValue)) {
+ groupId = valueValue;
+ } else if ("name".equals(keyValue)) {
+ artifactId = valueValue;
+ }
+ }
+
+ if (artifactId == null || !dependencyMatcher.matches(groupId, artifactId)) {
return m;
}
+ } else if (args.get(0) instanceof G.MapLiteral) {
+ if (args.size() < 2) {
+ return m;
+ }
+
+ G.MapLiteral map = (G.MapLiteral) args.get(0);
+ String groupId = null;
+ String artifactId = null;
+ for (G.MapEntry arg : map.getElements()) {
+ if (!(arg.getKey() instanceof J.Literal) || !(arg.getValue() instanceof J.Literal)) {
+ continue;
+ }
+ J.Literal key = (J.Literal) arg.getKey();
+ J.Literal value = (J.Literal) arg.getValue();
+ if (!(key.getValue() instanceof String) || !(value.getValue() instanceof String)) {
+ continue;
+ }
+ String keyValue = (String) key.getValue();
+ String valueValue = (String) value.getValue();
+ if ("group".equals(keyValue)) {
+ groupId = valueValue;
+ } else if ("name".equals(keyValue)) {
+ artifactId = valueValue;
+ }
+ }
- if (!dependencyMatcher.matches((String) groupLiteral.getValue(), (String) artifactLiteral.getValue())) {
+ if (artifactId == null || !dependencyMatcher.matches(groupId, artifactId)) {
return m;
}
} else if (args.get(0) instanceof J.MethodInvocation) {
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyExtension.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyExtension.java
index a6a617f627b..dc103c00f75 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyExtension.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyExtension.java
@@ -23,19 +23,15 @@
import org.openrewrite.gradle.util.ChangeStringLiteral;
import org.openrewrite.gradle.util.Dependency;
import org.openrewrite.gradle.util.DependencyStringNotationConverter;
-import org.openrewrite.groovy.GroovyVisitor;
+import org.openrewrite.groovy.GroovyIsoVisitor;
import org.openrewrite.groovy.tree.G;
import org.openrewrite.internal.ListUtils;
-import org.openrewrite.internal.StringUtils;
-import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.J;
import org.openrewrite.semver.DependencyMatcher;
import java.util.List;
-import static java.util.Objects.requireNonNull;
-
@Value
@EqualsAndHashCode(callSuper = false)
public class ChangeDependencyExtension extends Recipe {
@@ -83,17 +79,17 @@ public Validated validate() {
@Override
public TreeVisitor getVisitor() {
- return Preconditions.check(new IsBuildGradle<>(), new GroovyVisitor() {
- final DependencyMatcher depMatcher = requireNonNull(DependencyMatcher.build(groupId + ":" + artifactId).getValue());
- final MethodMatcher dependencyDsl = new MethodMatcher("DependencyHandlerSpec *(..)");
-
+ return Preconditions.check(new IsBuildGradle<>(), new GroovyIsoVisitor() {
@Override
- public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
- J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
+ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+ J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
- GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
+ GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
+ .configuration(configuration)
+ .groupId(groupId)
+ .artifactId(artifactId);
- if (!((gradleDependencyMatcher.get(getCursor()).isPresent() || dependencyDsl.matches(m)) && (StringUtils.isBlank(configuration) || m.getSimpleName().equals(configuration)))) {
+ if (!gradleDependencyMatcher.get(getCursor()).isPresent()) {
return m;
}
@@ -102,9 +98,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
String gav = (String) ((J.Literal) depArgs.get(0)).getValue();
if (gav != null) {
Dependency dependency = DependencyStringNotationConverter.parse(gav);
- if (dependency != null && !newExtension.equals(dependency.getExt()) &&
- ((dependency.getVersion() == null && depMatcher.matches(dependency.getGroupId(), dependency.getArtifactId())) ||
- (dependency.getVersion() != null && depMatcher.matches(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion())))) {
+ if (dependency != null && !newExtension.equals(dependency.getExt())) {
Dependency newDependency = dependency.withExt(newExtension);
m = m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> ChangeStringLiteral.withStringValue((J.Literal) arg, newDependency.toStringNotation())));
}
@@ -113,7 +107,6 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
G.MapEntry extensionEntry = null;
String groupId = null;
String artifactId = null;
- String version = null;
String extension = null;
String extensionStringDelimiter = "'";
@@ -136,8 +129,6 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
groupId = valueValue;
} else if ("name".equals(keyValue)) {
artifactId = valueValue;
- } else if ("version".equals(keyValue)) {
- version = valueValue;
} else if ("ext".equals(keyValue) && !newExtension.equals(valueValue)) {
if (value.getValueSource() != null) {
extensionStringDelimiter = value.getValueSource().substring(0, value.getValueSource().indexOf(valueValue));
@@ -146,10 +137,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
extension = valueValue;
}
}
- if (groupId == null || artifactId == null ||
- (version == null && !depMatcher.matches(groupId, artifactId)) ||
- (version != null && !depMatcher.matches(groupId, artifactId, version)) ||
- extension == null) {
+ if (groupId == null || artifactId == null || extension == null) {
return m;
}
String delimiter = extensionStringDelimiter;
@@ -162,6 +150,53 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
}
return arg;
}));
+ } else if (depArgs.get(0) instanceof G.MapLiteral) {
+ G.MapLiteral map = (G.MapLiteral) depArgs.get(0);
+ G.MapEntry extensionEntry = null;
+ String groupId = null;
+ String artifactId = null;
+ String extension = null;
+
+ String extensionStringDelimiter = "'";
+ for (G.MapEntry arg : map.getElements()) {
+ if (!(arg.getKey() instanceof J.Literal) || !(arg.getValue() instanceof J.Literal)) {
+ continue;
+ }
+ J.Literal key = (J.Literal) arg.getKey();
+ J.Literal value = (J.Literal) arg.getValue();
+ if (!(key.getValue() instanceof String) || !(value.getValue() instanceof String)) {
+ continue;
+ }
+ String keyValue = (String) key.getValue();
+ String valueValue = (String) value.getValue();
+ if ("group".equals(keyValue)) {
+ groupId = valueValue;
+ } else if ("name".equals(keyValue)) {
+ artifactId = valueValue;
+ } else if ("ext".equals(keyValue) && !newExtension.equals(valueValue)) {
+ if (value.getValueSource() != null) {
+ extensionStringDelimiter = value.getValueSource().substring(0, value.getValueSource().indexOf(valueValue));
+ }
+ extensionEntry = arg;
+ extension = valueValue;
+ }
+ }
+ if (groupId == null || artifactId == null || extension == null) {
+ return m;
+ }
+ String delimiter = extensionStringDelimiter;
+ G.MapEntry finalExtension = extensionEntry;
+ m = m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> {
+ G.MapLiteral mapLiteral = (G.MapLiteral) arg;
+ return mapLiteral.withElements(ListUtils.map(mapLiteral.getElements(), e -> {
+ if (e == finalExtension) {
+ return finalExtension.withValue(((J.Literal) finalExtension.getValue())
+ .withValue(newExtension)
+ .withValueSource(delimiter + newExtension + delimiter));
+ }
+ return e;
+ }));
+ }));
}
return m;
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyGroupId.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyGroupId.java
index 550b71f1492..ade503f67d1 100755
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyGroupId.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/ChangeDependencyGroupId.java
@@ -25,21 +25,18 @@
import org.openrewrite.gradle.util.ChangeStringLiteral;
import org.openrewrite.gradle.util.Dependency;
import org.openrewrite.gradle.util.DependencyStringNotationConverter;
-import org.openrewrite.groovy.GroovyVisitor;
+import org.openrewrite.groovy.GroovyIsoVisitor;
import org.openrewrite.groovy.tree.G;
import org.openrewrite.internal.ListUtils;
import org.openrewrite.internal.StringUtils;
-import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.J;
-import org.openrewrite.maven.tree.GroupArtifact;
-import org.openrewrite.maven.tree.ResolvedDependency;
import org.openrewrite.semver.DependencyMatcher;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.Optional;
import static java.util.Objects.requireNonNull;
@@ -90,38 +87,42 @@ public Validated validate() {
@Override
public TreeVisitor getVisitor() {
- return Preconditions.check(new IsBuildGradle<>(), new GroovyVisitor() {
+ return Preconditions.check(new IsBuildGradle<>(), new GroovyIsoVisitor() {
final DependencyMatcher depMatcher = requireNonNull(DependencyMatcher.build(groupId + ":" + artifactId).getValue());
- final MethodMatcher dependencyDsl = new MethodMatcher("DependencyHandlerSpec *(..)");
- final Map updatedDependencies = new HashMap<>();
+ GradleProject gradleProject;
@Override
- public G visitCompilationUnit(G.CompilationUnit compilationUnit, ExecutionContext ctx) {
- G.CompilationUnit cu = (G.CompilationUnit) super.visitCompilationUnit(compilationUnit, ctx);
- if(cu != compilationUnit) {
- cu = cu.withMarkers(cu.getMarkers().withMarkers(ListUtils.map(cu.getMarkers().getMarkers(), m -> {
- if (m instanceof GradleProject) {
- return updateModel((GradleProject) m, updatedDependencies);
- }
- return m;
- })));
+ public G.CompilationUnit visitCompilationUnit(G.CompilationUnit cu, ExecutionContext ctx) {
+ Optional maybeGp = cu.getMarkers().findFirst(GradleProject.class);
+ if (!maybeGp.isPresent()) {
+ return cu;
+ }
+
+ gradleProject = maybeGp.get();
+
+ G.CompilationUnit g = super.visitCompilationUnit(cu, ctx);
+ if (g != cu) {
+ g = g.withMarkers(g.getMarkers().setByType(updateGradleModel(gradleProject)));
}
- return cu;
+ return g;
}
@Override
- public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
- J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
+ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+ J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
- GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
+ GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
+ .configuration(configuration)
+ .groupId(groupId)
+ .artifactId(artifactId);
- if (!((gradleDependencyMatcher.get(getCursor()).isPresent() || dependencyDsl.matches(m)) && (StringUtils.isBlank(configuration) || m.getSimpleName().equals(configuration)))) {
+ if (!gradleDependencyMatcher.get(getCursor()).isPresent()) {
return m;
}
List depArgs = m.getArguments();
- if (depArgs.get(0) instanceof J.Literal || depArgs.get(0) instanceof G.GString || depArgs.get(0) instanceof G.MapEntry) {
+ if (depArgs.get(0) instanceof J.Literal || depArgs.get(0) instanceof G.GString || depArgs.get(0) instanceof G.MapEntry || depArgs.get(0) instanceof G.MapLiteral) {
m = updateDependency(m);
} else if (depArgs.get(0) instanceof J.MethodInvocation &&
(((J.MethodInvocation) depArgs.get(0)).getSimpleName().equals("platform") ||
@@ -138,11 +139,8 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m) {
String gav = (String) ((J.Literal) depArgs.get(0)).getValue();
if (gav != null) {
Dependency dependency = DependencyStringNotationConverter.parse(gav);
- if (dependency != null && !newGroupId.equals(dependency.getGroupId()) &&
- ((dependency.getVersion() == null && depMatcher.matches(dependency.getGroupId(), dependency.getArtifactId())) ||
- (dependency.getVersion() != null && depMatcher.matches(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion())))) {
+ if (dependency != null && !newGroupId.equals(dependency.getGroupId())) {
Dependency newDependency = dependency.withGroupId(newGroupId);
- updatedDependencies.put(dependency.getGav().asGroupArtifact(), newDependency.getGav().asGroupArtifact());
m = m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> ChangeStringLiteral.withStringValue((J.Literal) arg, newDependency.toStringNotation())));
}
}
@@ -151,10 +149,8 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m) {
if (strings.size() >= 2 &&
strings.get(0) instanceof J.Literal) {
Dependency dependency = DependencyStringNotationConverter.parse((String) requireNonNull(((J.Literal) strings.get(0)).getValue()));
- if (dependency != null && !newGroupId.equals(dependency.getGroupId()) &&
- depMatcher.matches(dependency.getGroupId(), dependency.getArtifactId())) {
+ if (dependency != null && !newGroupId.equals(dependency.getGroupId())) {
Dependency newDependency = dependency.withGroupId(newGroupId);
- updatedDependencies.put(dependency.getGav().asGroupArtifact(), newDependency.getGav().asGroupArtifact());
String replacement = newDependency.toStringNotation();
m = m.withArguments(ListUtils.mapFirst(depArgs, arg -> {
G.GString gString = (G.GString) arg;
@@ -166,7 +162,6 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m) {
G.MapEntry groupEntry = null;
String groupId = null;
String artifactId = null;
- String version = null;
String versionStringDelimiter = "'";
for (Expression e : depArgs) {
@@ -192,13 +187,9 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m) {
groupId = valueValue;
} else if ("name".equals(keyValue)) {
artifactId = valueValue;
- } else if ("version".equals(keyValue)) {
- version = valueValue;
}
}
- if (groupId == null || artifactId == null ||
- (version == null && !depMatcher.matches(groupId, artifactId)) ||
- (version != null && !depMatcher.matches(groupId, artifactId, version))) {
+ if (groupId == null || artifactId == null) {
return m;
}
String delimiter = versionStringDelimiter;
@@ -211,35 +202,86 @@ private J.MethodInvocation updateDependency(J.MethodInvocation m) {
}
return arg;
}));
+ } else if (depArgs.get(0) instanceof G.MapLiteral) {
+ G.MapLiteral map = (G.MapLiteral) depArgs.get(0);
+ G.MapEntry groupEntry = null;
+ String groupId = null;
+ String artifactId = null;
+
+ String versionStringDelimiter = "'";
+ for (G.MapEntry arg : map.getElements()) {
+ if (!(arg.getKey() instanceof J.Literal) || !(arg.getValue() instanceof J.Literal)) {
+ continue;
+ }
+ J.Literal key = (J.Literal) arg.getKey();
+ J.Literal value = (J.Literal) arg.getValue();
+ if (!(key.getValue() instanceof String) || !(value.getValue() instanceof String)) {
+ continue;
+ }
+ String keyValue = (String) key.getValue();
+ String valueValue = (String) value.getValue();
+ if ("group".equals(keyValue) && !newGroupId.equals(valueValue)) {
+ if (value.getValueSource() != null) {
+ versionStringDelimiter = value.getValueSource().substring(0, value.getValueSource().indexOf(valueValue));
+ }
+ groupEntry = arg;
+ groupId = valueValue;
+ } else if ("name".equals(keyValue)) {
+ artifactId = valueValue;
+ }
+ }
+ if (groupId == null || artifactId == null) {
+ return m;
+ }
+ String delimiter = versionStringDelimiter;
+ G.MapEntry finalGroup = groupEntry;
+ m = m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> {
+ G.MapLiteral mapLiteral = (G.MapLiteral) arg;
+ return mapLiteral.withElements(ListUtils.map(mapLiteral.getElements(), e -> {
+ if (e == finalGroup) {
+ return finalGroup.withValue(((J.Literal) finalGroup.getValue())
+ .withValue(newGroupId)
+ .withValueSource(delimiter + newGroupId + delimiter));
+ }
+ return e;
+ }));
+ }));
}
return m;
}
- });
- }
- private GradleProject updateModel(GradleProject gp, Map updatedDependencies) {
- Map nameToConfigurations = gp.getNameToConfiguration();
- Map updatedNameToConfigurations = new HashMap<>();
- for (Map.Entry nameToConfiguration : nameToConfigurations.entrySet()) {
- String configurationName = nameToConfiguration.getKey();
- GradleDependencyConfiguration configuration = nameToConfiguration.getValue();
-
- List newRequested = configuration.getRequested()
- .stream()
- .map(requested -> requested.withGav(requested.getGav()
- .withGroupArtifact(updatedDependencies.getOrDefault(requested.getGav().asGroupArtifact(), requested.getGav().asGroupArtifact()))))
- .collect(Collectors.toList());
-
- List newResolved = configuration.getResolved().stream()
- .map(resolved ->
- resolved.withGav(resolved.getGav()
- .withGroupArtifact(updatedDependencies.getOrDefault(resolved.getGav().asGroupArtifact(), resolved.getGav().asGroupArtifact()))))
- .collect(Collectors.toList());
-
- updatedNameToConfigurations.put(configurationName, configuration.withRequested(newRequested).withDirectResolved(newResolved));
- }
-
- return gp.withNameToConfiguration(updatedNameToConfigurations);
+ private GradleProject updateGradleModel(GradleProject gp) {
+ Map nameToConfiguration = gp.getNameToConfiguration();
+ Map newNameToConfiguration = new HashMap<>(nameToConfiguration.size());
+ boolean anyChanged = false;
+ for (GradleDependencyConfiguration gdc : nameToConfiguration.values()) {
+ if (!StringUtils.isBlank(configuration) && configuration.equals(gdc.getName())) {
+ newNameToConfiguration.put(gdc.getName(), gdc);
+ continue;
+ }
+
+ GradleDependencyConfiguration newGdc = gdc;
+ newGdc = newGdc.withRequested(ListUtils.map(gdc.getRequested(), requested -> {
+ if (depMatcher.matches(requested.getGroupId(), requested.getArtifactId())) {
+ return requested.withGav(requested.getGav().withGroupId(newGroupId));
+ }
+ return requested;
+ }));
+ newGdc = newGdc.withDirectResolved(ListUtils.map(gdc.getDirectResolved(), resolved -> {
+ if (depMatcher.matches(resolved.getGroupId(), resolved.getArtifactId())) {
+ return resolved.withGav(resolved.getGav().withGroupId(newGroupId));
+ }
+ return resolved;
+ }));
+ anyChanged |= newGdc != gdc;
+ newNameToConfiguration.put(newGdc.getName(), newGdc);
+ }
+ if (anyChanged) {
+ gp = gp.withNameToConfiguration(newNameToConfiguration);
+ }
+ return gp;
+ }
+ });
}
}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseMapNotation.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseMapNotation.java
index 984523ff5d8..301fb375987 100755
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseMapNotation.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseMapNotation.java
@@ -25,7 +25,6 @@
import org.openrewrite.groovy.GroovyVisitor;
import org.openrewrite.groovy.tree.G;
import org.openrewrite.internal.ListUtils;
-import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.tree.*;
import org.openrewrite.marker.Markers;
@@ -53,15 +52,13 @@ public String getDescription() {
@Override
public TreeVisitor getVisitor() {
return Preconditions.check(new IsBuildGradle<>(), new GroovyVisitor() {
- final MethodMatcher dependencyDsl = new MethodMatcher("DependencyHandlerSpec *(..)");
-
@Override
public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
- if (!(gradleDependencyMatcher.get(getCursor()).isPresent() || dependencyDsl.matches(m))) {
+ if (!gradleDependencyMatcher.get(getCursor()).isPresent()) {
return m;
}
m = forBasicString(m);
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseStringNotation.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseStringNotation.java
index b3c17260f90..17f8b300a05 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseStringNotation.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyUseStringNotation.java
@@ -23,7 +23,6 @@
import org.openrewrite.gradle.trait.GradleDependency;
import org.openrewrite.groovy.GroovyVisitor;
import org.openrewrite.groovy.tree.G;
-import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.J;
import org.openrewrite.java.tree.JavaType;
@@ -50,15 +49,13 @@ public String getDescription() {
@Override
public TreeVisitor getVisitor() {
return Preconditions.check(new IsBuildGradle<>(), new GroovyVisitor() {
- final MethodMatcher dependencyDsl = new MethodMatcher("DependencyHandlerSpec *(..)");
-
@Override
public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
- if (!(gradleDependencyMatcher.get(getCursor()).isPresent() || dependencyDsl.matches(m))) {
+ if (!gradleDependencyMatcher.get(getCursor()).isPresent()) {
return m;
}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyVersionSelector.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyVersionSelector.java
index 143c12ea29a..f33fe49a3e4 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyVersionSelector.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/DependencyVersionSelector.java
@@ -185,7 +185,9 @@ private List determineRepos(@Nullable String configuration) {
if (gradleSettings != null) {
return gradleSettings.getBuildscript().getMavenRepositories();
}
- Objects.requireNonNull(gradleProject);
+ if (gradleProject == null) {
+ throw new IllegalStateException("Gradle project must be set to determine repositories."); // Caught by caller
+ }
return "classpath".equals(configuration) ?
gradleProject.getBuildscript().getMavenRepositories() :
gradleProject.getMavenRepositories();
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/EnableDevelocityBuildCache.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/EnableDevelocityBuildCache.java
new file mode 100644
index 00000000000..f15ab6ac8cc
--- /dev/null
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/EnableDevelocityBuildCache.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.gradle;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.jspecify.annotations.Nullable;
+import org.openrewrite.*;
+import org.openrewrite.groovy.GroovyIsoVisitor;
+import org.openrewrite.groovy.tree.G;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.internal.StringUtils;
+import org.openrewrite.java.tree.J;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+@Value
+@EqualsAndHashCode(callSuper = false)
+public class EnableDevelocityBuildCache extends Recipe {
+
+ @Override
+ public String getDisplayName() {
+ return "Enable Develocity build cache";
+ }
+
+ @Override
+ public String getDescription() {
+ return "Adds `buildCache` configuration to `develocity` where not yet present.";
+ }
+
+ @Option(displayName = "Enable remote build cache",
+ description = "Value for `//develocity/buildCache/remote/enabled`.",
+ example = "true",
+ required = false)
+ @Nullable
+ String remoteEnabled;
+
+ @Option(displayName = "Enable remote build cache push",
+ description = "Value for `//develocity/buildCache/remote/storeEnabled`.",
+ example = "System.getenv(\"CI\") != null",
+ required = false)
+ @Nullable
+ String remotePushEnabled;
+
+ @Override
+ public Validated validate(ExecutionContext ctx) {
+ return super.validate(ctx)
+ .and(Validated.notBlank("remoteEnabled", remoteEnabled)
+ .or(Validated.notBlank("remotePushEnabled", remotePushEnabled)));
+ }
+
+ @Override
+ public TreeVisitor getVisitor() {
+ return Preconditions.check(new IsSettingsGradle<>(), new GroovyIsoVisitor() {
+ @Override
+ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+ if ("develocity".equals(method.getSimpleName()) && !hasBuildCache(method)) {
+ J.MethodInvocation buildCache = createBuildCache();
+ return maybeAutoFormat(method, method.withArguments(ListUtils.mapFirst(method.getArguments(), arg -> {
+ if (arg instanceof J.Lambda) {
+ J.Lambda lambda = (J.Lambda) arg;
+ J.Block block = (J.Block) lambda.getBody();
+ return lambda.withBody(block.withStatements(ListUtils.concat(block.getStatements(), buildCache)));
+ }
+ return arg;
+ })), ctx);
+ }
+ return method;
+ }
+
+ private boolean hasBuildCache(J.MethodInvocation m) {
+ return new GroovyIsoVisitor() {
+ @Override
+ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, AtomicBoolean atomicBoolean) {
+ if ("buildCache".equals(method.getSimpleName())) {
+ atomicBoolean.set(true);
+ return method;
+ }
+ return super.visitMethodInvocation(method, atomicBoolean);
+ }
+ }.reduce(m, new AtomicBoolean(false), getCursor().getParentTreeCursor()).get();
+ }
+ });
+ }
+
+ private J.MethodInvocation createBuildCache() {
+ String conf = "buildCache {\n" +
+ " remote(develocity.buildCache) {\n";
+ if (!StringUtils.isBlank(remoteEnabled)) {
+ conf += " enabled = " + remoteEnabled + "\n";
+ }
+ if (!StringUtils.isBlank(remotePushEnabled)) {
+ conf += " push = " + remotePushEnabled + "\n";
+ }
+ conf += " }" +
+ "}";
+ return (J.MethodInvocation) GradleParser.builder().build()
+ .parse(conf)
+ .map(G.CompilationUnit.class::cast)
+ .findFirst()
+ .orElseThrow(() -> new IllegalArgumentException("Could not parse as Gradle"))
+ .getStatements()
+ .get(0);
+ }
+}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveDependency.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveDependency.java
index f38e853fbe6..b05ac29701b 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveDependency.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveDependency.java
@@ -15,7 +15,6 @@
*/
package org.openrewrite.gradle;
-import io.micrometer.core.instrument.util.StringUtils;
import lombok.EqualsAndHashCode;
import lombok.Value;
import org.jspecify.annotations.Nullable;
@@ -23,17 +22,14 @@
import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
import org.openrewrite.gradle.marker.GradleProject;
import org.openrewrite.gradle.trait.GradleDependency;
-import org.openrewrite.gradle.util.Dependency;
-import org.openrewrite.gradle.util.DependencyStringNotationConverter;
-import org.openrewrite.groovy.GroovyVisitor;
+import org.openrewrite.groovy.GroovyIsoVisitor;
import org.openrewrite.groovy.tree.G;
import org.openrewrite.internal.ListUtils;
-import org.openrewrite.java.MethodMatcher;
-import org.openrewrite.java.tree.Expression;
+import org.openrewrite.internal.StringUtils;
import org.openrewrite.java.tree.J;
import org.openrewrite.semver.DependencyMatcher;
-import java.util.List;
+import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
@@ -77,55 +73,35 @@ public String getDescription() {
@Override
public TreeVisitor getVisitor() {
- return Preconditions.check(new IsBuildGradle<>(), new GroovyVisitor() {
- final MethodMatcher dependencyDsl = new MethodMatcher("DependencyHandlerSpec *(..)");
- final DependencyMatcher dependencyMatcher = requireNonNull(DependencyMatcher.build(groupId + ":" + artifactId).getValue());
+ return Preconditions.check(new IsBuildGradle<>(), new GroovyIsoVisitor() {
+ final GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher()
+ .configuration(configuration)
+ .groupId(groupId)
+ .artifactId(artifactId);
+ final DependencyMatcher depMatcher = requireNonNull(DependencyMatcher.build(groupId + ":" + artifactId).getValue());
+
+ GradleProject gradleProject;
@Override
- public J visitCompilationUnit(G.CompilationUnit cu, ExecutionContext ctx) {
- G.CompilationUnit g = (G.CompilationUnit) super.visitCompilationUnit(cu, ctx);
- if (g == cu) {
+ public G.CompilationUnit visitCompilationUnit(G.CompilationUnit cu, ExecutionContext ctx) {
+ Optional maybeGp = cu.getMarkers().findFirst(GradleProject.class);
+ if (!maybeGp.isPresent()) {
return cu;
}
- Optional maybeGp = g.getMarkers().findFirst(GradleProject.class);
- if (!maybeGp.isPresent()) {
- // Allow modification of freestanding scripts which do not carry a GradleProject marker
- return g;
- }
+ gradleProject = maybeGp.get();
- GradleProject gp = maybeGp.get();
- Map nameToConfiguration = gp.getNameToConfiguration();
- boolean anyChanged = false;
- for (GradleDependencyConfiguration gdc : nameToConfiguration.values()) {
- GradleDependencyConfiguration newGdc = gdc.withRequested(ListUtils.map(gdc.getRequested(), requested -> {
- if (requested.getGroupId() != null && dependencyMatcher.matches(requested.getGroupId(), requested.getArtifactId())) {
- return null;
- }
- return requested;
- }));
- newGdc = newGdc.withDirectResolved(ListUtils.map(newGdc.getDirectResolved(), resolved -> {
- if (dependencyMatcher.matches(resolved.getGroupId(), resolved.getArtifactId())) {
- return null;
- }
- return resolved;
- }));
- nameToConfiguration.put(newGdc.getName(), newGdc);
- anyChanged |= newGdc != gdc;
- }
-
- if (!anyChanged) {
- // instance was changed, but no marker update is needed
- return g;
+ G.CompilationUnit g = super.visitCompilationUnit(cu, ctx);
+ if (g != cu) {
+ g = g.withMarkers(g.getMarkers().setByType(updateGradleModel(gradleProject)));
}
-
- return g.withMarkers(g.getMarkers().setByType(gp.withNameToConfiguration(nameToConfiguration)));
+ return g;
}
@Override
- public @Nullable J visitReturn(J.Return return_, ExecutionContext ctx) {
- boolean dependencyInvocation = return_.getExpression() instanceof J.MethodInvocation && dependencyDsl.matches((J.MethodInvocation) return_.getExpression());
- J.Return r = (J.Return) super.visitReturn(return_, ctx);
+ public J.@Nullable Return visitReturn(J.Return return_, ExecutionContext ctx) {
+ boolean dependencyInvocation = return_.getExpression() instanceof J.MethodInvocation && gradleDependencyMatcher.get(return_.getExpression(), getCursor()).isPresent();
+ J.Return r = super.visitReturn(return_, ctx);
if (dependencyInvocation && r.getExpression() == null) {
//noinspection DataFlowIssue
return null;
@@ -134,86 +110,46 @@ public J visitCompilationUnit(G.CompilationUnit cu, ExecutionContext ctx) {
}
@Override
- public @Nullable J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
- J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
-
- GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
-
- if ((gradleDependencyMatcher.get(getCursor()).isPresent() || dependencyDsl.matches(m)) && (StringUtils.isEmpty(configuration) || configuration.equals(m.getSimpleName()))) {
- Expression firstArgument = m.getArguments().get(0);
- if (firstArgument instanceof J.Literal || firstArgument instanceof G.GString || firstArgument instanceof G.MapEntry) {
- //noinspection DataFlowIssue
- return maybeRemoveDependency(m);
- } else if (firstArgument instanceof J.MethodInvocation &&
- (((J.MethodInvocation) firstArgument).getSimpleName().equals("platform") ||
- ((J.MethodInvocation) firstArgument).getSimpleName().equals("enforcedPlatform"))) {
- J after = maybeRemoveDependency((J.MethodInvocation) firstArgument);
- if (after == null) {
- //noinspection DataFlowIssue
- return null;
- }
- }
+ public J.@Nullable MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+ J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
+
+ if (gradleDependencyMatcher.get(getCursor()).isPresent()) {
+ return null;
}
return m;
}
- private @Nullable J maybeRemoveDependency(J.MethodInvocation m) {
- if (m.getArguments().get(0) instanceof G.GString) {
- G.GString gString = (G.GString) m.getArguments().get(0);
- List strings = gString.getStrings();
- if (strings.size() != 2 || !(strings.get(0) instanceof J.Literal) || !(strings.get(1) instanceof G.GString.Value)) {
- return m;
- }
- J.Literal groupArtifact = (J.Literal) strings.get(0);
- if (!(groupArtifact.getValue() instanceof String)) {
- return m;
- }
- Dependency dependency = DependencyStringNotationConverter.parse((String) groupArtifact.getValue());
- if (dependency != null && dependencyMatcher.matches(dependency.getGroupId(), dependency.getArtifactId())) {
- return null;
- }
- } else if (m.getArguments().get(0) instanceof J.Literal) {
- Object value = ((J.Literal) m.getArguments().get(0)).getValue();
- if(!(value instanceof String)) {
- return null;
- }
- Dependency dependency = DependencyStringNotationConverter.parse((String) value);
- if (dependency != null && dependencyMatcher.matches(dependency.getGroupId(), dependency.getArtifactId())) {
- return null;
+ private GradleProject updateGradleModel(GradleProject gp) {
+ Map nameToConfiguration = gp.getNameToConfiguration();
+ Map newNameToConfiguration = new HashMap<>(nameToConfiguration.size());
+ boolean anyChanged = false;
+ for (GradleDependencyConfiguration gdc : nameToConfiguration.values()) {
+ if (!StringUtils.isBlank(configuration) && configuration.equals(gdc.getName())) {
+ newNameToConfiguration.put(gdc.getName(), gdc);
+ continue;
}
- } else if (m.getArguments().get(0) instanceof G.MapEntry) {
- String groupId = null;
- String artifactId = null;
- for (Expression e : m.getArguments()) {
- if (!(e instanceof G.MapEntry)) {
- continue;
- }
- G.MapEntry arg = (G.MapEntry) e;
- if (!(arg.getKey() instanceof J.Literal) || !(arg.getValue() instanceof J.Literal)) {
- continue;
- }
- J.Literal key = (J.Literal) arg.getKey();
- J.Literal value = (J.Literal) arg.getValue();
- if (!(key.getValue() instanceof String) || !(value.getValue() instanceof String)) {
- continue;
+ GradleDependencyConfiguration newGdc = gdc;
+ newGdc = newGdc.withRequested(ListUtils.map(gdc.getRequested(), requested -> {
+ if (depMatcher.matches(requested.getGroupId(), requested.getArtifactId())) {
+ return null;
}
- String keyValue = (String) key.getValue();
- String valueValue = (String) value.getValue();
- if ("group".equals(keyValue)) {
- groupId = valueValue;
- } else if ("name".equals(keyValue)) {
- artifactId = valueValue;
+ return requested;
+ }));
+ newGdc = newGdc.withDirectResolved(ListUtils.map(gdc.getDirectResolved(), resolved -> {
+ if (depMatcher.matches(resolved.getGroupId(), resolved.getArtifactId())) {
+ return null;
}
- }
-
- if (groupId != null && artifactId != null && dependencyMatcher.matches(groupId, artifactId)) {
- return null;
- }
+ return resolved;
+ }));
+ anyChanged |= newGdc != gdc;
+ newNameToConfiguration.put(newGdc.getName(), newGdc);
}
-
- return m;
+ if (anyChanged) {
+ gp = gp.withNameToConfiguration(newNameToConfiguration);
+ }
+ return gp;
}
});
}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveRedundantDependencyVersions.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveRedundantDependencyVersions.java
new file mode 100644
index 00000000000..a2cd1dab3b3
--- /dev/null
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveRedundantDependencyVersions.java
@@ -0,0 +1,316 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.gradle;
+
+import lombok.EqualsAndHashCode;
+import lombok.Value;
+import org.jspecify.annotations.Nullable;
+import org.openrewrite.*;
+import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
+import org.openrewrite.gradle.marker.GradleProject;
+import org.openrewrite.gradle.trait.GradleDependency;
+import org.openrewrite.gradle.util.ChangeStringLiteral;
+import org.openrewrite.gradle.util.Dependency;
+import org.openrewrite.gradle.util.DependencyStringNotationConverter;
+import org.openrewrite.groovy.GroovyIsoVisitor;
+import org.openrewrite.groovy.tree.G;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.internal.StringUtils;
+import org.openrewrite.java.MethodMatcher;
+import org.openrewrite.java.tree.Expression;
+import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaType;
+import org.openrewrite.maven.MavenDownloadingException;
+import org.openrewrite.maven.internal.MavenPomDownloader;
+import org.openrewrite.maven.tree.GroupArtifactVersion;
+import org.openrewrite.maven.tree.ResolvedDependency;
+import org.openrewrite.maven.tree.ResolvedPom;
+import org.openrewrite.semver.ExactVersion;
+import org.openrewrite.semver.LatestIntegration;
+import org.openrewrite.semver.Semver;
+import org.openrewrite.semver.VersionComparator;
+
+import java.util.*;
+
+@Value
+@EqualsAndHashCode(callSuper = false)
+public class RemoveRedundantDependencyVersions extends Recipe {
+ @Option(displayName = "Group",
+ description = "Group glob expression pattern used to match dependencies that should be managed." +
+ "Group is the first part of a dependency coordinate `com.google.guava:guava:VERSION`.",
+ example = "com.google.*",
+ required = false)
+ @Nullable
+ String groupPattern;
+
+ @Option(displayName = "Artifact",
+ description = "Artifact glob expression pattern used to match dependencies that should be managed." +
+ "Artifact is the second part of a dependency coordinate `com.google.guava:guava:VERSION`.",
+ example = "guava*",
+ required = false)
+ @Nullable
+ String artifactPattern;
+
+ @Option(displayName = "Only if managed version is ...",
+ description = "Only remove the explicit version if the managed version has the specified comparative relationship to the explicit version. " +
+ "For example, `gte` will only remove the explicit version if the managed version is the same or newer. " +
+ "Default `eq`.",
+ valid = {"any", "eq", "lt", "lte", "gt", "gte"},
+ required = false)
+ @Nullable
+ Comparator onlyIfManagedVersionIs;
+
+ @Option(displayName = "Except",
+ description = "Accepts a list of GAVs. Dependencies matching a GAV will be ignored by this recipe."
+ + " GAV versions are ignored if provided.",
+ example = "com.jcraft:jsch",
+ required = false)
+ @Nullable
+ List except;
+
+ public enum Comparator {
+ ANY,
+ EQ,
+ LT,
+ LTE,
+ GT,
+ GTE
+ }
+
+ @Override
+ public String getDisplayName() {
+ return "Remove redundant explicit dependency versions";
+ }
+
+ @Override
+ public String getDescription() {
+ return "Remove explicitly-specified dependency versions that are managed by a Gradle `platform`/`enforcedPlatform`.";
+ }
+
+ @Override
+ public TreeVisitor getVisitor() {
+ return Preconditions.check(
+ new IsBuildGradle<>(),
+ new GroovyIsoVisitor() {
+ GradleProject gp;
+ final Map> platforms = new HashMap<>();
+
+ @Override
+ public G.CompilationUnit visitCompilationUnit(G.CompilationUnit cu, ExecutionContext ctx) {
+ Optional maybeGp = cu.getMarkers().findFirst(GradleProject.class);
+ if (!maybeGp.isPresent()) {
+ return cu;
+ }
+
+ gp = maybeGp.get();
+ new GroovyIsoVisitor() {
+ final MethodMatcher platformMatcher = new MethodMatcher("org.gradle.api.artifacts.dsl.DependencyHandler platform(..)");
+ final MethodMatcher enforcedPlatformMatcher = new MethodMatcher("org.gradle.api.artifacts.dsl.DependencyHandler enforcedPlatform(..)");
+
+ @Override
+ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+ J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
+ if (!platformMatcher.matches(m) && !enforcedPlatformMatcher.matches(m)) {
+ return m;
+ }
+
+ if (m.getArguments().get(0) instanceof J.Literal) {
+ J.Literal l = (J.Literal) m.getArguments().get(0);
+ if (l.getType() != JavaType.Primitive.String) {
+ return m;
+ }
+
+ Dependency dependency = DependencyStringNotationConverter.parse((String) l.getValue());
+ MavenPomDownloader mpd = new MavenPomDownloader(ctx);
+ try {
+ ResolvedPom platformPom = mpd.download(new GroupArtifactVersion(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion()), null, null, gp.getMavenRepositories())
+ .resolve(Collections.emptyList(), mpd, ctx);
+ platforms.computeIfAbsent(getCursor().getParent(1).firstEnclosing(J.MethodInvocation.class).getSimpleName(), k -> new ArrayList<>()).add(platformPom);
+ } catch (MavenDownloadingException e) {
+ return m;
+ }
+ } else if (m.getArguments().get(0) instanceof G.MapEntry) {
+ String groupId = null;
+ String artifactId = null;
+ String version = null;
+
+ for (Expression arg : m.getArguments()) {
+ if (!(arg instanceof G.MapEntry)) {
+ continue;
+ }
+
+ G.MapEntry entry = (G.MapEntry) arg;
+ if (!(entry.getKey() instanceof J.Literal) || !(entry.getValue() instanceof J.Literal)) {
+ continue;
+ }
+
+ J.Literal key = (J.Literal) entry.getKey();
+ J.Literal value = (J.Literal) entry.getValue();
+ if (key.getType() != JavaType.Primitive.String || value.getType() != JavaType.Primitive.String) {
+ continue;
+ }
+
+ switch ((String) key.getValue()) {
+ case "group":
+ groupId = (String) value.getValue();
+ break;
+ case "name":
+ artifactId = (String) value.getValue();
+ break;
+ case "version":
+ version = (String) value.getValue();
+ break;
+ }
+ }
+
+ if (groupId == null || artifactId == null || version == null) {
+ return m;
+ }
+
+ MavenPomDownloader mpd = new MavenPomDownloader(ctx);
+ try {
+ ResolvedPom platformPom = mpd.download(new GroupArtifactVersion(groupId, artifactId, version), null, null, gp.getMavenRepositories())
+ .resolve(Collections.emptyList(), mpd, ctx);
+ platforms.computeIfAbsent(getCursor().getParent(1).firstEnclosing(J.MethodInvocation.class).getSimpleName(), k -> new ArrayList<>()).add(platformPom);
+ } catch (MavenDownloadingException e) {
+ return m;
+ }
+ }
+ return m;
+ }
+ }.visit(cu, ctx);
+
+ return super.visitCompilationUnit(cu, ctx);
+ }
+
+ @Override
+ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+ J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
+
+ Optional maybeGradleDependency = new GradleDependency.Matcher()
+ .groupId(groupPattern)
+ .artifactId(artifactPattern)
+ .get(getCursor());
+ if (!maybeGradleDependency.isPresent()) {
+ return m;
+ }
+
+ GradleDependency gradleDependency = maybeGradleDependency.get();
+ ResolvedDependency d = gradleDependency.getResolvedDependency();
+ if (StringUtils.isBlank(d.getVersion())) {
+ return m;
+ }
+
+ if (platforms.containsKey(m.getSimpleName())) {
+ for (ResolvedPom platform : platforms.get(m.getSimpleName())) {
+ String managedVersion = platform.getManagedVersion(d.getGroupId(), d.getArtifactId(), null, d.getRequested().getClassifier());
+ if (matchesComparator(managedVersion, d.getVersion())) {
+ return maybeRemoveVersion(m);
+ }
+ }
+ }
+ GradleDependencyConfiguration gdc = gp.getConfiguration(m.getSimpleName());
+ if (gdc != null) {
+ for (GradleDependencyConfiguration configuration : gdc.allExtendsFrom()) {
+ if (platforms.containsKey(configuration.getName())) {
+ for (ResolvedPom platform : platforms.get(configuration.getName())) {
+ String managedVersion = platform.getManagedVersion(d.getGroupId(), d.getArtifactId(), null, d.getRequested().getClassifier());
+ if (matchesComparator(managedVersion, d.getVersion())) {
+ return maybeRemoveVersion(m);
+ }
+ }
+ }
+ }
+ }
+
+ return m;
+ }
+
+ private J.MethodInvocation maybeRemoveVersion(J.MethodInvocation m) {
+ if (m.getArguments().get(0) instanceof J.Literal) {
+ J.Literal l = (J.Literal) m.getArguments().get(0);
+ if (l.getType() != JavaType.Primitive.String) {
+ return m;
+ }
+
+ Dependency dep = DependencyStringNotationConverter.parse((String) l.getValue())
+ .withVersion(null);
+ if (dep.getClassifier() != null || dep.getExt() != null) {
+ return m;
+ }
+
+ return m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> ChangeStringLiteral.withStringValue(l, dep.toStringNotation())));
+ } else if (m.getArguments().get(0) instanceof G.MapLiteral) {
+ return m.withArguments(ListUtils.mapFirst(m.getArguments(), arg -> {
+ G.MapLiteral mapLiteral = (G.MapLiteral) arg;
+ return mapLiteral.withElements(ListUtils.map(mapLiteral.getElements(), entry -> {
+ if (entry.getKey() instanceof J.Literal &&
+ "version".equals(((J.Literal) entry.getKey()).getValue())) {
+ return null;
+ }
+ return entry;
+ }));
+ }));
+ } else if (m.getArguments().get(0) instanceof G.MapEntry) {
+ return m.withArguments(ListUtils.map(m.getArguments(), arg -> {
+ G.MapEntry entry = (G.MapEntry) arg;
+ if (entry.getKey() instanceof J.Literal &&
+ "version".equals(((J.Literal) entry.getKey()).getValue())) {
+ return null;
+ }
+ return entry;
+ }));
+ }
+ return m;
+ }
+ }
+ );
+ }
+
+ private Comparator determineComparator() {
+ if (onlyIfManagedVersionIs != null) {
+ return onlyIfManagedVersionIs;
+ }
+ return Comparator.EQ;
+ }
+
+ private boolean matchesComparator(@Nullable String managedVersion, String requestedVersion) {
+ Comparator comparator = determineComparator();
+ if (managedVersion == null) {
+ return false;
+ }
+ if (comparator == Comparator.ANY) {
+ return true;
+ }
+ if (!isExact(managedVersion)) {
+ return false;
+ }
+ int comparison = new LatestIntegration(null)
+ .compare(null, managedVersion, requestedVersion);
+ if (comparison < 0) {
+ return comparator == Comparator.LT || comparator == Comparator.LTE;
+ } else if (comparison > 0) {
+ return comparator == Comparator.GT || comparator == Comparator.GTE;
+ } else {
+ return comparator == Comparator.EQ || comparator == Comparator.LTE || comparator == Comparator.GTE;
+ }
+ }
+
+ private boolean isExact(String managedVersion) {
+ Validated maybeVersionComparator = Semver.validate(managedVersion, null);
+ return maybeVersionComparator.isValid() && maybeVersionComparator.getValue() instanceof ExactVersion;
+ }
+}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/UpgradeDependencyVersion.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/UpgradeDependencyVersion.java
index d008c4ae3f1..d8c32b7cd84 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/UpgradeDependencyVersion.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/UpgradeDependencyVersion.java
@@ -32,7 +32,6 @@
import org.openrewrite.groovy.tree.G;
import org.openrewrite.internal.ListUtils;
import org.openrewrite.internal.StringUtils;
-import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.J;
import org.openrewrite.java.tree.JavaSourceFile;
@@ -140,8 +139,6 @@ public DependencyVersionState getInitialValue(ExecutionContext ctx) {
return new DependencyVersionState();
}
- private static final MethodMatcher DEPENDENCY_DSL_MATCHER = new MethodMatcher("DependencyHandlerSpec *(..)");
-
@Override
public TreeVisitor getScanner(DependencyVersionState acc) {
@@ -163,7 +160,7 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
- if (gradleDependencyMatcher.get(getCursor()).isPresent() || DEPENDENCY_DSL_MATCHER.matches(m)) {
+ if (gradleDependencyMatcher.get(getCursor()).isPresent()) {
if (m.getArguments().get(0) instanceof G.MapEntry) {
String groupId = null;
String artifactId = null;
@@ -374,15 +371,10 @@ public J postVisit(J tree, ExecutionContext ctx) {
@Override
public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
- if ("constraints".equals(method.getSimpleName()) || "project".equals(method.getSimpleName())) {
- // don't mess with anything inside a constraints block, leave that to UpgradeTransitiveDependency version recipe
- // `project` dependencies should also be skipped
- return method;
- }
J.MethodInvocation m = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
GradleDependency.Matcher gradleDependencyMatcher = new GradleDependency.Matcher();
- if (gradleDependencyMatcher.get(getCursor()).isPresent() || DEPENDENCY_DSL_MATCHER.matches(m)) {
+ if (gradleDependencyMatcher.get(getCursor()).isPresent()) {
List depArgs = m.getArguments();
if (depArgs.get(0) instanceof J.Literal || depArgs.get(0) instanceof G.GString || depArgs.get(0) instanceof G.MapEntry) {
m = updateDependency(m, ctx);
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddBuildPlugin.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddBuildPlugin.java
index 3acdda2ff7e..21d5df8b380 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddBuildPlugin.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddBuildPlugin.java
@@ -55,6 +55,15 @@ public class AddBuildPlugin extends Recipe {
@Nullable
Boolean apply;
+ @Option(displayName = "Accept transitive",
+ description = "Some plugins apply other plugins. When this is set to true no plugin declaration will be added if the plugin is already applied transitively. " +
+ "When this is set to false the plugin will be added explicitly even if it is already applied transitively. " +
+ "Defaults to `true`.",
+ valid = {"true", "false"},
+ required = false)
+ @Nullable
+ Boolean acceptTransitive;
+
@Override
public String getDisplayName() {
return "Add Gradle plugin";
@@ -78,7 +87,7 @@ public Validated validate() {
public TreeVisitor getVisitor() {
return Preconditions.check(
new FindGradleProject(FindGradleProject.SearchCriteria.Marker),
- new AddPluginVisitor(pluginId, version, versionPattern, apply)
+ new AddPluginVisitor(pluginId, version, versionPattern, apply, acceptTransitive)
);
}
}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePlugin.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePlugin.java
index 27c40fa6301..11f2cb4d944 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePlugin.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddDevelocityGradlePlugin.java
@@ -92,7 +92,7 @@ public class AddDevelocityGradlePlugin extends Recipe {
@Nullable
Boolean uploadInBackground;
- @Option(displayName = "Publish Criteria",
+ @Option(displayName = "Publish criteria",
description = "When set to `Always` the plugin will publish build scans of every single build. " +
"When set to `Failure` the plugin will only publish build scans when the build fails. " +
"When omitted scans will be published only when the `--scan` option is passed to the build.",
@@ -210,7 +210,7 @@ public G.CompilationUnit visitCompilationUnit(G.CompilationUnit cu, ExecutionCon
}
private G.CompilationUnit withPlugin(G.CompilationUnit cu, String pluginId, String newVersion, VersionComparator versionComparator, ExecutionContext ctx) {
- cu = (G.CompilationUnit) new AddPluginVisitor(pluginId, newVersion, null, null)
+ cu = (G.CompilationUnit) new AddPluginVisitor(pluginId, newVersion, null, null, false)
.visitNonNull(cu, ctx);
cu = (G.CompilationUnit) new UpgradePluginVersion(pluginId, newVersion, null).getVisitor()
.visitNonNull(cu, ctx);
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddPluginVisitor.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddPluginVisitor.java
index 1a22bc3d5f9..f7ca2de95c9 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddPluginVisitor.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddPluginVisitor.java
@@ -39,6 +39,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import static java.util.Collections.singletonList;
@@ -58,6 +59,9 @@ public class AddPluginVisitor extends GroovyIsoVisitor {
@Nullable
Boolean apply;
+ @Nullable
+ Boolean acceptTransitive;
+
private static @Nullable Comment getLicenseHeader(G.CompilationUnit cu) {
if (!cu.getStatements().isEmpty()) {
Statement firstStatement = cu.getStatements().get(0);
@@ -95,124 +99,133 @@ private static G.CompilationUnit removeLicenseHeader(G.CompilationUnit cu) {
@Override
public G.CompilationUnit visitCompilationUnit(G.CompilationUnit cu, ExecutionContext ctx) {
- if (FindPlugins.find(cu, pluginId).isEmpty()) {
- String version;
- if (newVersion == null) {
- // We have been requested to add a versionless plugin
- version = null;
- } else {
- Optional maybeGp = cu.getMarkers().findFirst(GradleProject.class);
- Optional maybeGs = cu.getMarkers().findFirst(GradleSettings.class);
- if (!maybeGp.isPresent() && !maybeGs.isPresent()) {
- return cu;
- }
+ if (!FindPlugins.find(cu, pluginId).isEmpty() && (acceptTransitive == null || acceptTransitive)) {
+ return cu;
+ }
- try {
- version = new DependencyVersionSelector(null, maybeGp.orElse(null), maybeGs.orElse(null)).select(new GroupArtifact(pluginId, pluginId + ".gradle.plugin"), "classpath", newVersion, versionPattern, ctx);
- } catch (MavenDownloadingException e) {
- return e.warn(cu);
- }
+ String version;
+ if (newVersion == null) {
+ // We have been requested to add a versionless plugin
+ version = null;
+ } else {
+ Optional maybeGp = cu.getMarkers().findFirst(GradleProject.class);
+ Optional maybeGs = cu.getMarkers().findFirst(GradleSettings.class);
+ if (!maybeGp.isPresent() && !maybeGs.isPresent()) {
+ return cu;
}
- AtomicInteger singleQuote = new AtomicInteger();
- AtomicInteger doubleQuote = new AtomicInteger();
- new GroovyIsoVisitor() {
- final MethodMatcher pluginIdMatcher = new MethodMatcher("PluginSpec id(..)");
-
- @Override
- public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Integer integer) {
- J.MethodInvocation m = super.visitMethodInvocation(method, integer);
- if (pluginIdMatcher.matches(m)) {
- if (m.getArguments().get(0) instanceof J.Literal) {
- J.Literal l = (J.Literal) m.getArguments().get(0);
- assert l.getValueSource() != null;
- if (l.getValueSource().startsWith("'")) {
- singleQuote.incrementAndGet();
- } else {
- doubleQuote.incrementAndGet();
- }
+ try {
+ version = new DependencyVersionSelector(null, maybeGp.orElse(null), maybeGs.orElse(null)).select(new GroupArtifact(pluginId, pluginId + ".gradle.plugin"), "classpath", newVersion, versionPattern, ctx);
+ } catch (MavenDownloadingException e) {
+ return e.warn(cu);
+ }
+ }
+
+ AtomicInteger singleQuote = new AtomicInteger();
+ AtomicInteger doubleQuote = new AtomicInteger();
+ AtomicBoolean pluginAlreadyApplied = new AtomicBoolean();
+ new GroovyIsoVisitor() {
+ final MethodMatcher pluginIdMatcher = new MethodMatcher("PluginSpec id(..)");
+
+ @Override
+ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Integer integer) {
+ J.MethodInvocation m = super.visitMethodInvocation(method, integer);
+ if (pluginIdMatcher.matches(m)) {
+ if (m.getArguments().get(0) instanceof J.Literal) {
+ J.Literal l = (J.Literal) m.getArguments().get(0);
+ if (pluginId.equals(l.getValue())) {
+ pluginAlreadyApplied.set(true);
+ }
+ assert l.getValueSource() != null;
+ if (l.getValueSource().startsWith("'")) {
+ singleQuote.incrementAndGet();
+ } else {
+ doubleQuote.incrementAndGet();
}
}
- return m;
}
- }.visitCompilationUnit(cu, 0);
-
- String delimiter = singleQuote.get() < doubleQuote.get() ? "\"" : "'";
- String source = "plugins {\n" +
- " id " + delimiter + pluginId + delimiter + (version != null ? " version " + delimiter + version + delimiter : "") + (version != null && Boolean.FALSE.equals(apply) ? " apply " + apply : "") + "\n" +
- "}";
- Statement statement = GradleParser.builder().build()
- .parseInputs(singletonList(Parser.Input.fromString(source)), null, ctx)
- .findFirst()
- .map(parsed -> {
- if (parsed instanceof ParseError) {
- throw ((ParseError) parsed).toException();
- }
- return ((G.CompilationUnit) parsed);
- })
- .map(parsed -> parsed.getStatements().get(0))
- .orElseThrow(() -> new IllegalArgumentException("Could not parse as Gradle"));
-
- if (FindMethods.find(cu, "RewriteGradleProject plugins(..)").isEmpty() && FindMethods.find(cu, "RewriteSettings plugins(..)").isEmpty()) {
- if (cu.getSourcePath().endsWith(Paths.get("settings.gradle")) &&
- !cu.getStatements().isEmpty() &&
- cu.getStatements().get(0) instanceof J.MethodInvocation &&
- ((J.MethodInvocation) cu.getStatements().get(0)).getSimpleName().equals("pluginManagement")) {
- return cu.withStatements(ListUtils.insert(cu.getStatements(), autoFormat(statement.withPrefix(Space.format("\n\n")), ctx, getCursor()), 1));
- } else {
- int insertAtIdx = 0;
- for (int i = 0; i < cu.getStatements().size(); i++) {
- Statement existingStatement = cu.getStatements().get(i);
- if (existingStatement instanceof J.MethodInvocation && ((J.MethodInvocation) existingStatement).getSimpleName().equals("buildscript")) {
- insertAtIdx = i + 1;
- break;
- }
+ return m;
+ }
+ }.visitCompilationUnit(cu, 0);
+
+ if (pluginAlreadyApplied.get()) {
+ return cu;
+ }
+
+ String delimiter = singleQuote.get() < doubleQuote.get() ? "\"" : "'";
+ String source = "plugins {\n" +
+ " id " + delimiter + pluginId + delimiter + (version != null ? " version " + delimiter + version + delimiter : "") + (version != null && Boolean.FALSE.equals(apply) ? " apply " + apply : "") + "\n" +
+ "}";
+ Statement statement = GradleParser.builder().build()
+ .parseInputs(singletonList(Parser.Input.fromString(source)), null, ctx)
+ .findFirst()
+ .map(parsed -> {
+ if (parsed instanceof ParseError) {
+ throw ((ParseError) parsed).toException();
}
- if (insertAtIdx == 0) {
- Comment licenseHeader = getLicenseHeader(cu);
- if (licenseHeader != null) {
- cu = removeLicenseHeader(cu);
- statement = statement.withComments(Collections.singletonList(licenseHeader));
- }
- Space leadingSpace = Space.firstPrefix(cu.getStatements());
- return cu.withStatements(ListUtils.insert(
- Space.formatFirstPrefix(cu.getStatements(), leadingSpace.withWhitespace("\n\n" + leadingSpace.getWhitespace())),
- autoFormat(statement, ctx, getCursor()),
- insertAtIdx));
- } else {
- return cu.withStatements(ListUtils.insert(cu.getStatements(), autoFormat(statement.withPrefix(Space.format("\n\n")), ctx, getCursor()), insertAtIdx));
+ return ((G.CompilationUnit) parsed);
+ })
+ .map(parsed -> parsed.getStatements().get(0))
+ .orElseThrow(() -> new IllegalArgumentException("Could not parse as Gradle"));
+
+ if (FindMethods.find(cu, "RewriteGradleProject plugins(..)").isEmpty() && FindMethods.find(cu, "RewriteSettings plugins(..)").isEmpty()) {
+ if (cu.getSourcePath().endsWith(Paths.get("settings.gradle")) &&
+ !cu.getStatements().isEmpty() &&
+ cu.getStatements().get(0) instanceof J.MethodInvocation &&
+ ((J.MethodInvocation) cu.getStatements().get(0)).getSimpleName().equals("pluginManagement")) {
+ return cu.withStatements(ListUtils.insert(cu.getStatements(), autoFormat(statement.withPrefix(Space.format("\n\n")), ctx, getCursor()), 1));
+ } else {
+ int insertAtIdx = 0;
+ for (int i = 0; i < cu.getStatements().size(); i++) {
+ Statement existingStatement = cu.getStatements().get(i);
+ if (existingStatement instanceof J.MethodInvocation && ((J.MethodInvocation) existingStatement).getSimpleName().equals("buildscript")) {
+ insertAtIdx = i + 1;
+ break;
}
}
- } else {
- MethodMatcher buildPluginsMatcher = new MethodMatcher("RewriteGradleProject plugins(groovy.lang.Closure)");
- MethodMatcher settingsPluginsMatcher = new MethodMatcher("RewriteSettings plugins(groovy.lang.Closure)");
- J.MethodInvocation pluginDef = (J.MethodInvocation) ((J.Return) ((J.Block) ((J.Lambda) ((J.MethodInvocation) autoFormat(statement, ctx, getCursor())).getArguments().get(0)).getBody()).getStatements().get(0)).getExpression();
- return cu.withStatements(ListUtils.map(cu.getStatements(), stat -> {
- if (stat instanceof J.MethodInvocation) {
- J.MethodInvocation m = (J.MethodInvocation) stat;
- if (buildPluginsMatcher.matches(m) || settingsPluginsMatcher.matches(m)) {
- m = m.withArguments(ListUtils.map(m.getArguments(), a -> {
- if (a instanceof J.Lambda) {
- J.Lambda l = (J.Lambda) a;
- J.Block b = (J.Block) l.getBody();
- List pluginStatements = b.getStatements();
- if (!pluginStatements.isEmpty() && pluginStatements.get(pluginStatements.size() - 1) instanceof J.Return) {
- Statement last = pluginStatements.remove(pluginStatements.size() - 1);
- Expression lastExpr = requireNonNull(((J.Return) last).getExpression());
- pluginStatements.add(lastExpr.withPrefix(last.getPrefix()));
- }
- pluginStatements.add(pluginDef);
- return l.withBody(autoFormat(b.withStatements(pluginStatements), ctx, getCursor()));
- }
- return a;
- }));
- return m;
- }
+ if (insertAtIdx == 0) {
+ Comment licenseHeader = getLicenseHeader(cu);
+ if (licenseHeader != null) {
+ cu = removeLicenseHeader(cu);
+ statement = statement.withComments(Collections.singletonList(licenseHeader));
}
- return stat;
- }));
+ Space leadingSpace = Space.firstPrefix(cu.getStatements());
+ return cu.withStatements(ListUtils.insert(
+ Space.formatFirstPrefix(cu.getStatements(), leadingSpace.withWhitespace("\n\n" + leadingSpace.getWhitespace())),
+ autoFormat(statement, ctx, getCursor()),
+ insertAtIdx));
+ } else {
+ return cu.withStatements(ListUtils.insert(cu.getStatements(), autoFormat(statement.withPrefix(Space.format("\n\n")), ctx, getCursor()), insertAtIdx));
+ }
}
+ } else {
+ MethodMatcher buildPluginsMatcher = new MethodMatcher("RewriteGradleProject plugins(groovy.lang.Closure)");
+ MethodMatcher settingsPluginsMatcher = new MethodMatcher("RewriteSettings plugins(groovy.lang.Closure)");
+ J.MethodInvocation pluginDef = (J.MethodInvocation) ((J.Return) ((J.Block) ((J.Lambda) ((J.MethodInvocation) autoFormat(statement, ctx, getCursor())).getArguments().get(0)).getBody()).getStatements().get(0)).getExpression();
+ return cu.withStatements(ListUtils.map(cu.getStatements(), stat -> {
+ if (stat instanceof J.MethodInvocation) {
+ J.MethodInvocation m = (J.MethodInvocation) stat;
+ if (buildPluginsMatcher.matches(m) || settingsPluginsMatcher.matches(m)) {
+ m = m.withArguments(ListUtils.map(m.getArguments(), a -> {
+ if (a instanceof J.Lambda) {
+ J.Lambda l = (J.Lambda) a;
+ J.Block b = (J.Block) l.getBody();
+ List pluginStatements = b.getStatements();
+ if (!pluginStatements.isEmpty() && pluginStatements.get(pluginStatements.size() - 1) instanceof J.Return) {
+ Statement last = pluginStatements.remove(pluginStatements.size() - 1);
+ Expression lastExpr = requireNonNull(((J.Return) last).getExpression());
+ pluginStatements.add(lastExpr.withPrefix(last.getPrefix()));
+ }
+ pluginStatements.add(pluginDef);
+ return l.withBody(autoFormat(b.withStatements(pluginStatements), ctx, getCursor()));
+ }
+ return a;
+ }));
+ return m;
+ }
+ }
+ return stat;
+ }));
}
- return super.visitCompilationUnit(cu, ctx);
}
}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddSettingsPlugin.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddSettingsPlugin.java
index 9abdd8f6a84..55b29c0cabc 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddSettingsPlugin.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddSettingsPlugin.java
@@ -57,6 +57,15 @@ public class AddSettingsPlugin extends Recipe {
@Nullable
Boolean apply;
+ @Option(displayName = "Accept transitive",
+ description = "Some plugins apply other plugins. When this is set to true no plugin declaration will be added if the plugin is already applied transitively. " +
+ "When this is set to false the plugin will be added explicitly even if it is already applied transitively. " +
+ "Defaults to `true`.",
+ valid = {"true", "false"},
+ required = false)
+ @Nullable
+ Boolean acceptTransitive;
+
@Override
public String getDisplayName() {
return "Add Gradle settings plugin";
@@ -80,7 +89,7 @@ public Validated validate() {
public TreeVisitor getVisitor() {
return Preconditions.check(
new IsSettingsGradle<>(),
- new AddPluginVisitor(pluginId, StringUtils.isBlank(version) ? "latest.release" : version, versionPattern, apply)
+ new AddPluginVisitor(pluginId, StringUtils.isBlank(version) ? "latest.release" : version, versionPattern, apply, acceptTransitive)
);
}
}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/RemoveDevelocityConfiguration.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/RemoveDevelocityConfiguration.java
new file mode 100644
index 00000000000..356c2dfab43
--- /dev/null
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/RemoveDevelocityConfiguration.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.gradle.plugins;
+
+import org.jspecify.annotations.Nullable;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Preconditions;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.gradle.IsBuildGradle;
+import org.openrewrite.gradle.IsSettingsGradle;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.tree.J;
+
+import static org.openrewrite.Preconditions.or;
+
+public class RemoveDevelocityConfiguration extends Recipe {
+ @Override
+ public String getDisplayName() {
+ return "Remove Develocity configuration";
+ }
+
+ @Override
+ public String getDescription() {
+ return "Remove Develocity configuration from a Gradle build.";
+ }
+
+ @Override
+ public TreeVisitor getVisitor() {
+ return Preconditions.check(
+ or(new IsBuildGradle<>(), new IsSettingsGradle<>()),
+ new JavaIsoVisitor() {
+ @Override
+ public J.@Nullable MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
+ if ("develocity".equals(method.getSimpleName()) ||
+ "gradleEnterprise".equals(method.getSimpleName())) {
+ return null;
+ }
+ return super.visitMethodInvocation(method, ctx);
+ }
+ }
+ );
+ }
+}
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/trait/GradleDependency.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/trait/GradleDependency.java
index 1f20c8e92e2..e4a806cdd25 100644
--- a/rewrite-gradle/src/main/java/org/openrewrite/gradle/trait/GradleDependency.java
+++ b/rewrite-gradle/src/main/java/org/openrewrite/gradle/trait/GradleDependency.java
@@ -24,10 +24,13 @@
import org.openrewrite.gradle.util.DependencyStringNotationConverter;
import org.openrewrite.groovy.tree.G;
import org.openrewrite.internal.StringUtils;
+import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.J;
import org.openrewrite.maven.tree.Dependency;
+import org.openrewrite.maven.tree.GroupArtifactVersion;
import org.openrewrite.maven.tree.ResolvedDependency;
+import org.openrewrite.maven.tree.ResolvedGroupArtifactVersion;
import org.openrewrite.trait.Trait;
import java.util.List;
@@ -43,6 +46,8 @@ public class GradleDependency implements Trait {
ResolvedDependency resolvedDependency;
public static class Matcher extends GradleTraitMatcher {
+ private static final MethodMatcher DEPENDENCY_DSL_MATCHER = new MethodMatcher("DependencyHandlerSpec *(..)");
+
@Nullable
protected String configuration;
@@ -77,13 +82,14 @@ public Matcher artifactId(@Nullable String artifactId) {
return null;
}
- GradleProject gradleProject = getGradleProject(cursor);
- if (gradleProject == null) {
+ if (withinDependencyConstraintsBlock(cursor)) {
+ // A dependency constraint is different from an actual dependency
return null;
}
+ GradleProject gradleProject = getGradleProject(cursor);
GradleDependencyConfiguration gdc = getConfiguration(gradleProject, methodInvocation);
- if (gdc == null) {
+ if (gdc == null && !(DEPENDENCY_DSL_MATCHER.matches(methodInvocation) && !"project".equals(methodInvocation.getSimpleName()))) {
return null;
}
@@ -95,49 +101,77 @@ public Matcher artifactId(@Nullable String artifactId) {
Expression argument = methodInvocation.getArguments().get(0);
if (argument instanceof J.Literal || argument instanceof G.GString || argument instanceof G.MapEntry || argument instanceof G.MapLiteral) {
dependency = parseDependency(methodInvocation.getArguments());
- } else if (argument instanceof J.MethodInvocation &&
- (((J.MethodInvocation) argument).getSimpleName().equals("platform") ||
- ((J.MethodInvocation) argument).getSimpleName().equals("enforcedPlatform"))) {
- dependency = parseDependency(((J.MethodInvocation) argument).getArguments());
+ } else if (argument instanceof J.MethodInvocation) {
+ if (((J.MethodInvocation) argument).getSimpleName().equals("platform") ||
+ ((J.MethodInvocation) argument).getSimpleName().equals("enforcedPlatform")) {
+ dependency = parseDependency(((J.MethodInvocation) argument).getArguments());
+ } else if (((J.MethodInvocation) argument).getSimpleName().equals("project")) {
+ // project dependencies are not yet supported
+ return null;
+ }
}
if (dependency == null) {
return null;
}
- if (gdc.isCanBeResolved()) {
- for (ResolvedDependency resolvedDependency : gdc.getResolved()) {
- if ((groupId == null || matchesGlob(resolvedDependency.getGroupId(), groupId)) &&
- (artifactId == null || matchesGlob(resolvedDependency.getArtifactId(), artifactId))) {
- Dependency req = resolvedDependency.getRequested();
- if ((req.getGroupId() == null || req.getGroupId().equals(dependency.getGroupId())) &&
- req.getArtifactId().equals(dependency.getArtifactId())) {
- return new GradleDependency(cursor, resolvedDependency);
+ if (gdc != null) {
+ if (gdc.isCanBeResolved()) {
+ for (ResolvedDependency resolvedDependency : gdc.getResolved()) {
+ if ((groupId == null || matchesGlob(resolvedDependency.getGroupId(), groupId)) &&
+ (artifactId == null || matchesGlob(resolvedDependency.getArtifactId(), artifactId))) {
+ Dependency req = resolvedDependency.getRequested();
+ if ((req.getGroupId() == null || req.getGroupId().equals(dependency.getGroupId())) &&
+ req.getArtifactId().equals(dependency.getArtifactId())) {
+ return new GradleDependency(cursor, resolvedDependency);
+ }
}
}
- }
- } else {
- for (GradleDependencyConfiguration transitiveConfiguration : gradleProject.configurationsExtendingFrom(gdc, true)) {
- if (transitiveConfiguration.isCanBeResolved()) {
- for (ResolvedDependency resolvedDependency : transitiveConfiguration.getResolved()) {
- if ((groupId == null || matchesGlob(resolvedDependency.getGroupId(), groupId)) &&
- (artifactId == null || matchesGlob(resolvedDependency.getArtifactId(), artifactId))) {
- Dependency req = resolvedDependency.getRequested();
- if ((req.getGroupId() == null || req.getGroupId().equals(dependency.getGroupId())) &&
- req.getArtifactId().equals(dependency.getArtifactId())) {
- return new GradleDependency(cursor, resolvedDependency);
+ } else {
+ for (GradleDependencyConfiguration transitiveConfiguration : gradleProject.configurationsExtendingFrom(gdc, true)) {
+ if (transitiveConfiguration.isCanBeResolved()) {
+ for (ResolvedDependency resolvedDependency : transitiveConfiguration.getResolved()) {
+ if ((groupId == null || matchesGlob(resolvedDependency.getGroupId(), groupId)) &&
+ (artifactId == null || matchesGlob(resolvedDependency.getArtifactId(), artifactId))) {
+ Dependency req = resolvedDependency.getRequested();
+ if ((req.getGroupId() == null || req.getGroupId().equals(dependency.getGroupId())) &&
+ req.getArtifactId().equals(dependency.getArtifactId())) {
+ return new GradleDependency(cursor, resolvedDependency);
+ }
}
}
}
}
}
}
+
+ if ((groupId == null || matchesGlob(dependency.getGroupId(), groupId)) &&
+ (artifactId == null || matchesGlob(dependency.getArtifactId(), artifactId))) {
+ // Couldn't find the actual resolved dependency, return a virtualized one instead
+ ResolvedDependency resolvedDependency = ResolvedDependency.builder()
+ .depth(-1)
+ .gav(new ResolvedGroupArtifactVersion(null, dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion() != null ? dependency.getVersion() : "", null))
+ .classifier(dependency.getClassifier())
+ .type(dependency.getExt())
+ .requested(Dependency.builder()
+ .scope(methodInvocation.getSimpleName())
+ .type(dependency.getExt())
+ .gav(new GroupArtifactVersion(dependency.getGroupId(), dependency.getArtifactId(), dependency.getVersion()))
+ .classifier(dependency.getClassifier())
+ .build())
+ .build();
+ return new GradleDependency(cursor, resolvedDependency);
+ }
}
return null;
}
- private static @Nullable GradleDependencyConfiguration getConfiguration(GradleProject gradleProject, J.MethodInvocation methodInvocation) {
+ private static @Nullable GradleDependencyConfiguration getConfiguration(@Nullable GradleProject gradleProject, J.MethodInvocation methodInvocation) {
+ if (gradleProject == null) {
+ return null;
+ }
+
String methodName = methodInvocation.getSimpleName();
if (methodName.equals("classpath")) {
return gradleProject.getBuildscript().getConfiguration(methodName);
@@ -146,12 +180,12 @@ public Matcher artifactId(@Nullable String artifactId) {
}
}
- private boolean withinDependenciesBlock(Cursor cursor) {
+ private boolean withinBlock(Cursor cursor, String name) {
Cursor parentCursor = cursor.getParent();
while (parentCursor != null) {
if (parentCursor.getValue() instanceof J.MethodInvocation) {
J.MethodInvocation m = parentCursor.getValue();
- if (m.getSimpleName().equals("dependencies")) {
+ if (m.getSimpleName().equals(name)) {
return true;
}
}
@@ -161,6 +195,14 @@ private boolean withinDependenciesBlock(Cursor cursor) {
return false;
}
+ private boolean withinDependenciesBlock(Cursor cursor) {
+ return withinBlock(cursor, "dependencies");
+ }
+
+ private boolean withinDependencyConstraintsBlock(Cursor cursor) {
+ return withinBlock(cursor, "constraints") && withinDependenciesBlock(cursor);
+ }
+
private org.openrewrite.gradle.util.@Nullable Dependency parseDependency(List arguments) {
Expression argument = arguments.get(0);
if (argument instanceof J.Literal) {
diff --git a/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-8.yml b/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-8.yml
index 9babdf64095..097b7a669da 100644
--- a/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-8.yml
+++ b/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-8.yml
@@ -24,6 +24,9 @@ recipeList:
version: 8.x
addIfMissing: false
+ # https://docs.gradle.org/8.11.1/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
+ - org.openrewrite.gradle.AddJUnitPlatformLauncher
+
# https://github.com/gradle/gradle/blob/v7.6.4/subprojects/core/src/main/java/org/gradle/api/internal/FeaturePreviews.java
# https://github.com/gradle/gradle/blob/v8.10.1/subprojects/core/src/main/java/org/gradle/api/internal/FeaturePreviews.java
- org.openrewrite.gradle.RemoveEnableFeaturePreview:
@@ -32,3 +35,16 @@ recipeList:
previewFeatureName: VERSION_ORDERING_V2
- org.openrewrite.gradle.RemoveEnableFeaturePreview:
previewFeatureName: VERSION_CATALOGS
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.gradle.AddJUnitPlatformLauncher
+displayName: Add JUnit Platform Launcher
+description: Add the JUnit Platform Launcher to the buildscript dependencies.
+recipeList:
+ - org.openrewrite.gradle.AddDependency:
+ groupId: org.junit.platform
+ artifactId: junit-platform-launcher
+ version: 1.x
+ acceptTransitive: true
+ configuration: testRuntimeOnly
+ onlyIfUsing: org.junit.jupiter.api.Test
diff --git a/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle.yml b/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle.yml
index 7240bdf3672..6fdf529b07e 100644
--- a/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle.yml
+++ b/rewrite-gradle/src/main/resources/META-INF/rewrite/gradle.yml
@@ -42,3 +42,18 @@ recipeList:
key: org.gradle.parallel
value: true
filePattern: gradle.properties
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.gradle.plugins.RemoveDevelocity
+displayName: Remove Develocity
+description: Remove the Develocity plugin and configuration from the Gradle build and settings files.
+recipeList:
+ - org.openrewrite.gradle.plugins.RemoveBuildPlugin:
+ pluginId: com.gradle.develocity
+ - org.openrewrite.gradle.plugins.RemoveSettingsPlugin:
+ pluginId: com.gradle.develocity
+ - org.openrewrite.gradle.plugins.RemoveBuildPlugin:
+ pluginId: com.gradle.enterprise
+ - org.openrewrite.gradle.plugins.RemoveSettingsPlugin:
+ pluginId: com.gradle.enterprise
+ - org.openrewrite.gradle.plugins.RemoveDevelocityConfiguration
\ No newline at end of file
diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddDependencyTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddDependencyTest.java
index 6330f931018..cb1da2ffe4a 100644
--- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddDependencyTest.java
+++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddDependencyTest.java
@@ -1317,9 +1317,6 @@ void addUnconditionally() {
rewriteRun(
spec -> spec.recipe(addDependency("org.apache.logging.log4j:log4j-core:2.22.1")),
mavenProject("project",
- srcMainJava(
- java(usingGuavaIntMath)
- ),
buildGradle("""
plugins {
id "java-library"
diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddJUnitPlatformLauncherTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddJUnitPlatformLauncherTest.java
new file mode 100644
index 00000000000..0c120dc8bce
--- /dev/null
+++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/AddJUnitPlatformLauncherTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.gradle;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.openrewrite.gradle.Assertions.buildGradle;
+import static org.openrewrite.gradle.toolingapi.Assertions.withToolingApi;
+import static org.openrewrite.java.Assertions.*;
+
+class AddJUnitPlatformLauncherTest implements RewriteTest {
+
+ @Override
+ public void defaults(RecipeSpec spec) {
+ spec
+ .beforeRecipe(withToolingApi())
+ .parser(JavaParser.fromJavaVersion().classpath("junit-jupiter-api"))
+ .recipeFromResources("org.openrewrite.gradle.AddJUnitPlatformLauncher");
+ }
+
+ @DocumentExample
+ @Test
+ void addJUnitPlatformLauncher() {
+ rewriteRun(
+ mavenProject("project",
+ srcTestJava(
+ java(
+ """
+ import org.junit.jupiter.api.Test;
+ public class A {
+ @Test
+ void foo() {
+ }
+ }
+ """
+ )
+ ),
+ buildGradle(
+ """
+ plugins {
+ id "java-library"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+ """,
+ spec -> spec.after(buildGradle -> {
+ assertThat(buildGradle).contains("testRuntimeOnly \"org.junit.platform:junit-platform-launcher:");
+ return buildGradle;
+ })
+ )
+ )
+ );
+ }
+}
diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/EnableDevelocityBuildCacheTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/EnableDevelocityBuildCacheTest.java
new file mode 100644
index 00000000000..6e725db524f
--- /dev/null
+++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/EnableDevelocityBuildCacheTest.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.gradle;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
+import org.openrewrite.test.RewriteTest;
+
+import static org.openrewrite.gradle.Assertions.settingsGradle;
+
+class EnableDevelocityBuildCacheTest implements RewriteTest {
+
+ @Test
+ @DocumentExample
+ void addBuildCacheRemoteConfig() {
+ rewriteRun(spec -> spec.recipe(new EnableDevelocityBuildCache("true", "System.getenv(\"CI\") != null")),
+ settingsGradle(
+ """
+ plugins {
+ id 'com.gradle.develocity' version '3.17.6'
+ }
+ develocity {
+ server = 'https://dev.example.com/'
+ }
+ """,
+ """
+ plugins {
+ id 'com.gradle.develocity' version '3.17.6'
+ }
+ develocity {
+ server = 'https://dev.example.com/'
+ buildCache {
+ remote(develocity.buildCache) {
+ enabled = true
+ push = System.getenv("CI") != null
+ }
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void addBuildCacheRemoteConfigExtendedConfig() {
+ rewriteRun(spec -> spec.recipe(new EnableDevelocityBuildCache("true", "System.getenv(\"CI\") != null")),
+ settingsGradle(
+ """
+ plugins {
+ id 'com.gradle.develocity' version '3.17.6'
+ }
+ develocity {
+ server = 'https://dev.example.com/'
+ buildScan {
+ uploadInBackground = true
+ }
+ }
+ """,
+ """
+ plugins {
+ id 'com.gradle.develocity' version '3.17.6'
+ }
+ develocity {
+ server = 'https://dev.example.com/'
+ buildScan {
+ uploadInBackground = true
+ }
+ buildCache {
+ remote(develocity.buildCache) {
+ enabled = true
+ push = System.getenv("CI") != null
+ }
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void addBuildCacheRemoteConfigWithOnlyPush() {
+ rewriteRun(spec -> spec.recipe(new EnableDevelocityBuildCache(null, "true")),
+ settingsGradle(
+ """
+ plugins {
+ id 'com.gradle.develocity' version '3.17.6'
+ }
+ develocity {
+ server = 'https://dev.example.com/'
+ }
+ """,
+ """
+ plugins {
+ id 'com.gradle.develocity' version '3.17.6'
+ }
+ develocity {
+ server = 'https://dev.example.com/'
+ buildCache {
+ remote(develocity.buildCache) {
+ push = true
+ }
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void shouldNotModifyBuildCacheConfig() {
+ rewriteRun(spec -> spec.recipe(new EnableDevelocityBuildCache(null, "#{isTrue(env['CI'])}")),
+ settingsGradle(
+ """
+ plugins {
+ id 'com.gradle.develocity' version '3.17.6'
+ }
+ develocity {
+ server = 'https://dev.example.com/'
+ buildCache {
+ remote(develocity.buildCache) {
+ push = false
+ }
+ }
+ }
+ """
+ )
+ );
+ }
+}
diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveRedundantDependencyVersionsTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveRedundantDependencyVersionsTest.java
new file mode 100644
index 00000000000..379b0381291
--- /dev/null
+++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/RemoveRedundantDependencyVersionsTest.java
@@ -0,0 +1,310 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.gradle;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+import static org.openrewrite.gradle.Assertions.buildGradle;
+import static org.openrewrite.gradle.toolingapi.Assertions.withToolingApi;
+
+class RemoveRedundantDependencyVersionsTest implements RewriteTest {
+ @Override
+ public void defaults(RecipeSpec spec) {
+ spec.beforeRecipe(withToolingApi())
+ .recipe(new RemoveRedundantDependencyVersions(null, null, null, null));
+ }
+
+ @DocumentExample
+ @Test
+ void literal() {
+ rewriteRun(
+ buildGradle(
+ """
+ plugins {
+ id "java"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ implementation("org.apache.commons:commons-lang3:3.14.0")
+ }
+ """,
+ """
+ plugins {
+ id "java"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ implementation("org.apache.commons:commons-lang3")
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void mapEntry() {
+ rewriteRun(
+ buildGradle(
+ """
+ plugins {
+ id "java"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ implementation(group: "org.apache.commons", name: "commons-lang3", version: "3.14.0")
+ }
+ """,
+ """
+ plugins {
+ id "java"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ implementation(group: "org.apache.commons", name: "commons-lang3")
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void mapLiteral() {
+ rewriteRun(
+ buildGradle(
+ """
+ plugins {
+ id "java"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ implementation([group: "org.apache.commons", name: "commons-lang3", version: "3.14.0"])
+ }
+ """,
+ """
+ plugins {
+ id "java"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ implementation([group: "org.apache.commons", name: "commons-lang3"])
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void enforcedPlatform() {
+ rewriteRun(
+ buildGradle(
+ """
+ plugins {
+ id "java"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation(enforcedPlatform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ implementation("org.apache.commons:commons-lang3:3.14.0")
+ }
+ """,
+ """
+ plugins {
+ id "java"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation(enforcedPlatform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ implementation("org.apache.commons:commons-lang3")
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void platformUsingMapEntry() {
+ rewriteRun(
+ buildGradle(
+ """
+ plugins {
+ id "java"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation(enforcedPlatform(group: "org.springframework.boot", name: "spring-boot-dependencies", version: "3.3.3"))
+ implementation("org.apache.commons:commons-lang3:3.14.0")
+ }
+ """,
+ """
+ plugins {
+ id "java"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation(enforcedPlatform(group: "org.springframework.boot", name: "spring-boot-dependencies", version: "3.3.3"))
+ implementation("org.apache.commons:commons-lang3")
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void freestandingScript() {
+ rewriteRun(
+ buildGradle(
+ """
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ implementation("org.apache.commons:commons-lang3:3.14.0")
+ }
+ """,
+ """
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ implementation("org.apache.commons:commons-lang3")
+ }
+ """,
+ spec -> spec.path("dependencies.gradle")
+ ),
+ buildGradle(
+ """
+ plugins {
+ id("java")
+ }
+
+ apply from: 'dependencies.gradle'
+ """
+ )
+ );
+ }
+
+ @Test
+ void transitiveConfiguration() {
+ rewriteRun(
+ buildGradle(
+ """
+ plugins {
+ id "java-library"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ api(platform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ implementation("org.apache.commons:commons-lang3:3.14.0")
+ }
+ """,
+ """
+ plugins {
+ id "java-library"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ api(platform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ implementation("org.apache.commons:commons-lang3")
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void unmanagedDependency() {
+ rewriteRun(
+ buildGradle(
+ """
+ plugins {
+ id "java"
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ implementation("org.apache.commons:commons-lang3:3.14.0")
+
+ testImplementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.3"))
+ }
+ """
+ )
+ );
+ }
+}
diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/UpgradeDependencyVersionTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/UpgradeDependencyVersionTest.java
index 5e9ecf85f34..2626825c559 100644
--- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/UpgradeDependencyVersionTest.java
+++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/UpgradeDependencyVersionTest.java
@@ -44,18 +44,18 @@ public void defaults(RecipeSpec spec) {
@DocumentExample
@Test
- void guava() {
+ void guavaCompileOnly() {
rewriteRun(
buildGradle(
"""
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
compileOnly 'com.google.guava:guava:29.0-jre'
runtimeOnly ('com.google.guava:guava:29.0-jre')
@@ -65,11 +65,11 @@ void guava() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
compileOnly 'com.google.guava:guava:30.1.1-jre'
runtimeOnly ('com.google.guava:guava:30.1.1-jre')
@@ -78,21 +78,77 @@ void guava() {
spec -> spec.afterRecipe(after -> {
Optional maybeGp = after.getMarkers().findFirst(GradleProject.class);
assertThat(maybeGp).isPresent();
- GradleProject gp = maybeGp.get();
- GradleDependencyConfiguration compileClasspath = gp.getConfiguration("compileClasspath");
+ GradleDependencyConfiguration compileClasspath = maybeGp.get().getConfiguration("compileClasspath");
assertThat(compileClasspath).isNotNull();
- assertThat(
- compileClasspath.getRequested().stream()
- .filter(dep -> "com.google.guava".equals(dep.getGroupId()) && "guava".equals(dep.getArtifactId()) && "30.1.1-jre".equals(dep.getVersion()))
- .findAny())
+ assertThat(compileClasspath.getRequested())
.as("GradleProject requested dependencies should have been updated with the new version of guava")
- .isPresent();
- assertThat(
- compileClasspath.getResolved().stream()
- .filter(dep -> "com.google.guava".equals(dep.getGroupId()) && "guava".equals(dep.getArtifactId()) && "30.1.1-jre".equals(dep.getVersion()))
- .findAny())
- .as("GradleProject requested dependencies should have been updated with the new version of guava")
- .isPresent();
+ .anySatisfy(dep -> {
+ assertThat(dep.getGroupId()).isEqualTo("com.google.guava");
+ assertThat(dep.getArtifactId()).isEqualTo("guava");
+ assertThat(dep.getVersion()).isEqualTo("30.1.1-jre");
+ });
+ assertThat(compileClasspath.getResolved())
+ .as("GradleProject resolved dependencies should have been updated with the new version of guava")
+ .anySatisfy(dep -> {
+ assertThat(dep.getGroupId()).isEqualTo("com.google.guava");
+ assertThat(dep.getArtifactId()).isEqualTo("guava");
+ assertThat(dep.getVersion()).isEqualTo("30.1.1-jre");
+ });
+ })
+ )
+ );
+ }
+
+ @Test
+ void mockitoTestImplementation() {
+ rewriteRun(recipeSpec -> {
+ recipeSpec.beforeRecipe(withToolingApi())
+ .recipe(new UpgradeDependencyVersion("org.mockito", "*", "4.11.0", null));
+ },
+ buildGradle(
+ """
+ plugins {
+ id 'java-library'
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ testImplementation("org.mockito:mockito-junit-jupiter:3.12.4")
+ }
+ """,
+ """
+ plugins {
+ id 'java-library'
+ }
+
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ testImplementation("org.mockito:mockito-junit-jupiter:4.11.0")
+ }
+ """,
+ spec -> spec.afterRecipe(after -> {
+ Optional maybeGp = after.getMarkers().findFirst(GradleProject.class);
+ assertThat(maybeGp).isPresent();
+ GradleDependencyConfiguration testCompileClasspath = maybeGp.get().getConfiguration("testCompileClasspath");
+ assertThat(testCompileClasspath).isNotNull();
+ assertThat(testCompileClasspath.getRequested())
+ .as("GradleProject requested dependencies should have been updated with the new version of mockito")
+ .anySatisfy(dep -> {
+ assertThat(dep.getGroupId()).isEqualTo("org.mockito");
+ assertThat(dep.getArtifactId()).isEqualTo("mockito-junit-jupiter");
+ });
+ assertThat(testCompileClasspath.getResolved())
+ .as("GradleProject resolved dependencies should have been updated with the new version of mockito")
+ .anySatisfy(dep -> {
+ assertThat(dep.getGroupId()).isEqualTo("org.mockito");
+ assertThat(dep.getArtifactId()).isEqualTo("mockito-junit-jupiter");
+ });
})
)
);
@@ -106,13 +162,13 @@ void updateVersionInVariable() {
plugins {
id 'java-library'
}
-
+
def guavaVersion = '29.0-jre'
def otherVersion = "latest.release"
repositories {
mavenCentral()
}
-
+
dependencies {
implementation ("com.google.guava:guava:$guavaVersion")
implementation "com.fasterxml.jackson.core:jackson-databind:$otherVersion"
@@ -122,13 +178,13 @@ void updateVersionInVariable() {
plugins {
id 'java-library'
}
-
+
def guavaVersion = '30.1.1-jre'
def otherVersion = "latest.release"
repositories {
mavenCentral()
}
-
+
dependencies {
implementation ("com.google.guava:guava:$guavaVersion")
implementation "com.fasterxml.jackson.core:jackson-databind:$otherVersion"
@@ -146,7 +202,7 @@ void deeplyNestedProjectDependency() {
plugins {
id 'java-library'
}
-
+
dependencies {
implementation project(":foo:bar:baz:qux:quux")
}
@@ -178,11 +234,11 @@ void varargsDependency() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation(
'com.google.guava:guava-gwt:29.0-jre',
@@ -193,11 +249,11 @@ void varargsDependency() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation(
'com.google.guava:guava-gwt:29.0-jre',
@@ -215,12 +271,12 @@ void mapNotationVariable() {
plugins {
id 'java-library'
}
-
+
def guavaVersion = '29.0-jre'
repositories {
mavenCentral()
}
-
+
dependencies {
implementation group: "com.google.guava", name: "guava", version: guavaVersion
}
@@ -229,12 +285,12 @@ void mapNotationVariable() {
plugins {
id 'java-library'
}
-
+
def guavaVersion = '30.1.1-jre'
repositories {
mavenCentral()
}
-
+
dependencies {
implementation group: "com.google.guava", name: "guava", version: guavaVersion
}
@@ -251,11 +307,11 @@ void mapNotationLiteral() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation (group: "com.google.guava", name: "guava", version: '29.0-jre')
}
@@ -264,11 +320,11 @@ void mapNotationLiteral() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation (group: "com.google.guava", name: "guava", version: '30.1.1-jre')
}
@@ -286,11 +342,11 @@ void worksWithPlatform() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation platform("com.google.guava:guava:29.0-jre")
}
@@ -299,11 +355,11 @@ implementation platform("com.google.guava:guava:29.0-jre")
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation platform("com.google.guava:guava:30.1.1-jre")
}
@@ -328,19 +384,19 @@ void upgradesVariablesDefinedInExtraProperties() {
classpath("com.google.guava:guava:${guavaVersion}")
}
}
-
+
plugins {
id "java"
}
-
+
repositories {
mavenCentral()
}
-
+
ext {
guavaVersion2 = "29.0-jre"
}
-
+
dependencies {
implementation "com.google.guava:guava:${guavaVersion2}"
}
@@ -357,19 +413,19 @@ void upgradesVariablesDefinedInExtraProperties() {
classpath("com.google.guava:guava:${guavaVersion}")
}
}
-
+
plugins {
id "java"
}
-
+
repositories {
mavenCentral()
}
-
+
ext {
guavaVersion2 = "30.1.1-jre"
}
-
+
dependencies {
implementation "com.google.guava:guava:${guavaVersion2}"
}
@@ -387,15 +443,15 @@ void matchesGlobs() {
plugins {
id "java"
}
-
+
repositories {
mavenCentral()
}
-
+
ext {
guavaVersion = "29.0-jre"
}
-
+
def guavaVersion2 = "29.0-jre"
dependencies {
implementation("com.google.guava:guava:29.0-jre")
@@ -408,15 +464,15 @@ void matchesGlobs() {
plugins {
id "java"
}
-
+
repositories {
mavenCentral()
}
-
+
ext {
guavaVersion = "30.1.1-jre"
}
-
+
def guavaVersion2 = "30.1.1-jre"
dependencies {
implementation("com.google.guava:guava:30.1.1-jre")
@@ -438,11 +494,11 @@ void defaultsToLatestRelease() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation 'com.google.guava:guava:29.0-jre'
}
@@ -488,11 +544,11 @@ void versionInPropertiesFile() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation ("com.google.guava:guava:$guavaVersion")
}
@@ -515,11 +571,11 @@ void versionInPropertiesFileNotUpdatedIfNoDependencyVariable() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation ("com.google.guava:guava:30.1.1-jre")
}
@@ -554,11 +610,11 @@ void versionInParentAndMultiModulePropertiesFiles() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation ("com.google.guava:guava:$guavaVersion")
}
@@ -570,11 +626,11 @@ void versionInParentAndMultiModulePropertiesFiles() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation ("com.google.guava:guava:$guavaVersion")
}
@@ -601,18 +657,18 @@ void versionInParentSubprojectDefinitionWithPropertiesFiles() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
subprojects {
repositories {
mavenCentral()
}
-
+
apply plugin: "java-library"
-
+
dependencies {
implementation ("com.google.guava:guava:$guavaVersion")
}
@@ -631,7 +687,7 @@ void versionInParentSubprojectDefinitionWithPropertiesFiles() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
@@ -659,11 +715,11 @@ void versionOnlyInMultiModuleChildPropertiesFiles() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation ("com.google.guava:guava:$guavaVersion")
}
@@ -694,7 +750,7 @@ void mapNotationVariableInPropertiesFile() {
repositories {
mavenCentral()
}
-
+
dependencies {
implementation group: "com.google.guava", name: "guava", version: guavaVersion
}
@@ -720,11 +776,11 @@ void mapNotationGStringVariableInPropertiesFile() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation group: "com.google.guava", name: "guava", version: "${guavaVersion}"
}
@@ -753,11 +809,11 @@ void globVersionsInPropertiesFileWithMultipleVersionsOnlyUpdatesCorrectProperty(
plugins {
id 'java'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation("org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}")
implementation("org.springframework.security:spring-security-oauth2-core:${springSecurityVersion}")
@@ -783,11 +839,11 @@ void disallowDowngrade() {
plugins {
id 'java'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation("org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}")
implementation("org.springframework.security:spring-security-oauth2-core:${springSecurityVersion}")
@@ -806,11 +862,11 @@ void dontDowngradeWhenExactVersion() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation 'com.google.guava:guava:29.0-jre'
}
@@ -828,11 +884,11 @@ void leaveConstraintsAlone() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
constraints {
implementation("com.google.guava:guava:28.0-jre")
@@ -854,11 +910,11 @@ void unknownConfiguration() {
id 'java'
id "org.hidetake.swagger.generator" version "2.18.2"
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
swaggerCodegen "org.openapitools:openapi-generator-cli:5.2.0"
}
@@ -868,11 +924,11 @@ void unknownConfiguration() {
id 'java'
id "org.hidetake.swagger.generator" version "2.18.2"
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
swaggerCodegen "org.openapitools:openapi-generator-cli:5.2.1"
}
@@ -890,11 +946,11 @@ void noActionForNonStringLiterals() {
plugins {
id 'java'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation(gradleApi())
jar {
@@ -908,7 +964,7 @@ void noActionForNonStringLiterals() {
@Test
@Issue("https://github.com/openrewrite/rewrite-java-dependencies/pull/106")
- void isAcceptable(){
+ void isAcceptable() {
// Mimic org.openrewrite.java.dependencies.UpgradeTransitiveDependencyVersion#getVisitor
UpgradeDependencyVersion guava = new UpgradeDependencyVersion("com.google.guava", "guava", "30.x", "-jre");
TreeVisitor visitor = guava.getVisitor();
@@ -930,11 +986,11 @@ void exactVersionWithExactPattern() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation('com.google.guava:guava:29.0-jre')
}
@@ -943,11 +999,11 @@ void exactVersionWithExactPattern() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation('com.google.guava:guava:32.1.1-jre')
}
@@ -960,17 +1016,17 @@ void exactVersionWithExactPattern() {
@Issue("https://github.com/openrewrite/rewrite/issues/4333")
void exactVersionWithRegexPattern() {
rewriteRun(
- spec -> spec.recipe(new UpgradeDependencyVersion("com.google.guava", "guava", "32.1.1", ".*droid")),
+ spec -> spec.recipe(new UpgradeDependencyVersion("com.google.guava", "guava", "32.1.1", "-.*?droid")),
buildGradle(
"""
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation('com.google.guava:guava:29.0-android')
}
@@ -979,11 +1035,11 @@ void exactVersionWithRegexPattern() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation('com.google.guava:guava:32.1.1-android')
}
@@ -1001,11 +1057,11 @@ void upgradesDependencyVersionDefinedInJvmTestSuite() {
id "java-library"
id 'jvm-test-suite'
}
-
+
repositories {
mavenCentral()
}
-
+
testing {
suites {
test {
@@ -1021,11 +1077,11 @@ void upgradesDependencyVersionDefinedInJvmTestSuite() {
id "java-library"
id 'jvm-test-suite'
}
-
+
repositories {
mavenCentral()
}
-
+
testing {
suites {
test {
@@ -1091,11 +1147,11 @@ void issue4655() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
version='ORC-246-1-SNAPSHOT'
dependencies {
implementation "com.veon.eurasia.oraculum:jira-api:$version"
diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddBuildPluginTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddBuildPluginTest.java
index 252765fc17f..90868e8e2a6 100644
--- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddBuildPluginTest.java
+++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddBuildPluginTest.java
@@ -35,7 +35,7 @@ public void defaults(RecipeSpec spec) {
@Test
void addPluginWithoutVersionToNewBlock() {
rewriteRun(
- spec -> spec.recipe(new AddBuildPlugin("java-library", null, null, null)),
+ spec -> spec.recipe(new AddBuildPlugin("java-library", null, null, null, null)),
buildGradle(
"",
"""
@@ -50,7 +50,7 @@ void addPluginWithoutVersionToNewBlock() {
@Test
void addPluginWithoutVersionToExistingBlock() {
rewriteRun(
- spec -> spec.recipe(new AddBuildPlugin("java-library", null, null, null)),
+ spec -> spec.recipe(new AddBuildPlugin("java-library", null, null, null, null)),
buildGradle(
"""
plugins {
@@ -70,7 +70,7 @@ void addPluginWithoutVersionToExistingBlock() {
@Test
void addThirdPartyPluginWithoutVersion() {
rewriteRun(
- spec -> spec.recipe(new AddBuildPlugin("org.openrewrite.rewrite", null, null, null)),
+ spec -> spec.recipe(new AddBuildPlugin("org.openrewrite.rewrite", null, null, null, null)),
buildGradle(
"""
plugins {
@@ -90,7 +90,7 @@ void addThirdPartyPluginWithoutVersion() {
@Test
void addPluginWithVersionToNewBlock() {
rewriteRun(
- spec -> spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, null)),
+ spec -> spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, null, null)),
buildGradle(
"",
"""
@@ -105,7 +105,7 @@ void addPluginWithVersionToNewBlock() {
@Test
void addPluginWithVersionToExistingBlock() {
rewriteRun(
- spec -> spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, null)),
+ spec -> spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, null, null)),
buildGradle(
"""
plugins {
@@ -125,20 +125,18 @@ void addPluginWithVersionToExistingBlock() {
@Test
void addPluginAfterBuildscriptBlock() {
rewriteRun(
- spec -> spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, null)),
+ spec -> spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, null, null)),
buildGradle(
"""
import java.util.List
-
buildscript {
}
""",
"""
import java.util.List
-
buildscript {
}
-
+
plugins {
id 'com.jfrog.bintray' version '1.0'
}
@@ -151,7 +149,7 @@ void addPluginAfterBuildscriptBlock() {
void addPluginToNewBlockWithLicenseHeader() {
rewriteRun(
spec -> {
- spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, null));
+ spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, null, null));
spec.allSources(s -> s.markers(new BuildTool(randomId(), BuildTool.Type.Gradle, "7.6.1")));
},
buildGradle(
@@ -159,7 +157,7 @@ void addPluginToNewBlockWithLicenseHeader() {
/*
* License header
*/
-
+
dependencies {
}
""", """
@@ -182,7 +180,7 @@ void addPluginToNewBlockWithLicenseHeader() {
void addPluginToNewBlockWithLicenseHeaderAndComment() {
rewriteRun(
spec -> {
- spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, null));
+ spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, null, null));
spec.allSources(s -> s.markers(new BuildTool(randomId(), BuildTool.Type.Gradle, "7.6.1")));
},
buildGradle(
@@ -190,7 +188,6 @@ void addPluginToNewBlockWithLicenseHeaderAndComment() {
/*
* License header
*/
-
// Comment
dependencies {
}
@@ -198,7 +195,6 @@ void addPluginToNewBlockWithLicenseHeaderAndComment() {
/*
* License header
*/
-
plugins {
id 'com.jfrog.bintray' version '1.0'
}
@@ -215,7 +211,7 @@ void addPluginToNewBlockWithLicenseHeaderAndComment() {
void addPluginToNewBlockWithOnlyLicenseHeader() {
rewriteRun(
spec -> {
- spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, null));
+ spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, null, null));
spec.allSources(s -> s.markers(new BuildTool(randomId(), BuildTool.Type.Gradle, "7.6.1")));
},
buildGradle(
@@ -239,7 +235,7 @@ void addPluginToNewBlockWithOnlyLicenseHeader() {
@Test
void addPluginApplyFalse() {
rewriteRun(
- spec -> spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, false)),
+ spec -> spec.recipe(new AddBuildPlugin("com.jfrog.bintray", "1.0", null, false, null)),
buildGradle(
"""
plugins {
diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddSettingsPluginTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddSettingsPluginTest.java
index 9a838dddd52..4700abd60ab 100644
--- a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddSettingsPluginTest.java
+++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddSettingsPluginTest.java
@@ -34,7 +34,7 @@ class AddSettingsPluginTest implements RewriteTest {
@Override
public void defaults(RecipeSpec spec) {
spec.beforeRecipe(withToolingApi())
- .recipe(new AddSettingsPlugin("com.gradle.enterprise", "3.11.x", null, null));
+ .recipe(new AddSettingsPlugin("com.gradle.enterprise", "3.11.x", null, null, null));
}
@Test
@@ -80,7 +80,7 @@ void addPluginToExistingBlock() {
"""
plugins {
}
-
+
rootProject.name = 'my-project'
""",
interpolateResolvedVersion(
@@ -88,7 +88,7 @@ void addPluginToExistingBlock() {
plugins {
id 'com.gradle.enterprise' version '%s'
}
-
+
rootProject.name = 'my-project'
"""
)
@@ -132,7 +132,7 @@ void addPluginWithPluginManagementBlock() {
void addPluginApplyFalse() {
rewriteRun(
spec -> spec.beforeRecipe(withToolingApi())
- .recipe(new AddSettingsPlugin("com.gradle.enterprise", "3.11.x", null, false)),
+ .recipe(new AddSettingsPlugin("com.gradle.enterprise", "3.11.x", null, false, null)),
settingsGradle(
"",
interpolateResolvedVersion(
diff --git a/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/RemoveDevelocityTest.java b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/RemoveDevelocityTest.java
new file mode 100644
index 00000000000..3c26e264f79
--- /dev/null
+++ b/rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/RemoveDevelocityTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.gradle.plugins;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.DocumentExample;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+import static org.openrewrite.gradle.Assertions.settingsGradle;
+import static org.openrewrite.gradle.toolingapi.Assertions.withToolingApi;
+
+class RemoveDevelocityTest implements RewriteTest {
+ @Override
+ public void defaults(RecipeSpec spec) {
+ spec
+ .beforeRecipe(withToolingApi())
+ .recipeFromResource("/META-INF/rewrite/gradle.yml", "org.openrewrite.gradle.plugins.RemoveDevelocity");
+ }
+
+ @Test
+ @DocumentExample
+ void removeGradleEnterprise() {
+ rewriteRun(
+ settingsGradle(
+ """
+ plugins {
+ id 'com.gradle.enterprise' version '3.16'
+ }
+ gradleEnterprise {
+ server = 'https://ge.sam.com/'
+ allowUntrustedServer = true
+ buildScan {
+ publishAlways()
+ uploadInBackground = true
+ capture {
+ taskInputFiles = true
+ }
+ }
+ buildCache {
+ remote(gradleEnterprise.buildCache) {
+ enabled = true
+ push = System.getenv("CI") != null
+ }
+ }
+ }
+ """,
+ ""
+ )
+ );
+ }
+
+ @Test
+ void removeDevelocity() {
+ rewriteRun(
+ settingsGradle(
+ """
+ plugins {
+ id 'com.gradle.develocity' version '3.17.6'
+ }
+ develocity {
+ server = 'https://ge.sam.com/'
+ allowUntrustedServer = true
+ buildScan {
+ uploadInBackground = true
+ capture {
+ fileFingerprints = true
+ }
+ }
+ buildCache {
+ remote(develocity.buildCache) {
+ enabled = true
+ push = System.getenv("CI") != null
+ }
+ }
+ }
+ """,
+ ""
+ )
+ );
+ }
+}
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java
index 47b65310df4..9d8cdc534bf 100644
--- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java
@@ -16,6 +16,8 @@
package org.openrewrite.groovy;
import groovy.lang.GroovySystem;
+import groovy.transform.Generated;
+import groovy.transform.Immutable;
import groovyjarjarasm.asm.Opcodes;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -36,12 +38,16 @@
import org.openrewrite.internal.ListUtils;
import org.openrewrite.java.internal.JavaTypeCache;
import org.openrewrite.java.marker.ImplicitReturn;
+import org.openrewrite.java.marker.OmitParentheses;
import org.openrewrite.java.marker.Semicolon;
+import org.openrewrite.java.marker.TrailingComma;
import org.openrewrite.java.tree.*;
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.Statement;
import org.openrewrite.marker.Markers;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Modifier;
import java.math.BigDecimal;
import java.nio.charset.Charset;
import java.nio.file.Path;
@@ -51,11 +57,11 @@
import java.util.function.Supplier;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
import static org.openrewrite.Tree.randomId;
import static org.openrewrite.internal.StringUtils.indexOfNextNonWhitespace;
import static org.openrewrite.java.tree.Space.EMPTY;
@@ -130,9 +136,8 @@ public G.CompilationUnit visit(SourceUnit unit, ModuleNode ast) throws GroovyPar
JRightPadded pkg = null;
if (ast.getPackage() != null) {
prefix = whitespace();
- cursor += "package".length();
- pkg = JRightPadded.build(new J.Package(randomId(), EMPTY, Markers.EMPTY,
- typeTree(null), emptyList()));
+ skip("package");
+ pkg = maybeSemicolon(new J.Package(randomId(), EMPTY, Markers.EMPTY, typeTree(null), emptyList()));
}
for (ImportNode anImport : ast.getImports()) {
@@ -149,10 +154,8 @@ public G.CompilationUnit visit(SourceUnit unit, ModuleNode ast) throws GroovyPar
}
for (ClassNode aClass : ast.getClasses()) {
- if (aClass.getSuperClass() == null ||
- !("groovy.lang.Script".equals(aClass.getSuperClass().getName()) ||
- "RewriteGradleProject".equals(aClass.getSuperClass().getName()) ||
- "RewriteSettings".equals(aClass.getSuperClass().getName()))) {
+ // skip over the synthetic script class
+ if (!aClass.getName().equals(ast.getMainClassName()) || !aClass.getName().endsWith("doesntmatter")) {
sortedByPosition.computeIfAbsent(pos(aClass), i -> new ArrayList<>()).add(aClass);
}
}
@@ -204,7 +207,7 @@ public G.CompilationUnit visit(SourceUnit unit, ModuleNode ast) throws GroovyPar
null,
pkg,
statements,
- format(source.substring(cursor))
+ format(source, cursor, source.length())
);
}
@@ -218,32 +221,23 @@ private class RewriteGroovyClassVisitor extends ClassCodeVisitorSupport {
@Override
public void visitClass(ClassNode clazz) {
Space fmt = whitespace();
- List leadingAnnotations;
- if (clazz.getAnnotations().isEmpty()) {
- leadingAnnotations = emptyList();
- } else {
- leadingAnnotations = new ArrayList<>(clazz.getAnnotations().size());
- for (AnnotationNode annotation : clazz.getAnnotations()) {
- visitAnnotation(annotation);
- leadingAnnotations.add(pollQueue());
- }
- }
+ List leadingAnnotations = visitAndGetAnnotations(clazz);
List modifiers = visitModifiers(clazz.getModifiers());
Space kindPrefix = whitespace();
J.ClassDeclaration.Kind.Type kindType = null;
if (source.startsWith("class", cursor)) {
kindType = J.ClassDeclaration.Kind.Type.Class;
- cursor += "class".length();
+ skip("class");
} else if (source.startsWith("interface", cursor)) {
kindType = J.ClassDeclaration.Kind.Type.Interface;
- cursor += "interface".length();
+ skip("interface");
} else if (source.startsWith("@interface", cursor)) {
kindType = J.ClassDeclaration.Kind.Type.Annotation;
- cursor += "@interface".length();
+ skip("@interface");
} else if (source.startsWith("enum", cursor)) {
kindType = J.ClassDeclaration.Kind.Type.Enum;
- cursor += "enum".length();
+ skip("enum");
}
assert kindType != null;
J.ClassDeclaration.Kind kind = new J.ClassDeclaration.Kind(randomId(), kindPrefix, Markers.EMPTY, emptyList(), kindType);
@@ -256,8 +250,15 @@ public void visitClass(ClassNode clazz) {
}
JLeftPadded extendings = null;
- if (clazz.getSuperClass().getLineNumber() >= 0) {
- extendings = padLeft(sourceBefore("extends"), visitTypeTree(clazz.getSuperClass()));
+ if (kindType == J.ClassDeclaration.Kind.Type.Class) {
+ int saveCursor = cursor;
+ Space extendsPrefix = whitespace();
+ if (source.startsWith("extends", cursor)) {
+ skip("extends");
+ extendings = padLeft(extendsPrefix, visitTypeTree(clazz.getSuperClass()));
+ } else {
+ cursor = saveCursor;
+ }
}
JContainer implementings = null;
@@ -273,7 +274,7 @@ public void visitClass(ClassNode clazz) {
for (int i = 0; i < interfaces.length; i++) {
ClassNode anInterface = interfaces[i];
// Any annotation @interface is listed as extending java.lang.annotation.Annotation, although it doesn't appear in source
- if (kindType == J.ClassDeclaration.Kind.Type.Annotation && "java.lang.annotation.Annotation".equals(anInterface.getName())) {
+ if (kindType == J.ClassDeclaration.Kind.Type.Annotation && Annotation.class.getName().equals(anInterface.getName())) {
continue;
}
implTypes.add(JRightPadded.build(visitTypeTree(anInterface))
@@ -310,18 +311,18 @@ J.Block visitClassBlock(ClassNode clazz) {
org.codehaus.groovy.ast.stmt.Statement statement = ((BlockStatement) method.getCode()).getStatements().get(0);
sortedByPosition.computeIfAbsent(pos(statement), i -> new ArrayList<>()).add(statement);
}
- } else {
+ } else if (method.getAnnotations(new ClassNode(Generated.class)).isEmpty()) {
sortedByPosition.computeIfAbsent(pos(method), i -> new ArrayList<>()).add(method);
}
}
for (org.codehaus.groovy.ast.stmt.Statement objectInitializer : clazz.getObjectInitializerStatements()) {
- if(!(objectInitializer instanceof BlockStatement)) {
+ if (!(objectInitializer instanceof BlockStatement)) {
continue;
}
// A class initializer BlockStatement will be wrapped in an otherwise empty BlockStatement with the same source positions
// No idea why, except speculation that it is for consistency with static intiializers, but we can skip the wrapper and just visit its contents
BlockStatement s = (BlockStatement) objectInitializer;
- if(s.getStatements().size() == 1 && pos(s).equals(pos(s.getStatements().get(0)))) {
+ if (s.getStatements().size() == 1 && pos(s).equals(pos(s.getStatements().get(0)))) {
s = (BlockStatement) s.getStatements().get(0);
}
sortedByPosition.computeIfAbsent(pos(s), i -> new ArrayList<>())
@@ -369,11 +370,11 @@ class A {
JRightPadded.build(false),
sortedByPosition.values().stream()
.flatMap(asts -> asts.stream()
+ // anonymous classes will be visited as part of visiting the ConstructorCallExpression
+ .filter(ast -> !(ast instanceof InnerClassNode && ((InnerClassNode) ast).isAnonymous()))
.map(ast -> {
if (ast instanceof FieldNode) {
visitField((FieldNode) ast);
- } else if (ast instanceof ConstructorNode) {
- visitConstructor((ConstructorNode) ast);
} else if (ast instanceof MethodNode) {
visitMethod((MethodNode) ast);
} else if (ast instanceof ClassNode) {
@@ -384,7 +385,7 @@ class A {
Statement stat = pollQueue();
return maybeSemicolon(stat);
}))
- .collect(Collectors.toList()),
+ .collect(toList()),
sourceBefore("}"));
}
@@ -412,13 +413,7 @@ private void visitEnumField(@SuppressWarnings("unused") FieldNode fieldNode) {
private void visitVariableField(FieldNode field) {
RewriteGroovyVisitor visitor = new RewriteGroovyVisitor(field, this);
- List annotations = field.getAnnotations().stream()
- .map(a -> {
- visitAnnotation(a);
- return (J.Annotation) pollQueue();
- })
- .collect(Collectors.toList());
-
+ List annotations = visitAndGetAnnotations(field);
List modifiers = visitModifiers(field.getModifiers());
TypeTree typeExpr = visitTypeTree(field.getOriginType());
@@ -459,42 +454,48 @@ private void visitVariableField(FieldNode field) {
@Override
protected void visitAnnotation(AnnotationNode annotation) {
RewriteGroovyVisitor bodyVisitor = new RewriteGroovyVisitor(annotation, this);
-
String lastArgKey = annotation.getMembers().keySet().stream().reduce("", (k1, k2) -> k2);
Space prefix = sourceBefore("@");
NameTree annotationType = visitTypeTree(annotation.getClassNode());
JContainer arguments = null;
if (!annotation.getMembers().isEmpty()) {
- // This doesn't handle the case where an annotation has empty arguments like @Foo(), but that is rare
arguments = JContainer.build(
sourceBefore("("),
annotation.getMembers().entrySet().stream()
+ // Non-value implicit properties should not be represented in our LST.
+ .filter(it -> sourceStartsWith(it.getKey()) || "value".equals(it.getKey()))
.map(arg -> {
- Space argPrefix;
- if ("value".equals(arg.getKey())) {
- // Determine whether the value is implicit or explicit
- int saveCursor = cursor;
- argPrefix = whitespace();
- if (!source.startsWith("value", cursor)) {
- return new JRightPadded(
- ((Expression) bodyVisitor.visit(arg.getValue())).withPrefix(argPrefix),
- arg.getKey().equals(lastArgKey) ? sourceBefore(")") : sourceBefore(","),
- Markers.EMPTY);
- }
- cursor = saveCursor;
+ boolean isImplicitValue = "value".equals(arg.getKey()) && !sourceStartsWith("value");
+ Space argPrefix = isImplicitValue ? whitespace() : sourceBefore(arg.getKey());
+ Space isSign = isImplicitValue ? null : sourceBefore("=");
+ Expression expression;
+ if (arg.getValue() instanceof AnnotationConstantExpression) {
+ visitAnnotation((AnnotationNode) ((AnnotationConstantExpression) arg.getValue()).getValue());
+ expression = (J.Annotation) queue.poll();
+ } else {
+ expression = bodyVisitor.visit(arg.getValue());
}
- argPrefix = sourceBefore(arg.getKey());
- J.Identifier argName = new J.Identifier(randomId(), EMPTY, Markers.EMPTY, emptyList(), arg.getKey(), null, null);
- J.Assignment assign = new J.Assignment(randomId(), argPrefix, Markers.EMPTY,
- argName, padLeft(sourceBefore("="), bodyVisitor.visit(arg.getValue())),
- null);
- return JRightPadded.build((Expression) assign)
+ Expression element = isImplicitValue ? expression
+ : (new J.Assignment(randomId(), argPrefix, Markers.EMPTY,
+ new J.Identifier(randomId(), EMPTY, Markers.EMPTY, emptyList(), arg.getKey(), null, null),
+ padLeft(isSign, expression), null));
+ return JRightPadded.build(element)
.withAfter(arg.getKey().equals(lastArgKey) ? sourceBefore(")") : sourceBefore(","));
})
- .collect(Collectors.toList()),
+ .collect(toList()),
Markers.EMPTY
);
+ // Rare scenario where annotation does only have non-value implicit properties
+ if (arguments.getElements().isEmpty()) {
+ arguments = null;
+ }
+ } else if (sourceStartsWith("(")) {
+ // Annotation with empty arguments like @Foo()
+ arguments = JContainer.build(sourceBefore("("),
+ singletonList(JRightPadded.build(new J.Empty(randomId(), sourceBefore(")"), Markers.EMPTY))),
+ Markers.EMPTY);
}
+
queue.add(new J.Annotation(randomId(), prefix, Markers.EMPTY, annotationType, arguments));
}
@@ -502,23 +503,46 @@ argName, padLeft(sourceBefore("="), bodyVisitor.visit(arg.getValue())),
public void visitMethod(MethodNode method) {
Space fmt = whitespace();
- List annotations = method.getAnnotations().stream()
- .map(a -> {
- visitAnnotation(a);
- return (J.Annotation) pollQueue();
- })
- .collect(Collectors.toList());
-
+ List annotations = visitAndGetAnnotations(method);
List modifiers = visitModifiers(method.getModifiers());
+ boolean isConstructorOfInnerNonStaticClass = false;
+ RedundantDef redundantDef = getRedundantDefMarker(method);
+ J.TypeParameters typeParameters = null;
+ if (method.getGenericsTypes() != null) {
+ Space prefix = sourceBefore("<");
+ GenericsType[] genericsTypes = method.getGenericsTypes();
+ List> typeParametersList = new ArrayList<>(genericsTypes.length);
+ for (int i = 0; i < genericsTypes.length; i++) {
+ typeParametersList.add(JRightPadded.build(visitTypeParameter(genericsTypes[i]))
+ .withAfter(i < genericsTypes.length - 1 ? sourceBefore(",") : sourceBefore(">")));
+ }
+ typeParameters = new J.TypeParameters(randomId(), prefix, Markers.EMPTY, emptyList(), typeParametersList);
+ }
+ TypeTree returnType = method instanceof ConstructorNode ? null : visitTypeTree(method.getReturnType());
- TypeTree returnType = visitTypeTree(method.getReturnType());
-
- // Method name might be in quotes
Space namePrefix = whitespace();
String methodName;
- if (source.startsWith(method.getName(), cursor)) {
+ if (method instanceof ConstructorNode) {
+ /*
+ To support Java syntax for non-static inner classes, the groovy compiler uses an extra parameter with a reference to its parent class under the hood:
+ class A { class A {
+ class B { class B {
+ String s String s
+ B(String s) { => B(A $p$, String s) {
+ => new Object().this$0 = $p$
+ this.s = s => this.s = s
+ } }
+ } }
+ }
+ In our LST, we don't need this internal logic, so we'll skip the first param + first two statements (ConstructorCallExpression and BlockStatement)}
+ See also: https://groovy-lang.org/differences.html#_creating_instances_of_non_static_inner_classes
+ */
+ isConstructorOfInnerNonStaticClass = method.getDeclaringClass() instanceof InnerClassNode && (method.getDeclaringClass().getModifiers() & Modifier.STATIC) == 0;
+ methodName = method.getDeclaringClass().getName().replaceFirst(".*\\$", "");
+ } else if (source.startsWith(method.getName(), cursor)) {
methodName = method.getName();
} else {
+ // Method name might be in quotes
char openingQuote = source.charAt(cursor);
methodName = openingQuote + method.getName() + openingQuote;
}
@@ -536,15 +560,10 @@ public void visitMethod(MethodNode method) {
Space beforeParen = sourceBefore("(");
List> params = new ArrayList<>(method.getParameters().length);
Parameter[] unparsedParams = method.getParameters();
- for (int i = 0; i < unparsedParams.length; i++) {
+ for (int i = (isConstructorOfInnerNonStaticClass ? 1 : 0); i < unparsedParams.length; i++) {
Parameter param = unparsedParams[i];
- List paramAnnotations = param.getAnnotations().stream()
- .map(a -> {
- visitAnnotation(a);
- return (J.Annotation) pollQueue();
- })
- .collect(Collectors.toList());
+ List paramAnnotations = visitAndGetAnnotations(param);
TypeTree paramType;
if (param.isDynamicTyped()) {
@@ -552,12 +571,20 @@ public void visitMethod(MethodNode method) {
} else {
paramType = visitTypeTree(param.getOriginType());
}
+
+ Space varargs = null;
+ if (paramType instanceof J.ArrayType && sourceStartsWith("...")) {
+ int varargStart = indexOfNextNonWhitespace(cursor, source);
+ varargs = format(source, cursor, varargStart);
+ cursor = varargStart + 3;
+ }
+
JRightPadded paramName = JRightPadded.build(
new J.VariableDeclarations.NamedVariable(randomId(), EMPTY, Markers.EMPTY,
new J.Identifier(randomId(), whitespace(), Markers.EMPTY, emptyList(), param.getName(), null, null),
emptyList(), null, null)
);
- cursor += param.getName().length();
+ skip(param.getName());
org.codehaus.groovy.ast.expr.Expression defaultValue = param.getInitialExpression();
if (defaultValue != null) {
@@ -571,11 +598,11 @@ public void visitMethod(MethodNode method) {
params.add(JRightPadded.build((Statement) new J.VariableDeclarations(randomId(), EMPTY,
Markers.EMPTY, paramAnnotations, emptyList(), paramType,
- null, emptyList(),
+ varargs, emptyList(),
singletonList(paramName))).withAfter(rightPad));
}
- if (unparsedParams.length == 0) {
+ if (unparsedParams.length == 0 || (isConstructorOfInnerNonStaticClass && unparsedParams.length == 1)) {
params.add(JRightPadded.build(new J.Empty(randomId(), sourceBefore(")"), Markers.EMPTY)));
}
@@ -585,14 +612,23 @@ null, emptyList(),
Markers.EMPTY
);
- J.Block body = method.getCode() == null ? null :
- bodyVisitor.visit(method.getCode());
+ J.Block body = null;
+ if (method.getCode() != null) {
+ ASTNode code = isConstructorOfInnerNonStaticClass ?
+ new BlockStatement(
+ ((BlockStatement) method.getCode()).getStatements().subList(2, ((BlockStatement) method.getCode()).getStatements().size()),
+ ((BlockStatement) method.getCode()).getVariableScope()
+ )
+ : method.getCode();
+ body = bodyVisitor.visit(code);
+ }
queue.add(new J.MethodDeclaration(
- randomId(), fmt, Markers.EMPTY,
+ randomId(), fmt,
+ redundantDef == null ? Markers.EMPTY : Markers.EMPTY.add(redundantDef),
annotations,
modifiers,
- null,
+ typeParameters,
returnType,
new J.MethodDeclaration.IdentifierWithAnnotations(name, emptyList()),
JContainer.build(beforeParen, params, Markers.EMPTY),
@@ -603,107 +639,44 @@ null, emptyList(),
));
}
- @Override
- public void visitConstructor(ConstructorNode ctor) {
- Space fmt = whitespace();
-
- List annotations = ctor.getAnnotations().stream()
- .map(a -> {
- visitAnnotation(a);
- return (J.Annotation) pollQueue();
- })
- .collect(Collectors.toList());
-
- List modifiers = visitModifiers(ctor.getModifiers());
-
- // Constructor name might be in quotes
- Space namePrefix = whitespace();
- String ctorName;
- if (source.startsWith(ctor.getDeclaringClass().getName(), cursor)) {
- ctorName = ctor.getDeclaringClass().getName();
- } else {
- char openingQuote = source.charAt(cursor);
- ctorName = openingQuote + ctor.getName() + openingQuote;
+ /**
+ * Methods can be declared with "def" AND a return type (or constructors with "def").
+ * In these cases the "def" is semantically meaningless but needs to be preserved for source code accuracy.
+ * If there is both a def and a return type, this method returns a RedundantDef object and advances the cursor
+ * position past the "def" keyword, leaving the return type to be parsed as normal.
+ */
+ private @Nullable RedundantDef getRedundantDefMarker(MethodNode method) {
+ int saveCursor = cursor;
+ Space defPrefix = whitespace();
+ if (source.startsWith("def", cursor) && (method.getReturnType().isRedirectNode() || !Object.class.getName().equals(method.getReturnType().getName()))) {
+ skip("def");
+ return new RedundantDef(randomId(), defPrefix);
}
- cursor += ctorName.length();
- J.Identifier name = new J.Identifier(randomId(),
- namePrefix,
- Markers.EMPTY,
- emptyList(),
- ctorName,
- null, null);
-
- RewriteGroovyVisitor bodyVisitor = new RewriteGroovyVisitor(ctor, this);
- // Parameter has no visit implementation, so we've got to do this by hand
- Space beforeParen = sourceBefore("(");
- List> params = new ArrayList<>(ctor.getParameters().length);
- Parameter[] unparsedParams = ctor.getParameters();
- for (int i = 0; i < unparsedParams.length; i++) {
- Parameter param = unparsedParams[i];
+ cursor = saveCursor;
+ return null;
+ }
- List paramAnnotations = param.getAnnotations().stream()
- .map(a -> {
- visitAnnotation(a);
- return (J.Annotation) pollQueue();
- })
- .collect(Collectors.toList());
+ public List visitAndGetAnnotations(AnnotatedNode node) {
+ if (node.getAnnotations().isEmpty()) {
+ return emptyList();
+ }
- TypeTree paramType;
- if (param.isDynamicTyped()) {
- paramType = new J.Identifier(randomId(), EMPTY, Markers.EMPTY, emptyList(), "", JavaType.ShallowClass.build("java.lang.Object"), null);
- } else {
- paramType = visitTypeTree(param.getOriginType());
+ List paramAnnotations = new ArrayList<>(node.getAnnotations().size());
+ for (AnnotationNode annotationNode : node.getAnnotations()) {
+ // The groovy compiler can add or remove annotations for AST transformations.
+ // Because @groovy.transform.Immutable is discarded in favour of other transform annotations, the removed annotation must be parsed by hand.
+ if (sourceStartsWith("@" + Immutable.class.getSimpleName()) || sourceStartsWith("@" + Immutable.class.getCanonicalName())) {
+ visitAnnotation(new AnnotationNode(new ClassNode(Immutable.class)));
+ paramAnnotations.add(pollQueue());
}
- JRightPadded paramName = JRightPadded.build(
- new J.VariableDeclarations.NamedVariable(randomId(), EMPTY, Markers.EMPTY,
- new J.Identifier(randomId(), whitespace(), Markers.EMPTY, emptyList(), param.getName(), null, null),
- emptyList(), null, null)
- );
- cursor += param.getName().length();
- org.codehaus.groovy.ast.expr.Expression defaultValue = param.getInitialExpression();
- if (defaultValue != null) {
- paramName = paramName.withElement(paramName.getElement().getPadding()
- .withInitializer(new JLeftPadded<>(
- sourceBefore("="),
- new RewriteGroovyVisitor(defaultValue, this).visit(defaultValue),
- Markers.EMPTY)));
+ if (appearsInSource(annotationNode)) {
+ visitAnnotation(annotationNode);
+ paramAnnotations.add(pollQueue());
}
- Space rightPad = sourceBefore(i == unparsedParams.length - 1 ? ")" : ",");
-
- params.add(JRightPadded.build((Statement) new J.VariableDeclarations(randomId(), EMPTY,
- Markers.EMPTY, paramAnnotations, emptyList(), paramType,
- null, emptyList(),
- singletonList(paramName))).withAfter(rightPad));
- }
-
- if (unparsedParams.length == 0) {
- params.add(JRightPadded.build(new J.Empty(randomId(), sourceBefore(")"), Markers.EMPTY)));
}
-
- JContainer throws_ = ctor.getExceptions().length == 0 ? null : JContainer.build(
- sourceBefore("throws"),
- bodyVisitor.visitRightPadded(ctor.getExceptions(), null),
- Markers.EMPTY
- );
-
- J.Block body = ctor.getCode() == null ? null :
- bodyVisitor.visit(ctor.getCode());
-
- queue.add(new J.MethodDeclaration(
- randomId(), fmt, Markers.EMPTY,
- annotations,
- modifiers,
- null,
- null,
- new J.MethodDeclaration.IdentifierWithAnnotations(name, emptyList()),
- JContainer.build(beforeParen, params, Markers.EMPTY),
- throws_,
- body,
- null,
- typeMapping.methodType(ctor)
- ));
+ return paramAnnotations;
}
@SuppressWarnings({"ConstantConditions", "unchecked"})
@@ -733,19 +706,17 @@ private List> visitRightPadded(ASTNode[] nodes, @Nullable St
List> ts = new ArrayList<>(nodes.length);
for (int i = 0; i < nodes.length; i++) {
ASTNode node = nodes[i];
- @SuppressWarnings("unchecked") JRightPadded converted = JRightPadded.build(
- node instanceof ClassNode ? (T) visitTypeTree((ClassNode) node) : visit(node));
+ @SuppressWarnings("unchecked")
+ JRightPadded converted = JRightPadded.build(node instanceof ClassNode ? (T) visitTypeTree((ClassNode) node) : visit(node));
if (i == nodes.length - 1) {
converted = converted.withAfter(whitespace());
if (',' == source.charAt(cursor)) {
// In Groovy trailing "," are allowed
- cursor += 1;
- converted = converted.withMarkers(Markers.EMPTY.add(new org.openrewrite.java.marker.TrailingComma(randomId(), whitespace())));
+ skip(",");
+ converted = converted.withMarkers(Markers.EMPTY.add(new TrailingComma(randomId(), whitespace())));
}
ts.add(converted);
- if (afterLast != null && source.startsWith(afterLast, cursor)) {
- cursor += afterLast.length();
- }
+ skip(afterLast);
} else {
ts.add(converted.withAfter(sourceBefore(",")));
}
@@ -797,74 +768,71 @@ public void visitArgumentlistExpression(ArgumentListExpression expression) {
int saveCursor = cursor;
Space beforeOpenParen = whitespace();
- org.openrewrite.java.marker.OmitParentheses omitParentheses = null;
+ boolean hasParentheses = true;
if (source.charAt(cursor) == '(') {
- cursor++;
+ skip("(");
} else {
- omitParentheses = new org.openrewrite.java.marker.OmitParentheses(randomId());
+ hasParentheses = false;
beforeOpenParen = EMPTY;
cursor = saveCursor;
}
List unparsedArgs = expression.getExpressions().stream()
- .filter(GroovyParserVisitor::appearsInSource)
- .collect(Collectors.toList());
+ .filter(GroovyParserVisitor.this::appearsInSource)
+ .collect(toList());
// If the first parameter to a function is a Map, then groovy allows "named parameters" style invocations, see:
// https://docs.groovy-lang.org/latest/html/documentation/#_named_parameters_2
// When named parameters are in use they may appear before, after, or intermixed with any positional arguments
if (unparsedArgs.size() > 1 && unparsedArgs.get(0) instanceof MapExpression &&
(unparsedArgs.get(0).getLastLineNumber() > unparsedArgs.get(1).getLastLineNumber() ||
- (unparsedArgs.get(0).getLastLineNumber() == unparsedArgs.get(1).getLastLineNumber() &&
- unparsedArgs.get(0).getLastColumnNumber() > unparsedArgs.get(1).getLastColumnNumber()))) {
+ (unparsedArgs.get(0).getLastLineNumber() == unparsedArgs.get(1).getLastLineNumber() &&
+ unparsedArgs.get(0).getLastColumnNumber() > unparsedArgs.get(1).getLastColumnNumber()))) {
// Figure out the source-code ordering of the expressions
MapExpression namedArgExpressions = (MapExpression) unparsedArgs.get(0);
unparsedArgs =
- Stream.concat(
- namedArgExpressions.getMapEntryExpressions().stream(),
- unparsedArgs.subList(1, unparsedArgs.size()).stream())
- .sorted(Comparator.comparing(ASTNode::getLastLineNumber)
- .thenComparing(ASTNode::getLastColumnNumber))
- .collect(Collectors.toList());
+ ListUtils.concatAll(unparsedArgs.subList(1, unparsedArgs.size()), namedArgExpressions.getMapEntryExpressions()).stream()
+ .sorted(Comparator.comparing(ASTNode::getLastLineNumber).thenComparing(ASTNode::getLastColumnNumber))
+ .collect(toList());
} else if (!unparsedArgs.isEmpty() && unparsedArgs.get(0) instanceof MapExpression) {
// The map literal may or may not be wrapped in "[]"
// If it is wrapped in "[]" then this isn't a named arguments situation, and we should not lift the parameters out of the enclosing MapExpression
saveCursor = cursor;
whitespace();
- boolean isOpeningBracketPresent = '[' == source.charAt(cursor);
cursor = saveCursor;
- if (!isOpeningBracketPresent) {
+ if ('[' != source.charAt(cursor)) {
// Bring named parameters out of their containing MapExpression so that they can be parsed correctly
MapExpression namedArgExpressions = (MapExpression) unparsedArgs.get(0);
unparsedArgs =
Stream.concat(
namedArgExpressions.getMapEntryExpressions().stream(),
unparsedArgs.subList(1, unparsedArgs.size()).stream())
- .collect(Collectors.toList());
+ .collect(toList());
}
}
if (unparsedArgs.isEmpty()) {
args.add(JRightPadded.build((Expression) new J.Empty(randomId(), whitespace(), Markers.EMPTY))
- .withAfter(omitParentheses == null ? sourceBefore(")") : EMPTY));
+ .withAfter(hasParentheses ? sourceBefore(")") : EMPTY));
} else {
+ boolean lastArgumentsAreAllClosures = endsWithClosures(expression.getExpressions());
for (int i = 0; i < unparsedArgs.size(); i++) {
org.codehaus.groovy.ast.expr.Expression rawArg = unparsedArgs.get(i);
Expression arg = visit(rawArg);
- if (omitParentheses != null) {
- arg = arg.withMarkers(arg.getMarkers().add(omitParentheses));
+ if (!hasParentheses) {
+ arg = arg.withMarkers(arg.getMarkers().add(new OmitParentheses(randomId())));
}
Space after = EMPTY;
if (i == unparsedArgs.size() - 1) {
- if (omitParentheses == null) {
+ if (hasParentheses) {
after = sourceBefore(")");
}
- } else {
+ } else if (!(arg instanceof J.Lambda && lastArgumentsAreAllClosures && !hasParentheses)) {
after = whitespace();
if (source.charAt(cursor) == ')') {
- // the next argument will have an OmitParentheses marker
- omitParentheses = new org.openrewrite.java.marker.OmitParentheses(randomId());
+ // next argument(s), if they exists, are trailing closures and will have an OmitParentheses marker
+ hasParentheses = false;
}
cursor++;
}
@@ -876,12 +844,36 @@ public void visitArgumentlistExpression(ArgumentListExpression expression) {
queue.add(JContainer.build(beforeOpenParen, args, Markers.EMPTY));
}
+ public boolean endsWithClosures(List list) {
+ if (!(list.get(list.size() - 1) instanceof ClosureExpression)) {
+ return false;
+ }
+
+ boolean foundNonClosure = false;
+ for (int i = list.size() - 2; i >= 0; i--) {
+ if (list.get(i) instanceof ClosureExpression) {
+ if (foundNonClosure) {
+ return false;
+ }
+ } else {
+ foundNonClosure = true;
+ }
+ }
+
+ return true;
+ }
+
@Override
public void visitClassExpression(ClassExpression clazz) {
String unresolvedName = clazz.getType().getUnresolvedName().replace('$', '.');
+ Space space = sourceBefore(unresolvedName);
+ if (source.substring(cursor).startsWith(".class")) {
+ unresolvedName += ".class";
+ skip(".class");
+ }
queue.add(TypeTree.build(unresolvedName)
.withType(typeMapping.type(clazz.getType()))
- .withPrefix(sourceBefore(unresolvedName)));
+ .withPrefix(space));
}
@Override
@@ -1056,7 +1048,7 @@ public void visitBinaryExpression(BinaryExpression binary) {
public void visitBlockStatement(BlockStatement block) {
Space fmt = EMPTY;
Space staticInitPadding = EMPTY;
- boolean isStaticInit = source.substring(indexOfNextNonWhitespace(cursor, source)).startsWith("static");
+ boolean isStaticInit = sourceStartsWith("static");
Object parent = nodeCursor.getParentOrThrow().getValue();
if (isStaticInit) {
fmt = sourceBefore("static");
@@ -1072,7 +1064,7 @@ public void visitBlockStatement(BlockStatement block) {
J expr = visit(statement);
if (i == blockStatements.size() - 1 && (expr instanceof Expression)) {
if (parent instanceof ClosureExpression || (parent instanceof MethodNode &&
- !JavaType.Primitive.Void.equals(typeMapping.type(((MethodNode) parent).getReturnType())))) {
+ JavaType.Primitive.Void != typeMapping.type(((MethodNode) parent).getReturnType()))) {
expr = new J.Return(randomId(), expr.getPrefix(), Markers.EMPTY,
expr.withPrefix(EMPTY));
expr = expr.withMarkers(expr.getMarkers().add(new ImplicitReturn(randomId())));
@@ -1082,11 +1074,11 @@ public void visitBlockStatement(BlockStatement block) {
JRightPadded stat = JRightPadded.build((Statement) expr);
int saveCursor = cursor;
Space beforeSemicolon = whitespace();
- if (cursor < source.length() && source.charAt(cursor) == ';') {
+ if (source.charAt(cursor) == ';') {
stat = stat
.withMarkers(stat.getMarkers().add(new Semicolon(randomId())))
.withAfter(beforeSemicolon);
- cursor++;
+ skip(";");
} else {
cursor = saveCursor;
}
@@ -1111,11 +1103,11 @@ public void visitCatchStatement(CatchStatement node) {
Space paramPrefix = whitespace();
// Groovy allows catch variables to omit their type, shorthand for being of type java.lang.Exception
// Can't use isSynthetic() here because groovy doesn't record the line number on the Parameter
- if ("java.lang.Exception".equals(param.getType().getName()) &&
+ if (Exception.class.getName().equals(param.getType().getName()) &&
!source.startsWith("Exception", cursor) &&
!source.startsWith("java.lang.Exception", cursor)) {
paramType = new J.Identifier(randomId(), paramPrefix, Markers.EMPTY, emptyList(), "",
- JavaType.ShallowClass.build("java.lang.Exception"), null);
+ JavaType.ShallowClass.build(Exception.class.getName()), null);
} else {
paramType = visitTypeTree(param.getOriginType()).withPrefix(paramPrefix);
}
@@ -1127,7 +1119,7 @@ public void visitCatchStatement(CatchStatement node) {
);
cursor += param.getName().length();
Space rightPad = whitespace();
- cursor += 1; // skip )
+ skip(")");
JRightPadded variable = JRightPadded.build(new J.VariableDeclarations(randomId(), paramType.getPrefix(),
Markers.EMPTY, emptyList(), emptyList(), paramType.withPrefix(EMPTY),
null, emptyList(),
@@ -1159,10 +1151,12 @@ public void visitCaseStatement(CaseStatement statement) {
J.Case.Type.Statement,
null,
JContainer.build(singletonList(JRightPadded.build(visit(statement.getExpression())))),
+ null,
+ null,
statement.getCode() instanceof EmptyStatement ?
JContainer.build(sourceBefore(":"), convertStatements(emptyList()), Markers.EMPTY) :
- JContainer.build(sourceBefore(":"), convertStatements(((BlockStatement) statement.getCode()).getStatements()), Markers.EMPTY)
- , null)
+ JContainer.build(sourceBefore(":"), convertStatements(((BlockStatement) statement.getCode()).getStatements()), Markers.EMPTY),
+ null)
);
}
@@ -1172,9 +1166,10 @@ private J.Case visitDefaultCaseStatement(BlockStatement statement) {
Markers.EMPTY,
J.Case.Type.Statement,
null,
- JContainer.build(singletonList(JRightPadded.build(new J.Identifier(randomId(), Space.EMPTY, Markers.EMPTY, emptyList(), skip("default"), null, null)))),
- JContainer.build(sourceBefore(":"),
- convertStatements(statement.getStatements()), Markers.EMPTY),
+ JContainer.build(singletonList(JRightPadded.build(new J.Identifier(randomId(), EMPTY, Markers.EMPTY, emptyList(), skip("default"), null, null)))),
+ null,
+ null,
+ JContainer.build(sourceBefore(":"), convertStatements(statement.getStatements()), Markers.EMPTY),
null
);
}
@@ -1184,7 +1179,7 @@ public void visitCastExpression(CastExpression cast) {
queue.add(insideParentheses(cast, prefix -> {
// Might be looking at a Java-style cast "(type)object" or a groovy-style cast "object as type"
if (source.charAt(cursor) == '(') {
- cursor++; // skip '('
+ skip("(");
return new J.TypeCast(randomId(), prefix, Markers.EMPTY,
new J.ControlParentheses<>(randomId(), EMPTY, Markers.EMPTY,
new JRightPadded<>(visitTypeTree(cast.getType()), sourceBefore(")"), Markers.EMPTY)
@@ -1275,7 +1270,7 @@ public void visitClosureListExpression(ClosureListExpression closureListExpressi
for (int i = 0, expressionsSize = expressions.size(); i < expressionsSize; i++) {
results.add(JRightPadded.build(visit(expressions.get(i))).withAfter(whitespace()));
if (i < expressionsSize - 1) {
- cursor++; // ","
+ cursor++; // "," or ";" (a for-loop uses a ClosureListExpression)
}
}
queue.add(results);
@@ -1299,46 +1294,44 @@ public void visitConstantExpression(ConstantExpression expression) {
jType = JavaType.Primitive.Byte;
} else if (type == ClassHelper.char_TYPE) {
jType = JavaType.Primitive.Char;
- } else if (type == ClassHelper.double_TYPE || "java.lang.Double".equals(type.getName())) {
+ } else if (type == ClassHelper.double_TYPE || Double.class.getName().equals(type.getName())) {
jType = JavaType.Primitive.Double;
if (expression.getNodeMetaData().get("_FLOATING_POINT_LITERAL_TEXT") instanceof String) {
text = (String) expression.getNodeMetaData().get("_FLOATING_POINT_LITERAL_TEXT");
}
- } else if (type == ClassHelper.float_TYPE || "java.lang.Float".equals(type.getName())) {
+ } else if (type == ClassHelper.float_TYPE || Float.class.getName().equals(type.getName())) {
jType = JavaType.Primitive.Float;
if (expression.getNodeMetaData().get("_FLOATING_POINT_LITERAL_TEXT") instanceof String) {
text = (String) expression.getNodeMetaData().get("_FLOATING_POINT_LITERAL_TEXT");
}
- } else if (type == ClassHelper.int_TYPE || "java.lang.Integer".equals(type.getName())) {
+ } else if (type == ClassHelper.int_TYPE || Integer.class.getName().equals(type.getName())) {
jType = JavaType.Primitive.Int;
if (expression.getNodeMetaData().get("_INTEGER_LITERAL_TEXT") instanceof String) {
text = (String) expression.getNodeMetaData().get("_INTEGER_LITERAL_TEXT");
}
- } else if (type == ClassHelper.long_TYPE || "java.lang.Long".equals(type.getName())) {
+ } else if (type == ClassHelper.long_TYPE || Long.class.getName().equals(type.getName())) {
if (expression.getNodeMetaData().get("_INTEGER_LITERAL_TEXT") instanceof String) {
text = (String) expression.getNodeMetaData().get("_INTEGER_LITERAL_TEXT");
}
jType = JavaType.Primitive.Long;
- } else if (type == ClassHelper.short_TYPE || "java.lang.Short".equals(type.getName())) {
+ } else if (type == ClassHelper.short_TYPE || Short.class.getName().equals(type.getName())) {
jType = JavaType.Primitive.Short;
} else if (type == ClassHelper.STRING_TYPE) {
jType = JavaType.Primitive.String;
- // String literals value returned by getValue()/getText() has already processed sequences like "\\" -> "\"
- int length = sourceLengthOfString(expression);
- // this is an attribute selector
+ // an attribute selector is modeled as a String ConstantExpression
if (source.startsWith("@" + value, cursor)) {
- length += 1;
- }
- text = source.substring(cursor, cursor + length);
- int delimiterLength = 0;
- if (text.startsWith("$/")) {
- delimiterLength = 2;
- } else if (text.startsWith("\"\"\"") || text.startsWith("'''")) {
- delimiterLength = 3;
- } else if (text.startsWith("/") || text.startsWith("\"") || text.startsWith("'")) {
- delimiterLength = 1;
+ value = "@" + value;
+ text = "@" + text;
+ } else {
+ String delimiter = getDelimiter();
+ if (delimiter != null) {
+ // handle the `pattern` operator
+ String endDelimiter = "~/".equals(delimiter) ? "/" : delimiter;
+ // Get the string literal from the source, so escaping of newlines and the like works out of the box
+ value = sourceSubstring(cursor + delimiter.length(), endDelimiter);
+ text = delimiter + value + endDelimiter;
+ }
}
- value = text.substring(delimiterLength, text.length() - delimiterLength);
} else if (expression.isNullExpression()) {
if (source.startsWith("null", cursor)) {
text = "null";
@@ -1346,9 +1339,6 @@ public void visitConstantExpression(ConstantExpression expression) {
text = "";
}
jType = JavaType.Primitive.Null;
- } else if (expression instanceof AnnotationConstantExpression) {
- classVisitor.visitAnnotation((AnnotationNode) value);
- return ((Expression) classVisitor.pollQueue()).withPrefix(fmt);
} else {
throw new IllegalStateException("Unexpected constant type " + type);
}
@@ -1373,8 +1363,8 @@ public void visitConstantExpression(ConstantExpression expression) {
@Override
public void visitConstructorCallExpression(ConstructorCallExpression ctor) {
queue.add(insideParentheses(ctor, fmt -> {
- cursor += 3; // skip "new"
- TypeTree clazz = visitTypeTree(ctor.getType(), ctor.getMetaDataMap().containsKey(StaticTypesMarker.INFERRED_TYPE));
+ skip("new");
+ TypeTree clazz = visitTypeTree(ctor.getType(), ctor.getNodeMetaData().containsKey(StaticTypesMarker.INFERRED_TYPE));
JContainer args = visit(ctor.getArguments());
J.Block body = null;
if (ctor.isUsingAnonymousInnerClass() && ctor.getType() instanceof InnerClassNode) {
@@ -1411,12 +1401,15 @@ public void visitNotExpression(NotExpression expression) {
@Override
public void visitDeclarationExpression(DeclarationExpression expression) {
+ Space prefix = whitespace();
+ Optional multiVariable = maybeMultiVariable();
+ List modifiers = getModifiers(expression.getVariableExpression());
TypeTree typeExpr = visitVariableExpressionType(expression.getVariableExpression());
J.VariableDeclarations.NamedVariable namedVariable;
if (expression.isMultipleAssignmentDeclaration()) {
// def (a, b) = [1, 2]
- throw new UnsupportedOperationException("FIXME");
+ throw new UnsupportedOperationException("Parsing multiple assignment (e.g.: def (a, b) = [1, 2]) is not implemented");
} else {
J.Identifier name = visit(expression.getVariableExpression());
namedVariable = new J.VariableDeclarations.NamedVariable(
@@ -1438,19 +1431,60 @@ public void visitDeclarationExpression(DeclarationExpression expression) {
J.VariableDeclarations variableDeclarations = new J.VariableDeclarations(
randomId(),
- EMPTY,
+ prefix,
Markers.EMPTY,
emptyList(),
- emptyList(),
+ modifiers,
typeExpr,
null,
emptyList(),
singletonList(JRightPadded.build(namedVariable))
);
+ if (multiVariable.isPresent()) {
+ variableDeclarations = variableDeclarations.withMarkers(variableDeclarations.getMarkers().add(multiVariable.get()));
+ }
queue.add(variableDeclarations);
}
+ private Optional maybeMultiVariable() {
+ int saveCursor = cursor;
+ Space commaPrefix = whitespace();
+ if (source.startsWith(",", cursor)) {
+ skip(",");
+ return Optional.of(new MultiVariable(randomId(), commaPrefix));
+ }
+ cursor = saveCursor;
+ return Optional.empty();
+ }
+
+ private List getModifiers(Variable variable) {
+ String varName = variable.getName();
+ List modifiers = new ArrayList<>();
+ int saveCursor = cursor;
+ Space prefix = whitespace();
+ Set possibleModifiers = new LinkedHashSet<>(modifierNameToType.keySet());
+ String currentModifier = possibleModifiers.stream().filter(modifierName -> source.startsWith(modifierName, cursor))
+ .findFirst()
+ .orElse(null);
+ while (currentModifier != null) {
+ possibleModifiers.remove(currentModifier);
+ modifiers.add(new J.Modifier(randomId(), prefix, Markers.EMPTY, currentModifier, modifierNameToType.get(currentModifier), emptyList()));
+ skip(currentModifier);
+ saveCursor = cursor;
+ prefix = whitespace();
+ currentModifier = possibleModifiers.stream()
+ .filter(modifierName ->
+ // Try to avoid confusing a variable name with an incidentally similar modifier keyword
+ (varName.length() < modifierName.length() || !source.startsWith(varName, cursor)) &&
+ source.startsWith(modifierName, cursor))
+ .findFirst()
+ .orElse(null);
+ }
+ cursor = saveCursor;
+ return modifiers;
+ }
+
@Override
public void visitEmptyExpression(EmptyExpression expression) {
queue.add(new J.Empty(randomId(), EMPTY, Markers.EMPTY));
@@ -1493,7 +1527,7 @@ public void visitForLoop(ForStatement forLoop) {
List> update = controls.get(2).getElement() instanceof List ?
(List>) controls.get(2).getElement() :
singletonList((JRightPadded) controls.get(2));
- cursor++; // skip ')'
+ skip(")");
return new J.ForLoop(randomId(), prefix, Markers.EMPTY,
new J.ForLoop.Control(randomId(), controlFmt,
@@ -1502,8 +1536,8 @@ public void visitForLoop(ForStatement forLoop) {
} else {
Parameter param = forLoop.getVariable();
Space paramFmt = whitespace();
- TypeTree paramType = param.getOriginType().getColumnNumber() >= 0 ?
- visitTypeTree(param.getOriginType()) : null;
+ List modifiers = getModifiers(param);
+ TypeTree paramType = param.getOriginType().getColumnNumber() >= 0 ? visitTypeTree(param.getOriginType()) : null;
JRightPadded paramName = JRightPadded.build(
new J.VariableDeclarations.NamedVariable(randomId(), whitespace(), Markers.EMPTY,
new J.Identifier(randomId(), EMPTY, Markers.EMPTY, emptyList(), param.getName(), null, null),
@@ -1513,14 +1547,14 @@ public void visitForLoop(ForStatement forLoop) {
Space rightPad = whitespace();
Markers forEachMarkers = Markers.EMPTY;
if (source.charAt(cursor) == ':') {
- cursor++; // Skip ":"
+ skip(":");
} else {
- cursor += 2; // Skip "in"
+ skip("in");
forEachMarkers = forEachMarkers.add(new InStyleForEachLoop(randomId()));
}
JRightPadded variable = JRightPadded.build(new J.VariableDeclarations(randomId(), paramFmt,
- Markers.EMPTY, emptyList(), emptyList(), paramType, null, emptyList(),
+ Markers.EMPTY, emptyList(), modifiers, paramType, null, emptyList(),
singletonList(paramName))
).withAfter(rightPad);
@@ -1549,17 +1583,8 @@ public void visitIfElse(IfStatement ifElse) {
@Override
public void visitGStringExpression(GStringExpression gstring) {
Space fmt = whitespace();
- String delimiter;
- if (source.startsWith("\"\"\"", cursor)) {
- delimiter = "\"\"\"";
- } else if (source.startsWith("/", cursor)) {
- delimiter = "/";
- } else if (source.startsWith("$/", cursor)) {
- delimiter = "$/";
- } else {
- delimiter = "\"";
- }
- cursor += delimiter.length();
+ String delimiter = getDelimiter();
+ skip(delimiter); // Opening delim for GString
NavigableMap sortedByPosition = new TreeMap<>();
for (org.codehaus.groovy.ast.expr.ConstantExpression e : gstring.getStrings()) {
@@ -1577,56 +1602,51 @@ public void visitGStringExpression(GStringExpression gstring) {
for (int i = 0; i < rawExprs.size(); i++) {
org.codehaus.groovy.ast.expr.Expression e = rawExprs.get(i);
if (source.charAt(cursor) == '$') {
- cursor++;
+ skip("$");
boolean inCurlies = source.charAt(cursor) == '{';
if (inCurlies) {
- cursor++;
+ skip("{");
} else {
columnOffset--;
}
- strings.add(new G.GString.Value(randomId(), Markers.EMPTY, visit(e), inCurlies ? sourceBefore("}") : Space.EMPTY, inCurlies));
+ strings.add(new G.GString.Value(randomId(), Markers.EMPTY, visit(e), inCurlies ? sourceBefore("}") : EMPTY, inCurlies));
if (!inCurlies) {
columnOffset++;
}
} else if (e instanceof ConstantExpression) {
- ConstantExpression cs = (ConstantExpression) e;
- // The sub-strings within a GString have no delimiters of their own, confusing visitConstantExpression()
- // ConstantExpression.getValue() cannot be trusted for strings as its values don't match source code because sequences like "\\" have already been replaced with a single "\"
- // Use the AST element's line/column positions to figure out its extent, but those numbers need tweaks to be correct
- int length = lengthAccordingToAst(cs);
- if (i == 0 || i == rawExprs.size() - 1) {
- // The first and last constants within a GString have line/column position which incorrectly include the GString's delimiters
- length -= delimiter.length();
- }
- // The line/column numbers incorrectly indicate that the following expression's opening "$" is part of this expression
- if (i < rawExprs.size() - 1) {
- length--;
+ // Get the string literal from the source, so escaping of newlines and the like works out of the box
+ String value = sourceSubstring(cursor, ("~/".equals(delimiter) ? "/" : delimiter));
+ // There could be a closer GString before the end of the closing delimiter, so shorten the string if needs be
+ int indexNextSign = source.indexOf("$", cursor);
+ if (indexNextSign != -1 && indexNextSign < (cursor + value.length())) {
+ value = source.substring(cursor, indexNextSign);
}
- String value = source.substring(cursor, cursor + length);
strings.add(new J.Literal(randomId(), EMPTY, Markers.EMPTY, value, value, null, JavaType.Primitive.String));
- cursor += value.length();
+ skip(value);
} else {
// Everything should be handled already by the other two code paths, but just in case
strings.add(visit(e));
}
}
- queue.add(new G.GString(randomId(), fmt, Markers.EMPTY, delimiter, strings,
- typeMapping.type(gstring.getType())));
- cursor += delimiter.length();
+ queue.add(new G.GString(randomId(), fmt, Markers.EMPTY, delimiter, strings, typeMapping.type(gstring.getType())));
+ skip(delimiter); // Closing delim for GString
}
@Override
public void visitListExpression(ListExpression list) {
- if (list.getExpressions().isEmpty()) {
- queue.add(new G.ListLiteral(randomId(), sourceBefore("["), Markers.EMPTY,
- JContainer.build(singletonList(new JRightPadded<>(new J.Empty(randomId(), EMPTY, Markers.EMPTY), sourceBefore("]"), Markers.EMPTY))),
- typeMapping.type(list.getType())));
- } else {
- queue.add(new G.ListLiteral(randomId(), sourceBefore("["), Markers.EMPTY,
- JContainer.build(visitRightPadded(list.getExpressions().toArray(new ASTNode[0]), "]")),
- typeMapping.type(list.getType())));
- }
+ queue.add(insideParentheses(list, fmt -> {
+ skip("[");
+ if (list.getExpressions().isEmpty()) {
+ return new G.ListLiteral(randomId(), fmt, Markers.EMPTY,
+ JContainer.build(singletonList(new JRightPadded<>(new J.Empty(randomId(), EMPTY, Markers.EMPTY), sourceBefore("]"), Markers.EMPTY))),
+ typeMapping.type(list.getType()));
+ } else {
+ return new G.ListLiteral(randomId(), fmt, Markers.EMPTY,
+ JContainer.build(visitRightPadded(list.getExpressions().toArray(new ASTNode[0]), "]")),
+ typeMapping.type(list.getType()));
+ }
+ }));
}
@Override
@@ -1641,23 +1661,24 @@ public void visitMapEntryExpression(MapEntryExpression expression) {
@Override
public void visitMapExpression(MapExpression map) {
- Space prefix = sourceBefore("[");
- JContainer entries;
- if (map.getMapEntryExpressions().isEmpty()) {
- entries = JContainer.build(Collections.singletonList(JRightPadded.build(
- new G.MapEntry(randomId(), whitespace(), Markers.EMPTY,
- JRightPadded.build(new J.Empty(randomId(), sourceBefore(":"), Markers.EMPTY)),
- new J.Empty(randomId(), sourceBefore("]"), Markers.EMPTY), null))));
- } else {
- entries = JContainer.build(visitRightPadded(map.getMapEntryExpressions().toArray(new ASTNode[0]), "]"));
- }
- queue.add(new G.MapLiteral(randomId(), prefix, Markers.EMPTY, entries, typeMapping.type(map.getType())));
+ queue.add(insideParentheses(map, fmt -> {
+ skip("[");
+ JContainer entries;
+ if (map.getMapEntryExpressions().isEmpty()) {
+ entries = JContainer.build(Collections.singletonList(JRightPadded.build(
+ new G.MapEntry(randomId(), whitespace(), Markers.EMPTY,
+ JRightPadded.build(new J.Empty(randomId(), sourceBefore(":"), Markers.EMPTY)),
+ new J.Empty(randomId(), sourceBefore("]"), Markers.EMPTY), null))));
+ } else {
+ entries = JContainer.build(visitRightPadded(map.getMapEntryExpressions().toArray(new ASTNode[0]), "]"));
+ }
+ return new G.MapLiteral(randomId(), fmt, Markers.EMPTY, entries, typeMapping.type(map.getType()));
+ }));
}
@Override
public void visitMethodCallExpression(MethodCallExpression call) {
queue.add(insideParentheses(call, fmt -> {
-
ImplicitDot implicitDot = null;
JRightPadded select = null;
if (!call.isImplicitThis()) {
@@ -1686,10 +1707,8 @@ public void visitMethodCallExpression(MethodCallExpression call) {
Space prefix = whitespace();
if (methodNameExpression.equals(source.substring(cursor, cursor + methodNameExpression.length()))) {
- cursor += methodNameExpression.length();
- name = new J.Identifier(randomId(), prefix, Markers.EMPTY,
- emptyList(), methodNameExpression, null, null);
-
+ skip(methodNameExpression);
+ name = new J.Identifier(randomId(), prefix, Markers.EMPTY, emptyList(), methodNameExpression, null, null);
} else if (select != null && select.getElement() instanceof J.Identifier) {
name = (J.Identifier) select.getElement();
select = null;
@@ -1732,23 +1751,7 @@ public void visitMethodCallExpression(MethodCallExpression call) {
}
}
}
- // handle the obscure case where there are empty parens ahead of a closure
- if (args.getExpressions().size() == 1 && args.getExpressions().get(0) instanceof ClosureExpression) {
- int saveCursor = cursor;
- Space argPrefix = whitespace();
- if (source.charAt(cursor) == '(') {
- cursor += 1;
- Space infix = whitespace();
- if (source.charAt(cursor) == ')') {
- cursor += 1;
- markers = markers.add(new EmptyArgumentListPrecedesArgument(randomId(), argPrefix, infix));
- } else {
- cursor = saveCursor;
- }
- } else {
- cursor = saveCursor;
- }
- }
+ markers = handlesCaseWhereEmptyParensAheadOfClosure(args, markers);
}
JContainer args = visit(call.getArguments());
@@ -1796,8 +1799,7 @@ public void visitMethodCallExpression(MethodCallExpression call) {
} else {
methodType = typeMapping.methodType(methodNode);
}
- return new J.MethodInvocation(randomId(), fmt, markers,
- select, null, name, args, methodType);
+ return new J.MethodInvocation(randomId(), fmt, markers, select, null, name, args, methodType);
}));
}
@@ -1836,57 +1838,39 @@ public void visitStaticMethodCallExpression(StaticMethodCallExpression call) {
}
}
}
- // handle the obscure case where there are empty parens ahead of a closure
- if (args.getExpressions().size() == 1 && args.getExpressions().get(0) instanceof ClosureExpression) {
- int saveCursor = cursor;
- Space prefix = whitespace();
- if (source.charAt(cursor) == '(') {
- cursor += 1;
- Space infix = whitespace();
- if (source.charAt(cursor) == ')') {
- cursor += 1;
- markers = markers.add(new EmptyArgumentListPrecedesArgument(randomId(), prefix, infix));
- } else {
- cursor = saveCursor;
- }
- } else {
- cursor = saveCursor;
- }
- }
+ markers = handlesCaseWhereEmptyParensAheadOfClosure(args, markers);
}
JContainer args = visit(call.getArguments());
- queue.add(new J.MethodInvocation(randomId(), fmt, markers,
- null, null, name, args, methodType));
+ queue.add(new J.MethodInvocation(randomId(), fmt, markers, null, null, name, args, methodType));
}
@Override
public void visitAttributeExpression(AttributeExpression attr) {
- Space fmt = whitespace();
- Expression target = visit(attr.getObjectExpression());
- Space beforeDot = attr.isSafe() ? sourceBefore("?.") :
- sourceBefore(attr.isSpreadSafe() ? "*." : ".");
- J name = visit(attr.getProperty());
- if (name instanceof J.Literal) {
- String nameStr = ((J.Literal) name).getValueSource();
- assert nameStr != null;
- name = new J.Identifier(randomId(), name.getPrefix(), Markers.EMPTY, emptyList(), nameStr, null, null);
- }
- if (attr.isSpreadSafe()) {
- name = name.withMarkers(name.getMarkers().add(new StarDot(randomId())));
- }
- if (attr.isSafe()) {
- name = name.withMarkers(name.getMarkers().add(new NullSafe(randomId())));
- }
- queue.add(new J.FieldAccess(randomId(), fmt, Markers.EMPTY, target, padLeft(beforeDot, (J.Identifier) name), null));
+ queue.add(insideParentheses(attr, fmt -> {
+ Expression target = visit(attr.getObjectExpression());
+ Space beforeDot = attr.isSafe() ? sourceBefore("?.") : sourceBefore(attr.isSpreadSafe() ? "*." : ".");
+ J name = visit(attr.getProperty());
+ if (name instanceof J.Literal) {
+ String nameStr = ((J.Literal) name).getValueSource();
+ assert nameStr != null;
+ name = new J.Identifier(randomId(), name.getPrefix(), Markers.EMPTY, emptyList(), nameStr, null, null);
+ }
+ if (attr.isSpreadSafe()) {
+ name = name.withMarkers(name.getMarkers().add(new StarDot(randomId())));
+ }
+ if (attr.isSafe()) {
+ name = name.withMarkers(name.getMarkers().add(new NullSafe(randomId())));
+ }
+ return new J.FieldAccess(randomId(), fmt, Markers.EMPTY, target, padLeft(beforeDot, (J.Identifier) name), null);
+ }));
}
@Override
public void visitPropertyExpression(PropertyExpression prop) {
queue.add(insideParentheses(prop, fmt -> {
Expression target = visit(prop.getObjectExpression());
- Space beforeDot = prop.isSpreadSafe() ? sourceBefore("*.") :
- sourceBefore(prop.isSafe() ? "?." : ".");
+ Space beforeDot = prop.isSpreadSafe() ? sourceBefore("*.") : sourceBefore(prop.isSafe() ? "?." : ".");
J name = visit(prop.getProperty());
if (name instanceof J.Literal) {
J.Literal nameLiteral = ((J.Literal) name);
@@ -1945,7 +1929,7 @@ public void visitSwitch(SwitchStatement statement) {
randomId(), sourceBefore("{"), Markers.EMPTY,
JRightPadded.build(false),
ListUtils.concat(
- convertAll(statement.getCaseStatements(), t -> Space.EMPTY, t -> Space.EMPTY),
+ convertAll(statement.getCaseStatements(), t -> EMPTY, t -> EMPTY),
statement.getDefaultStatement().isEmpty() ? null : JRightPadded.build(visitDefaultCaseStatement((BlockStatement) statement.getDefaultStatement()))
),
sourceBefore("}"))));
@@ -1983,11 +1967,11 @@ public void visitTupleExpression(TupleExpression tuple) {
int saveCursor = cursor;
Space beforeOpenParen = whitespace();
- org.openrewrite.java.marker.OmitParentheses omitParentheses = null;
+ OmitParentheses omitParentheses = null;
if (source.charAt(cursor) == '(') {
- cursor++;
+ skip("(");
} else {
- omitParentheses = new org.openrewrite.java.marker.OmitParentheses(randomId());
+ omitParentheses = new OmitParentheses(randomId());
beforeOpenParen = EMPTY;
cursor = saveCursor;
}
@@ -2011,7 +1995,7 @@ public void visitTupleExpression(TupleExpression tuple) {
after = whitespace();
if (source.charAt(cursor) == ')') {
// the next argument will have an OmitParentheses marker
- omitParentheses = new org.openrewrite.java.marker.OmitParentheses(randomId());
+ omitParentheses = new OmitParentheses(randomId());
}
cursor++;
}
@@ -2047,7 +2031,6 @@ public void visitTryCatchFinally(TryCatchStatement node) {
//noinspection ConstantConditions
queue.add(new J.Try(randomId(), prefix, Markers.EMPTY, resources, body, catches, finally_));
-
}
@Override
@@ -2079,7 +2062,7 @@ public void visitPostfixExpression(PostfixExpression unary) {
public void visitPrefixExpression(PrefixExpression unary) {
Space fmt = whitespace();
String typeToken = unary.getOperation().getText();
- cursor += typeToken.length();
+ skip(typeToken);
J.Unary.Type operator = null;
switch (typeToken) {
@@ -2103,29 +2086,18 @@ public void visitPrefixExpression(PrefixExpression unary) {
public TypeTree visitVariableExpressionType(VariableExpression expression) {
JavaType type = typeMapping.type(staticType(((org.codehaus.groovy.ast.expr.Expression) expression)));
+ Space prefix = whitespace();
+ String typeName = "";
- if (expression.isDynamicTyped()) {
- Space prefix = whitespace();
- String keyword;
- if (source.substring(cursor).startsWith("final")) {
- keyword = "final";
- } else {
- keyword = source.substring(cursor, cursor + 3);
- }
- cursor += keyword.length();
- return new J.Identifier(randomId(),
- prefix,
- Markers.EMPTY,
- emptyList(),
- keyword,
- type, null);
+ if (!expression.isDynamicTyped() && source.startsWith(expression.getOriginType().getUnresolvedName(), cursor)) {
+ typeName = expression.getOriginType().getUnresolvedName();
+ skip(typeName);
}
- Space prefix = sourceBefore(expression.getOriginType().getUnresolvedName());
J.Identifier ident = new J.Identifier(randomId(),
EMPTY,
Markers.EMPTY,
emptyList(),
- expression.getOriginType().getUnresolvedName(),
+ typeName,
type, null);
if (expression.getOriginType().getGenericsTypes() != null) {
return new J.ParameterizedType(randomId(), prefix, Markers.EMPTY, ident, visitTypeParameterizations(
@@ -2136,19 +2108,21 @@ public TypeTree visitVariableExpressionType(VariableExpression expression) {
@Override
public void visitVariableExpression(VariableExpression expression) {
- JavaType type;
- if (expression.isDynamicTyped() && expression.getAccessedVariable() != null && expression.getAccessedVariable().getType() != expression.getOriginType()) {
- type = typeMapping.type(staticType(expression.getAccessedVariable()));
- } else {
- type = typeMapping.type(staticType((org.codehaus.groovy.ast.expr.Expression) expression));
- }
- queue.add(new J.Identifier(randomId(),
- sourceBefore(expression.getName()),
- Markers.EMPTY,
- emptyList(),
- expression.getName(),
- type, null)
- );
+ queue.add(insideParentheses(expression, fmt -> {
+ JavaType type;
+ if (expression.isDynamicTyped() && expression.getAccessedVariable() != null && expression.getAccessedVariable().getType() != expression.getOriginType()) {
+ type = typeMapping.type(staticType(expression.getAccessedVariable()));
+ } else {
+ type = typeMapping.type(staticType((org.codehaus.groovy.ast.expr.Expression) expression));
+ }
+
+ return new J.Identifier(randomId(),
+ fmt.withWhitespace(fmt.getWhitespace() + sourceBefore(expression.getName()).getWhitespace()),
+ Markers.EMPTY,
+ emptyList(),
+ expression.getName(),
+ type, null);
+ }));
}
@Override
@@ -2200,6 +2174,27 @@ private T pollQueue() {
}
}
+ // handle the obscure case where there are empty parens ahead of a closure
+ private Markers handlesCaseWhereEmptyParensAheadOfClosure(ArgumentListExpression args, Markers markers) {
+ if (args.getExpressions().size() == 1 && args.getExpressions().get(0) instanceof ClosureExpression) {
+ int saveCursor = cursor;
+ Space argPrefix = whitespace();
+ if (source.charAt(cursor) == '(') {
+ skip("(");
+ Space infix = whitespace();
+ if (source.charAt(cursor) == ')') {
+ skip(")");
+ markers = markers.add(new EmptyArgumentListPrecedesArgument(randomId(), argPrefix, infix));
+ } else {
+ cursor = saveCursor;
+ }
+ } else {
+ cursor = saveCursor;
+ }
+ }
+ return markers;
+ }
+
private JRightPadded convertTopLevelStatement(SourceUnit unit, ASTNode node) {
if (node instanceof ClassNode) {
ClassNode classNode = (ClassNode) node;
@@ -2320,12 +2315,19 @@ private int positionOfNext(String untilDelim) {
return delimIndex > source.length() - untilDelim.length() ? -1 : delimIndex;
}
+ /**
+ * Get all whitespace characters of the source file between the cursor and the first non-whitespace character.
+ * The cursor will be moved before first non-whitespace character.
+ */
private Space whitespace() {
String prefix = source.substring(cursor, indexOfNextNonWhitespace(cursor, source));
cursor += prefix.length();
return format(prefix);
}
+ /**
+ * Move the cursor after the token.
+ */
private String skip(@Nullable String token) {
if (token == null) {
//noinspection ConstantConditions
@@ -2362,12 +2364,12 @@ private T typeTree(@Nullable ClassNode classNo
fullName += "." + part;
Matcher whitespacePrefix = whitespacePrefixPattern.matcher(part);
- Space identFmt = whitespacePrefix.matches() ? format(whitespacePrefix.group(0)) : Space.EMPTY;
+ Space identFmt = whitespacePrefix.matches() ? format(whitespacePrefix.group(0)) : EMPTY;
Matcher whitespaceSuffix = whitespaceSuffixPattern.matcher(part);
//noinspection ResultOfMethodCallIgnored
whitespaceSuffix.matches();
- Space namePrefix = i == parts.length - 1 ? Space.EMPTY : format(whitespaceSuffix.group(1));
+ Space namePrefix = i == parts.length - 1 ? EMPTY : format(whitespaceSuffix.group(1));
expr = new J.FieldAccess(
randomId(),
@@ -2403,7 +2405,7 @@ private TypeTree arrayType(ClassNode classNode) {
}
Space prefix = whitespace();
TypeTree elemType = typeTree(typeTree);
- JLeftPadded dimension = padLeft(sourceBefore("["), sourceBefore("]"));
+ JLeftPadded dimension = sourceStartsWith("...") ? null : padLeft(sourceBefore("["), sourceBefore("]"));
return new J.ArrayType(randomId(), prefix, Markers.EMPTY,
count == 1 ? elemType : mapDimensions(elemType, classNode.getComponentType()),
null,
@@ -2428,100 +2430,115 @@ private TypeTree mapDimensions(TypeTree baseType, ClassNode classNode) {
return baseType;
}
+ /**
+ * Get all characters of the source file between the cursor and the given delimiter.
+ * The cursor will be moved past the delimiter.
+ */
private Space sourceBefore(String untilDelim) {
int delimIndex = positionOfNext(untilDelim);
if (delimIndex < 0) {
return EMPTY; // unable to find this delimiter
}
- String prefix = source.substring(cursor, delimIndex);
- cursor += prefix.length() + untilDelim.length(); // advance past the delimiter
- return Space.format(prefix);
+ if (delimIndex == cursor) {
+ cursor += untilDelim.length();
+ return EMPTY;
+ }
+
+ Space space = format(source, cursor, delimIndex);
+ cursor = delimIndex + untilDelim.length(); // advance past the delimiter
+ return space;
+ }
+
+ /**
+ * Tests if the source beginning at the current cursor starts with the specified delimiter.
+ * Whitespace characters are excluded, the cursor will not be moved.
+ */
+ private boolean sourceStartsWith(String delimiter) {
+ return source.startsWith(delimiter, indexOfNextNonWhitespace(cursor, source));
}
/**
- * Gets the length in characters of a String literal.
- * Attempts to account for a number of different strange compiler behaviors, old bugs, and edge cases.
- * cursor is presumed to point at the beginning of the node.
+ * Returns a string that is a part of this source. The substring begins at the specified beginIndex and extends until delimiter.
+ * The cursor will not be moved.
*/
- private int sourceLengthOfString(ConstantExpression expr) {
- // ConstantExpression.getValue() already has resolved escaped characters. So "\t" and a literal tab will look the same.
- // Since we cannot differentiate between the two, use this alternate method only when an old version of groovy indicates risk
- // and the literal doesn't contain any characters which might be from an escape sequence. e.g.: tabs, newlines, carriage returns
- String value = (String) expr.getValue();
- if (isOlderThanGroovy3() && value.matches("[^\\t\\r\\n\\\\]*")) {
- int delimiterLength = getDelimiterLength();
- return delimiterLength + value.length() + delimiterLength;
- }
- int lengthAccordingToAst = lengthAccordingToAst(expr);
- // subtract any parentheses that were included with lengthAccordingToAst
- Integer insideParenthesesLevel = getInsideParenthesesLevel(expr);
- if (insideParenthesesLevel != null) {
- return lengthAccordingToAst - insideParenthesesLevel * 2;
- }
-
- return lengthAccordingToAst;
+ private String sourceSubstring(int beginIndex, String untilDelim) {
+ int endIndex = source.indexOf(untilDelim, Math.max(beginIndex, cursor + untilDelim.length()));
+ // don't stop if last char is escaped.
+ while (source.charAt(endIndex - 1) == '\\') {
+ endIndex = source.indexOf(untilDelim, endIndex + 1);
+ }
+ return source.substring(beginIndex, endIndex);
}
- private static @Nullable Integer getInsideParenthesesLevel(ASTNode node) {
+ private @Nullable Integer getInsideParenthesesLevel(ASTNode node) {
Object rawIpl = node.getNodeMetaData("_INSIDE_PARENTHESES_LEVEL");
if (rawIpl instanceof AtomicInteger) {
// On Java 11 and newer _INSIDE_PARENTHESES_LEVEL is an AtomicInteger
return ((AtomicInteger) rawIpl).get();
- } else {
+ } else if (rawIpl instanceof Integer) {
// On Java 8 _INSIDE_PARENTHESES_LEVEL is a regular Integer
return (Integer) rawIpl;
- }
- }
-
- private int getDelimiterLength() {
- String maybeDelimiter = source.substring(cursor, Math.min(cursor + 3, source.length()));
- int delimiterLength = 0;
- if (maybeDelimiter.startsWith("$/")) {
- delimiterLength = 2;
- } else if (maybeDelimiter.startsWith("\"\"\"") || maybeDelimiter.startsWith("'''")) {
- delimiterLength = 3;
- } else if (maybeDelimiter.startsWith("/") || maybeDelimiter.startsWith("\"") || maybeDelimiter.startsWith("'")) {
- delimiterLength = 1;
- }
- return delimiterLength;
+ } else if (node instanceof MethodCallExpression) {
+ MethodCallExpression expr = (MethodCallExpression) node;
+ return determineParenthesisLevel(expr.getObjectExpression().getLineNumber(), expr.getLineNumber(), expr.getObjectExpression().getColumnNumber(), expr.getColumnNumber());
+ } else if (node instanceof BinaryExpression) {
+ BinaryExpression expr = (BinaryExpression) node;
+ return determineParenthesisLevel(expr.getLeftExpression().getLineNumber(), expr.getLineNumber(), expr.getLeftExpression().getColumnNumber(), expr.getColumnNumber());
+ }
+ return null;
}
/**
- * Gets the length according to the Groovy compiler's attestation of starting/ending line and column numbers.
- * On older versions of the JDK/Groovy compiler string literals with following whitespace sometimes erroneously include
- * the length of the whitespace in the length of the AST node.
- * So in this method invocation:
- * foo( 'a' )
- * the correct source length for the AST node representing 'a' is 3, but in affected groovy versions the length
- * on the node is '4' because it is also counting the trailing whitespace.
+ * @param childLineNumber the beginning line number of the first sub node
+ * @param parentLineNumber the beginning line number of the parent node
+ * @param childColumn the column on the {@code childLineNumber} line where the sub node starts
+ * @param parentColumn the column on the {@code parentLineNumber} line where the parent node starts
+ * @return the level of parenthesis parsed from the source
*/
- private int lengthAccordingToAst(ConstantExpression node) {
- if (!appearsInSource(node)) {
- return 0;
- }
- int lineCount = node.getLastLineNumber() - node.getLineNumber();
- if (lineCount == 0) {
- return node.getLastColumnNumber() - node.getColumnNumber() + columnOffset;
- }
- int linesSoFar = 0;
- int length = 0;
- int finalLineChars = 0;
- while (true) {
- char c = source.charAt(cursor + length);
- if (c == '\n') {
- linesSoFar++;
+ private int determineParenthesisLevel(int childLineNumber, int parentLineNumber, int childColumn, int parentColumn) {
+ int saveCursor = cursor;
+ whitespace();
+ int untilCursor = cursor;
+ if (childLineNumber > parentLineNumber) {
+ for (int i = 0; i < (childLineNumber - parentLineNumber); i++) {
+ untilCursor = source.indexOf('\n', untilCursor) + 1; // +1; set cursor past `\n`
}
- if (linesSoFar == lineCount) {
- finalLineChars++;
+ untilCursor += childColumn - 1; // -1; skip previous `\n`
+ } else {
+ untilCursor += childColumn - parentColumn;
+ }
+ int count = 0;
+ for (int i = cursor; i < untilCursor; i++) {
+ if (source.charAt(i) == '(') {
+ count++;
}
-
- length++;
-
- if (finalLineChars == node.getLastColumnNumber() + columnOffset) {
- return length;
+ if (source.charAt(i) == ')') {
+ count--;
}
}
+ cursor = saveCursor;
+ return Math.max(count, 0);
+ }
+
+ private @Nullable String getDelimiter() {
+ String maybeDelimiter = source.substring(cursor, Math.min(cursor + 3, source.length()));
+ if (maybeDelimiter.startsWith("$/")) {
+ return "$/";
+ } else if (maybeDelimiter.startsWith("\"\"\"")) {
+ return "\"\"\"";
+ } else if (maybeDelimiter.startsWith("'''")) {
+ return "'''";
+ } else if (maybeDelimiter.startsWith("~/")) {
+ return "~/";
+ } else if (maybeDelimiter.startsWith("/")) {
+ return "/";
+ } else if (maybeDelimiter.startsWith("\"")) {
+ return "\"";
+ } else if (maybeDelimiter.startsWith("'")) {
+ return "'";
+ }
+ return null;
}
private TypeTree visitTypeTree(ClassNode classNode) {
@@ -2533,17 +2550,6 @@ private TypeTree visitTypeTree(ClassNode classNode, boolean inferredType) {
if (primitiveType != null) {
return new J.Primitive(randomId(), sourceBefore(classNode.getUnresolvedName()), Markers.EMPTY, primitiveType);
}
-
- int saveCursor = cursor;
- Space fmt = whitespace();
- if (cursor < source.length() && source.startsWith("def", cursor)) {
- cursor += 3;
- return new J.Identifier(randomId(), fmt, Markers.EMPTY, emptyList(), "def",
- JavaType.ShallowClass.build("java.lang.Object"), null);
- } else {
- cursor = saveCursor;
- }
-
return typeTree(classNode, inferredType);
}
@@ -2624,7 +2630,8 @@ private String name() {
int i = cursor;
for (; i < source.length(); i++) {
char c = source.charAt(i);
- if (!(Character.isJavaIdentifierPart(c) || c == '.' || c == '*')) {
+ boolean isVarargs = source.length() > (i + 2) && c == '.' && source.charAt(i + 1) == '.' && source.charAt(i + 2) == '.';
+ if (!(Character.isJavaIdentifierPart(c) || c == '.' || c == '*') || isVarargs) {
break;
}
}
@@ -2645,7 +2652,7 @@ private String name() {
Can contain a J.FieldAccess, as in a variable declaration with fully qualified type parameterization:
List
*/
- private JContainer visitTypeParameterizations(GenericsType @Nullable[] genericsTypes) {
+ private JContainer visitTypeParameterizations(GenericsType @Nullable [] genericsTypes) {
Space prefix = sourceBefore("<");
List> parameters;
@@ -2662,7 +2669,7 @@ private JContainer visitTypeParameterizations(GenericsType @Nullable
Space suffix = whitespace();
parameters.add(JRightPadded.build(param).withAfter(suffix));
if (source.charAt(cursor) == '>') {
- cursor++;
+ skip(">");
break;
}
cursor++;
@@ -2673,15 +2680,10 @@ private JContainer visitTypeParameterizations(GenericsType @Nullable
parameters = new ArrayList<>(genericsTypes.length);
for (int i = 0; i < genericsTypes.length; i++) {
parameters.add(JRightPadded.build(visitTypeParameterization(genericsTypes[i]))
- .withAfter(
- i < genericsTypes.length - 1 ?
- sourceBefore(",") :
- sourceBefore(">")
- ));
+ .withAfter(i < genericsTypes.length - 1 ? sourceBefore(",") : sourceBefore(">")));
}
}
-
return JContainer.build(prefix, parameters, Markers.EMPTY);
}
@@ -2689,10 +2691,19 @@ private Expression visitTypeParameterization(GenericsType genericsType) {
int saveCursor = cursor;
Space prefix = whitespace();
if (source.charAt(cursor) == '?') {
- cursor = saveCursor;
- return visitWildcard(genericsType);
+ skip("?");
+ JLeftPadded bound = null;
+ NameTree boundedType = null;
+ if (genericsType.getUpperBounds() != null) {
+ bound = padLeft(sourceBefore("extends"), J.Wildcard.Bound.Extends);
+ boundedType = visitTypeTree(genericsType.getUpperBounds()[0]);
+ } else if (genericsType.getLowerBound() != null) {
+ bound = padLeft(sourceBefore("super"), J.Wildcard.Bound.Super);
+ boundedType = visitTypeTree(genericsType.getLowerBound());
+ }
+ return new J.Wildcard(randomId(), prefix, Markers.EMPTY, bound, boundedType);
} else if (source.charAt(cursor) == '>') {
- cursor++;
+ skip(">");
return new J.Empty(randomId(), prefix, Markers.EMPTY);
}
cursor = saveCursor;
@@ -2708,19 +2719,14 @@ private JContainer visitTypeParameters(GenericsType[] genericsT
List> typeParameters = new ArrayList<>(genericsTypes.length);
for (int i = 0; i < genericsTypes.length; i++) {
typeParameters.add(JRightPadded.build(visitTypeParameter(genericsTypes[i]))
- .withAfter(
- i < genericsTypes.length - 1 ?
- sourceBefore(",") :
- sourceBefore(">")
- ));
+ .withAfter(i < genericsTypes.length - 1 ? sourceBefore(",") : sourceBefore(">")));
}
return JContainer.build(prefix, typeParameters, Markers.EMPTY);
}
private J.TypeParameter visitTypeParameter(GenericsType genericType) {
Space prefix = whitespace();
- Expression name = typeTree(null)
- .withType(typeMapping.type(genericType));
+ Expression name = typeTree(null).withType(typeMapping.type(genericType));
JContainer bounds = null;
if (genericType.getUpperBounds() != null) {
Space boundsPrefix = sourceBefore("extends");
@@ -2728,11 +2734,7 @@ private J.TypeParameter visitTypeParameter(GenericsType genericType) {
List> convertedBounds = new ArrayList<>(upperBounds.length);
for (int i = 0; i < upperBounds.length; i++) {
convertedBounds.add(JRightPadded.build(visitTypeTree(upperBounds[i]))
- .withAfter(
- i < upperBounds.length - 1 ?
- sourceBefore("&") :
- EMPTY
- ));
+ .withAfter(i < upperBounds.length - 1 ? sourceBefore("&") : EMPTY));
}
bounds = JContainer.build(boundsPrefix, convertedBounds, Markers.EMPTY);
} else if (genericType.getLowerBound() != null) {
@@ -2746,34 +2748,19 @@ private J.TypeParameter visitTypeParameter(GenericsType genericType) {
return new J.TypeParameter(randomId(), prefix, Markers.EMPTY, emptyList(), emptyList(), name, bounds);
}
- private J.Wildcard visitWildcard(GenericsType genericType) {
- Space namePrefix = sourceBefore("?");
-
- JLeftPadded bound;
- NameTree boundedType;
- if (genericType.getUpperBounds() != null) {
- bound = padLeft(sourceBefore("extends"), J.Wildcard.Bound.Extends);
- boundedType = visitTypeTree(genericType.getUpperBounds()[0]);
- } else if (genericType.getLowerBound() != null) {
- bound = padLeft(sourceBefore("super"), J.Wildcard.Bound.Super);
- boundedType = visitTypeTree(genericType.getLowerBound());
- } else {
- bound = null;
- boundedType = null;
- }
-
- return new J.Wildcard(randomId(), namePrefix, Markers.EMPTY, bound, boundedType);
- }
-
/**
* Sometimes the groovy compiler inserts phantom elements into argument lists and class bodies,
- * presumably to pass type information around. These elements do not appear in source code and should not
- * be represented in our AST.
+ * presumably to pass type information around. Other times the groovy compiler adds extra transform annotations.
+ * These elements do not appear in source code and should not be represented in our LST.
*
* @param node possible phantom node
* @return true if the node reports that it does have a position within the source code
*/
- private static boolean appearsInSource(ASTNode node) {
+ private boolean appearsInSource(ASTNode node) {
+ if (node instanceof AnnotationNode) {
+ return sourceStartsWith("@" + ((AnnotationNode) node).getClassNode().getUnresolvedName());
+ }
+
return node.getColumnNumber() >= 0 && node.getLineNumber() >= 0 && node.getLastColumnNumber() >= 0 && node.getLastLineNumber() >= 0;
}
@@ -2809,4 +2796,24 @@ private static ClassNode staticType(Parameter parameter) {
return inferred;
}
}
+
+ private static final Map modifierNameToType;
+
+ static {
+ modifierNameToType = new LinkedHashMap<>();
+ modifierNameToType.put("def", J.Modifier.Type.LanguageExtension);
+ modifierNameToType.put("var", J.Modifier.Type.LanguageExtension);
+ modifierNameToType.put("public", J.Modifier.Type.Public);
+ modifierNameToType.put("protected", J.Modifier.Type.Protected);
+ modifierNameToType.put("private", J.Modifier.Type.Private);
+ modifierNameToType.put("abstract", J.Modifier.Type.Abstract);
+ modifierNameToType.put("static", J.Modifier.Type.Static);
+ modifierNameToType.put("final", J.Modifier.Type.Final);
+ modifierNameToType.put("volatile", J.Modifier.Type.Volatile);
+ modifierNameToType.put("synchronized", J.Modifier.Type.Synchronized);
+ modifierNameToType.put("transient", J.Modifier.Type.Transient);
+ modifierNameToType.put("native", J.Modifier.Type.Native);
+ modifierNameToType.put("default", J.Modifier.Type.Default);
+ modifierNameToType.put("strictfp", J.Modifier.Type.Strictfp);
+ }
}
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyPrinter.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyPrinter.java
index 223036f95c2..69923fd1a1c 100644
--- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyPrinter.java
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyPrinter.java
@@ -25,6 +25,7 @@
import org.openrewrite.groovy.tree.GRightPadded;
import org.openrewrite.groovy.tree.GSpace;
import org.openrewrite.java.JavaPrinter;
+import org.openrewrite.java.marker.CompactConstructor;
import org.openrewrite.java.tree.*;
import org.openrewrite.marker.Marker;
import org.openrewrite.marker.Markers;
@@ -56,6 +57,7 @@ public J visitCompilationUnit(G.CompilationUnit cu, PrintOutputCapture p) {
JRightPadded pkg = cu.getPadding().getPackageDeclaration();
if (pkg != null) {
visit(pkg.getElement(), p);
+ visitMarkers(pkg.getMarkers(), p);
visitSpace(pkg.getAfter(), Space.Location.PACKAGE_SUFFIX, p);
}
@@ -258,22 +260,56 @@ public J visitTypeCast(J.TypeCast t, PrintOutputCapture p) {
return t;
}
+
+ @Override
+ public J visitVariableDeclarations(J.VariableDeclarations multiVariable, PrintOutputCapture
p) {
+ beforeSyntax(multiVariable, Space.Location.VARIABLE_DECLARATIONS_PREFIX, p);
+ visitSpace(Space.EMPTY, Space.Location.ANNOTATIONS, p);
+ visit(multiVariable.getLeadingAnnotations(), p);
+ multiVariable.getMarkers().findFirst(RedundantDef.class).ifPresent(def -> {
+ visitSpace(def.getPrefix(), Space.Location.LANGUAGE_EXTENSION, p);
+ p.append("def");
+ });
+ for (J.Modifier m : multiVariable.getModifiers()) {
+ visitModifier(m, p);
+ }
+ multiVariable.getMarkers().findFirst(MultiVariable.class).ifPresent(multiVar -> {
+ visitSpace(multiVar.getPrefix(), Space.Location.NAMED_VARIABLE_SUFFIX, p);
+ p.append(",");
+ });
+ visit(multiVariable.getTypeExpression(), p);
+ // For backwards compatibility.
+ for (JLeftPadded dim : multiVariable.getDimensionsBeforeName()) {
+ visitSpace(dim.getBefore(), Space.Location.DIMENSION_PREFIX, p);
+ p.append('[');
+ visitSpace(dim.getElement(), Space.Location.DIMENSION, p);
+ p.append(']');
+ }
+ if (multiVariable.getVarargs() != null) {
+ visitSpace(multiVariable.getVarargs(), Space.Location.VARARGS, p);
+ p.append("...");
+ }
+ visitRightPadded(multiVariable.getPadding().getVariables(), JRightPadded.Location.NAMED_VARIABLE, ",", p);
+ afterSyntax(multiVariable, p);
+ return multiVariable;
+ }
+
@Override
public J visitLambda(J.Lambda lambda, PrintOutputCapture p) {
beforeSyntax(lambda, Space.Location.LAMBDA_PREFIX, p);
LambdaStyle ls = lambda.getMarkers().findFirst(LambdaStyle.class)
.orElse(new LambdaStyle(null, false, !lambda.getParameters().getParameters().isEmpty()));
boolean parenthesized = lambda.getParameters().isParenthesized();
- if(!ls.isJavaStyle()) {
+ if (!ls.isJavaStyle()) {
p.append('{');
}
visitMarkers(lambda.getParameters().getMarkers(), p);
visitSpace(lambda.getParameters().getPrefix(), Space.Location.LAMBDA_PARAMETERS_PREFIX, p);
- if(parenthesized) {
+ if (parenthesized) {
p.append('(');
}
visitRightPadded(lambda.getParameters().getPadding().getParameters(), JRightPadded.Location.LAMBDA_PARAM, ",", p);
- if(parenthesized) {
+ if (parenthesized) {
p.append(')');
}
if (ls.isArrow()) {
@@ -287,7 +323,7 @@ public J visitLambda(J.Lambda lambda, PrintOutputCapture
p) {
} else {
visit(lambda.getBody(), p);
}
- if(!ls.isJavaStyle()) {
+ if (!ls.isJavaStyle()) {
p.append('}');
}
afterSyntax(lambda, p);
@@ -328,6 +364,40 @@ public J visitForEachLoop(J.ForEachLoop forEachLoop, PrintOutputCapture
p) {
return forEachLoop;
}
+ @Override
+ public J visitMethodDeclaration(J.MethodDeclaration method, PrintOutputCapture
p) {
+ beforeSyntax(method, Space.Location.METHOD_DECLARATION_PREFIX, p);
+ visitSpace(Space.EMPTY, Space.Location.ANNOTATIONS, p);
+ visit(method.getLeadingAnnotations(), p);
+ for (J.Modifier m : method.getModifiers()) {
+ visitModifier(m, p);
+ }
+ J.TypeParameters typeParameters = method.getAnnotations().getTypeParameters();
+ if (typeParameters != null) {
+ visit(typeParameters.getAnnotations(), p);
+ visitSpace(typeParameters.getPrefix(), Space.Location.TYPE_PARAMETERS, p);
+ visitMarkers(typeParameters.getMarkers(), p);
+ p.append('<');
+ visitRightPadded(typeParameters.getPadding().getTypeParameters(), JRightPadded.Location.TYPE_PARAMETER, ",", p);
+ p.append('>');
+ }
+ method.getMarkers().findFirst(RedundantDef.class).ifPresent(def -> {
+ visitSpace(def.getPrefix(), Space.Location.LANGUAGE_EXTENSION, p);
+ p.append("def");
+ });
+ visit(method.getReturnTypeExpression(), p);
+ visit(method.getAnnotations().getName().getAnnotations(), p);
+ visit(method.getName(), p);
+ if (!method.getMarkers().findFirst(CompactConstructor.class).isPresent()) {
+ visitContainer("(", method.getPadding().getParameters(), JContainer.Location.METHOD_DECLARATION_PARAMETERS, ",", ")", p);
+ }
+ visitContainer("throws", method.getPadding().getThrows(), JContainer.Location.THROWS, ",", null, p);
+ visit(method.getBody(), p);
+ visitLeftPadded("default", method.getPadding().getDefaultValue(), JLeftPadded.Location.METHOD_DECLARATION_DEFAULT_VALUE, p);
+ afterSyntax(method, p);
+ return method;
+ }
+
@Override
public J visitMethodInvocation(J.MethodInvocation method, PrintOutputCapture
p) {
beforeSyntax(method, Space.Location.METHOD_INVOCATION_PREFIX, p);
@@ -353,29 +423,32 @@ public J visitMethodInvocation(J.MethodInvocation method, PrintOutputCapture
visitSpace(argContainer.getBefore(), Space.Location.METHOD_INVOCATION_ARGUMENTS, p);
List> args = argContainer.getPadding().getElements();
+ boolean argsAreAllClosures = args.stream().allMatch(it -> it.getElement() instanceof J.Lambda);
+ boolean hasParentheses = true;
+ boolean applyTrailingLambdaParenthese = true;
for (int i = 0; i < args.size(); i++) {
JRightPadded arg = args.get(i);
- boolean omitParens = arg.getElement().getMarkers()
- .findFirst(OmitParentheses.class)
- .isPresent() ||
- arg.getElement().getMarkers()
- .findFirst(org.openrewrite.java.marker.OmitParentheses.class)
- .isPresent();
-
- if (i == 0 && !omitParens) {
- p.append('(');
- } else if (i > 0 && omitParens && (
- !args.get(0).getElement().getMarkers().findFirst(OmitParentheses.class).isPresent() &&
- !args.get(0).getElement().getMarkers().findFirst(org.openrewrite.java.marker.OmitParentheses.class).isPresent()
- )) {
- p.append(')');
- } else if (i > 0) {
+ boolean omitParensCurrElem = arg.getElement().getMarkers().findFirst(OmitParentheses.class).isPresent() ||
+ arg.getElement().getMarkers().findFirst(org.openrewrite.java.marker.OmitParentheses.class).isPresent();
+
+ if (i == 0) {
+ if (omitParensCurrElem) {
+ hasParentheses = false;
+ } else {
+ p.append('(');
+ }
+ } else if (hasParentheses && omitParensCurrElem) { // first trailing lambda, eg: `stage('Build..') {}`, should close the method
+ if (applyTrailingLambdaParenthese) { // apply once, to support multiple closures: `foo("baz") {} {}
+ p.append(')');
+ applyTrailingLambdaParenthese = false;
+ }
+ } else if (hasParentheses || !argsAreAllClosures) {
p.append(',');
}
visitRightPadded(arg, JRightPadded.Location.METHOD_INVOCATION_ARGUMENT, p);
- if (i == args.size() - 1 && !omitParens) {
+ if (i == args.size() - 1 && !omitParensCurrElem) {
p.append(')');
}
}
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java
index 872160fa148..66d13198117 100644
--- a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyTypeMapping.java
@@ -100,7 +100,7 @@ private JavaType.FullyQualified classType(ClassNode node, String signature) {
JavaType.FullyQualified owner = TypeUtils.asFullyQualified(type(node.getOuterClass()));
List fields = null;
- if(node.getFields().size() > 0) {
+ if(!node.getFields().isEmpty()) {
fields = new ArrayList<>(node.getFields().size());
for (FieldNode field : node.getFields()) {
if (!field.isSynthetic()) {
@@ -110,9 +110,9 @@ private JavaType.FullyQualified classType(ClassNode node, String signature) {
}
List methods = null;
- if(node.getAllDeclaredMethods().size() > 0) {
- methods = new ArrayList<>(node.getAllDeclaredMethods().size());
- for (MethodNode method : node.getAllDeclaredMethods()) {
+ if(!node.getMethods().isEmpty()) {
+ methods = new ArrayList<>(node.getMethods().size());
+ for (MethodNode method : node.getMethods()) {
if (!method.isSynthetic()) {
methods.add(methodType(method));
}
@@ -244,7 +244,7 @@ private JavaType genericType(GenericsType g, String signature) {
}
}
- List thrownExceptions = null;
+ List thrownExceptions = null;
if(node.getExceptions() != null) {
for (ClassNode e : node.getExceptions()) {
thrownExceptions = new ArrayList<>(node.getExceptions().length);
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/marker/MultiVariable.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/marker/MultiVariable.java
new file mode 100644
index 00000000000..3554529bf6b
--- /dev/null
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/marker/MultiVariable.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.groovy.marker;
+
+import lombok.Value;
+import lombok.With;
+import org.openrewrite.java.tree.Space;
+import org.openrewrite.marker.Marker;
+
+import java.util.UUID;
+
+@Value
+@With
+public class MultiVariable implements Marker {
+ UUID id;
+ Space prefix;
+}
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/marker/RedundantDef.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/marker/RedundantDef.java
new file mode 100644
index 00000000000..34157a68d97
--- /dev/null
+++ b/rewrite-groovy/src/main/java/org/openrewrite/groovy/marker/RedundantDef.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.groovy.marker;
+
+import lombok.Value;
+import lombok.With;
+import org.openrewrite.java.tree.Space;
+import org.openrewrite.marker.Marker;
+
+import java.util.UUID;
+
+/**
+ * In Groovy methods can be declared with a return type and also a redundant 'def' keyword.
+ * This captures the extra def keyword.
+ */
+@Value
+@With
+public class RedundantDef implements Marker {
+ UUID id;
+ Space prefix;
+}
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/GroovyTypeAttributionTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/GroovyTypeAttributionTest.java
index 432f70cca52..1a5b3534c8f 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/GroovyTypeAttributionTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/GroovyTypeAttributionTest.java
@@ -18,6 +18,7 @@
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.ExpectedToFail;
import org.openrewrite.DocumentExample;
import org.openrewrite.InMemoryExecutionContext;
import org.openrewrite.groovy.tree.G;
@@ -180,7 +181,7 @@ public String register(@DelegatesTo(String) Closure stringAction) {
}
@SuppressWarnings({"GrPackage", "OptionalGetWithoutIsPresent"})
- @Disabled
+ @ExpectedToFail
@Test
void infersDelegateViaSimilarGradleApi() {
rewriteRun(
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/JenkinsFileTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/JenkinsFileTest.java
index f677fb9f019..75ff46b9ffe 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/JenkinsFileTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/JenkinsFileTest.java
@@ -16,6 +16,7 @@
package org.openrewrite.groovy;
import org.junit.jupiter.api.Test;
+import org.openrewrite.Issue;
import org.openrewrite.test.RewriteTest;
import static org.openrewrite.groovy.Assertions.groovy;
@@ -119,4 +120,19 @@ void jenkinsfile() {
)
);
}
+
+ @Issue("https://github.com/openrewrite/rewrite/pull/4887")
+ @Test
+ void jenkinsfileWithComment() {
+ // the Jenkinsfile adapted from https://github.com/jenkinsci/ssh-plugin/blob/158.ve2a_e90fb_7319/Jenkinsfile
+ rewriteRun(
+ groovy(
+ """
+ /* https://github.com */
+ foo()
+ """,
+ spec -> spec.path("Jenkinsfile")
+ )
+ );
+ }
}
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/format/OmitParenthesesForLastArgumentLambdaTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/format/OmitParenthesesForLastArgumentLambdaTest.java
index 5b32551363d..5e7c28f6d6b 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/format/OmitParenthesesForLastArgumentLambdaTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/format/OmitParenthesesForLastArgumentLambdaTest.java
@@ -15,7 +15,6 @@
*/
package org.openrewrite.groovy.format;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;
@@ -38,7 +37,6 @@ public void defaults(RecipeSpec spec) {
spec.recipe(new OmitParenthesesForLastArgumentLambda());
}
- @Disabled("Not yet implemented")
@Test
void lastClosureArgument() {
rewriteRun(
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/AnnotationTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/AnnotationTest.java
index a87695e7d71..c9f14d23010 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/AnnotationTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/AnnotationTest.java
@@ -30,22 +30,135 @@ void simple() {
groovy(
"""
@Foo
- class Test {
+ class Test implements Runnable {
+ @java.lang.Override
+ void run() {}
}
"""
)
);
}
+ @Test
+ void simpleFQN() {
+ rewriteRun(
+ groovy(
+ """
+ @org.springframework.stereotype.Service
+ class Test {}
+ """
+ )
+ );
+ }
+
+ @Test
+ void withParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ @Foo()
+ class Test {}
+ """
+ )
+ );
+ }
+
+ @Test
+ void inline() {
+ rewriteRun(
+ groovy(
+ """
+ @Foo class Test implements Runnable {
+ @Override void run() {}
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void withProperties() {
+ rewriteRun(
+ groovy(
+ """
+ @Foo(value = "A", version = "1.0")
+ class Test {}
+ """
+ )
+ );
+ }
+
+ @Test
+ void withImplicitValueProperty() {
+ rewriteRun(
+ groovy(
+ """
+ @Foo("A")
+ class Test {}
+ """
+ )
+ );
+ }
+
@Issue("https://github.com/openrewrite/rewrite/issues/4055")
@Test
void nested() {
rewriteRun(
groovy(
"""
- @Foo(bar = @Bar)
- class Test {
- }
+ @Foo(bar = @Bar(@Baz(baz = @Qux("1.0"))))
+ class Test {}
+ """
+ )
+ );
+ }
+
+ @Issue("https://github.com/openrewrite/rewrite/issues/4254")
+ @Test
+ void groovyTransformAnnotation() {
+ rewriteRun(
+ groovy(
+ """
+ import groovy.transform.EqualsAndHashCode
+ import groovy.transform.ToString
+
+ @Foo
+ @ToString
+ @EqualsAndHashCode
+ @Bar
+ class Test {}
+ """
+ )
+ );
+ }
+
+ @Issue("https://github.com/openrewrite/rewrite/issues/4254")
+ @Test
+ void groovyTransformImmutableAnnotation() {
+ rewriteRun(
+ groovy(
+ """
+ import groovy.transform.Immutable
+ import groovy.transform.TupleConstructor
+
+ @Foo
+ @TupleConstructor
+ @Immutable
+ @Bar
+ class Test {}
+ """
+ )
+ );
+ }
+
+ @Issue("https://github.com/openrewrite/rewrite/issues/4254")
+ @Test
+ void groovyTransformImmutableFQNAnnotation() {
+ rewriteRun(
+ groovy(
+ """
+ @groovy.transform.Immutable
+ class Test {}
"""
)
);
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/AssignmentTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/AssignmentTest.java
index 8a15073a41b..1d04f9bd706 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/AssignmentTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/AssignmentTest.java
@@ -24,6 +24,41 @@
@SuppressWarnings({"GroovyUnusedAssignment", "GrUnnecessarySemicolon"})
class AssignmentTest implements RewriteTest {
+ @Test
+ void noKeyword() {
+ rewriteRun(
+ groovy(
+ """
+ x = "s"
+ """
+ )
+ );
+ }
+
+ @Test
+ void simple() {
+ rewriteRun(
+ groovy(
+ """
+ def x = "s"
+ """
+ )
+ );
+ }
+
+ @Test
+ void simpleWithFinal() {
+ rewriteRun(
+ groovy(
+ """
+ final def x = "x"
+ def final y = "y"
+ final z = "z"
+ """
+ )
+ );
+ }
+
@Test
void concat() {
rewriteRun(
@@ -50,6 +85,28 @@ void assignment() {
);
}
+ @Test
+ void classAssignment() {
+ rewriteRun(
+ groovy(
+ """
+ def s = String
+ """
+ )
+ );
+ }
+
+ @Test
+ void classAssignmentJavaStyle() {
+ rewriteRun(
+ groovy(
+ """
+ def s = String.class
+ """
+ )
+ );
+ }
+
@Test
void unaryMinus() {
rewriteRun(
@@ -91,4 +148,52 @@ void baseNConversions() {
)
);
}
+
+ @Test
+ void multipleAssignmentsAtOneLine() {
+ rewriteRun(
+ groovy(
+ """
+ def startItem = '| ', endItem = ' |'
+ def repeatLength = startItem.length() + output.length() + endItem.length()
+ println("\\n" + ("-" * repeatLength) + "\\n| " + startItem + output + endItem + " |\\n" + ("-" * repeatLength))
+ """
+ )
+ );
+ }
+
+ @Test
+ void multipleAssignmentsAtOneLineSimple() {
+ rewriteRun(
+ groovy(
+ """
+ def a = '1', b = '2'
+ """
+ )
+ );
+ }
+
+ @Test
+ void multipleAssignmentsAtMultipleLineDynamicType() {
+ rewriteRun(
+ groovy(
+ """
+ def a = '1' ,
+ b = '2'
+ """
+ )
+ );
+ }
+
+ @Test
+ void multipleAssignmentsAtMultipleLineStaticType() {
+ rewriteRun(
+ groovy(
+ """
+ String a = '1' ,
+ b = '2'
+ """
+ )
+ );
+ }
}
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/AttributeTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/AttributeTest.java
index bfbadb76655..2b7d4c82756 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/AttributeTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/AttributeTest.java
@@ -20,19 +20,26 @@
import static org.openrewrite.groovy.Assertions.groovy;
-@SuppressWarnings({"GroovyUnusedAssignment", "GrUnnecessarySemicolon"})
class AttributeTest implements RewriteTest {
@Test
- void usingGroovyNode() {
+ void attribute() {
rewriteRun(
- groovy(
- """
- def xml = new Node(null, "ivy")
- def n = xml.dependencies.dependency.find { it.@name == 'test-module' }
- n.@conf = 'runtime->default;docs->docs;sources->sources'
- """
- )
+ groovy("new User('Bob').@name")
+ );
+ }
+
+ @Test
+ void attributeInClosure() {
+ rewriteRun(
+ groovy("[new User('Bob')].collect { it.@name }")
+ );
+ }
+
+ @Test
+ void attributeWithParentheses() {
+ rewriteRun(
+ groovy("(new User('Bob').@name)")
);
}
}
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/BinaryTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/BinaryTest.java
index 2d2675bfe72..ea37ae1215d 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/BinaryTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/BinaryTest.java
@@ -15,8 +15,8 @@
*/
package org.openrewrite.groovy.tree;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.ExpectedToFail;
import org.openrewrite.Issue;
import org.openrewrite.test.RewriteTest;
@@ -34,7 +34,10 @@ void insideParentheses() {
// NOT inside parentheses, but verifies the parser's
// test for "inside parentheses" condition
- groovy("(1) + 1")
+ groovy("( 1 ) + 1"),
+ groovy("(1) + 1"),
+ // And combine the two cases
+ groovy("((1) + 1)")
);
}
@@ -62,6 +65,31 @@ void in() {
);
}
+ @Test
+ void withVariable() {
+ rewriteRun(
+ groovy(
+ """
+ def foo(int a) {
+ 60 + a
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void regexPatternOperator() {
+ rewriteRun(
+ groovy(
+ """
+ def PATTERN = ~/foo/
+ def result = PATTERN.matcher('4711').matches()
+ """
+ )
+ );
+ }
+
@Issue("https://github.com/openrewrite/rewrite/issues/1531")
@Test
void regexFindOperator() {
@@ -201,17 +229,41 @@ void stringMultipliedInParentheses() {
);
}
- @Disabled
@Issue("https://github.com/openrewrite/rewrite/issues/4703")
@Test
- void extraParensAroundInfixOperator() {
+ void cxds() {
rewriteRun(
groovy(
"""
- def foo(Map map) {
- ((map.containsKey("foo"))
- && ((map.get("foo")).equals("bar")))
+ def differenceInDays(int time) {
+ return (int) ((time)/(1000*60*60*24))
}
+ """
+ )
+ );
+ }
+
+ @Issue("https://github.com/openrewrite/rewrite/issues/4703")
+ @Test
+ void extraParensAroundInfixOxxxperator() {
+ rewriteRun(
+ groovy(
+ """
+ def timestamp(int hours, int minutes, int seconds) {
+ 30 * (hours)
+ (((((hours))))) * 30
+ }
+ """
+ )
+ );
+ }
+
+ @Issue("https://github.com/openrewrite/rewrite/issues/4703")
+ @Test
+ void extraParensAroundInfixOperator() {
+ rewriteRun(
+ groovy(
+ """
def timestamp(int hours, int minutes, int seconds) {
(hours) * 60 * 60 + (minutes * 60) + seconds
}
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/CastTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/CastTest.java
index e5fc6a0cb95..4c009de95e3 100755
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/CastTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/CastTest.java
@@ -24,6 +24,18 @@
@SuppressWarnings({"UnnecessaryQualifiedReference", "GroovyUnusedAssignment", "GrUnnecessarySemicolon"})
class CastTest implements RewriteTest {
+ @Test
+ void cast() {
+ rewriteRun(
+ groovy(
+ """
+ String foo = ( String ) "hallo"
+ String bar = "hallo" as String
+ """
+ )
+ );
+ }
+
@Test
void javaStyleCast() {
rewriteRun(
@@ -73,7 +85,18 @@ void groovyCastAndInvokeMethod() {
rewriteRun(
groovy(
"""
- ( "" as String ).toString()
+ ( "x" as String ).toString()
+ """
+ )
+ );
+ }
+
+ @Test
+ void groovyCastAndInvokeMethodWithParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ (((((( "" as String ))))).toString())
"""
)
);
@@ -89,4 +112,15 @@ void javaCastAndInvokeMethod() {
)
);
}
+
+ @Test
+ void javaCastAndInvokeMethodWithParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ (((((( (String) "" )).toString()))))
+ """
+ )
+ );
+ }
}
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ClassDeclarationTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ClassDeclarationTest.java
index 99d937b3168..02fd20658c8 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ClassDeclarationTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ClassDeclarationTest.java
@@ -16,14 +16,12 @@
package org.openrewrite.groovy.tree;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openrewrite.Issue;
import org.openrewrite.java.tree.J;
import org.openrewrite.java.tree.JavaType;
import org.openrewrite.java.tree.TypeUtils;
import org.openrewrite.test.RewriteTest;
-import org.openrewrite.test.TypeValidation;
import static java.util.Objects.requireNonNull;
import static org.assertj.core.api.Assertions.assertThat;
@@ -86,6 +84,28 @@ public abstract class A {}
);
}
+ @Test
+ void extendsObject() {
+ rewriteRun(
+ groovy(
+ """
+ class B extends Object {}
+ """
+ )
+ );
+ }
+
+ @Test
+ void extendsScript() {
+ rewriteRun(
+ groovy(
+ """
+ abstract class B extends Script {}
+ """
+ )
+ );
+ }
+
@Test
void interfaceExtendsInterface() {
rewriteRun(
@@ -137,6 +157,19 @@ public class A{}
);
}
+ @Test
+ void hasPackageWithTrailingComma() {
+ rewriteRun(
+ groovy(
+ """
+ package org.openrewrite;
+
+ class A{}
+ """
+ )
+ );
+ }
+
@Issue("https://github.com/openrewrite/rewrite/issues/1736")
@Test
void parameterizedFieldDoesNotAffectClassType() {
@@ -227,6 +260,20 @@ class Inner {
);
}
+ @Issue("https://github.com/openrewrite/rewrite/issues/4705")
+ @Test
+ void constructorWithDef() {
+ rewriteRun(
+ groovy(
+ """
+ class A {
+ def A() {}
+ }
+ """
+ )
+ );
+ }
+
@Test
void newParameterizedConstructor() {
rewriteRun(
@@ -323,17 +370,90 @@ class A {
);
}
- @Issue("https://github.com/openrewrite/rewrite/pull/4346")
@Test
- @Disabled("Known issue; still need to explore a fix")
- void classExtendsGroovyLangScript() {
+ void anonymousInnerClass() {
+ rewriteRun(
+ groovy(
+ """
+ interface Something {}
+
+ class Test {
+ Something something = new Something() {}
+ static def test() {
+ new Something() {}
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ @Issue("https://github.com/openrewrite/rewrite/issues/4063")
+ void nestedClassWithoutParameters() {
+ rewriteRun(
+ groovy(
+ """
+ class A {
+ class B {
+ B() {}
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ @Issue("https://github.com/openrewrite/rewrite/issues/4063")
+ void nestedClass() {
+ rewriteRun(
+ groovy(
+ """
+ class A {
+ class B {
+ String a;String[] b
+ B(String $a, String... b) {
+ this.a = $a
+ this.b = b
+ }
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ @Issue("https://github.com/openrewrite/rewrite/issues/4063")
+ void nestedStaticClassWithoutParameters() {
+ rewriteRun(
+ groovy(
+ """
+ class A {
+ static class B {
+ B() {}
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ @Issue("https://github.com/openrewrite/rewrite/issues/4063")
+ void nestedStaticClass() {
rewriteRun(
- spec -> spec.typeValidationOptions(TypeValidation.none()),
- // Reduced from https://github.com/openrewrite/rewrite/blob/3de7723ba43d8c44d7b524273ad7548d4fcd04eb/rewrite-gradle/src/main/groovy/RewriteSettings.groovy#L32
- // "Source file was parsed into an LST that contains non-whitespace characters in its whitespace. This is indicative of a bug in the parser."
groovy(
"""
- class RewriteSettings extends groovy.lang.Script {
+ class A {
+ static class B {
+ String a;String[] b
+ B(String a, String... b) {
+ this.a = a
+ this.b = b
+ }
+ }
}
"""
)
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ConstructorTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ConstructorTest.java
index 16e575e0c96..7c7b5c66d72 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ConstructorTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ConstructorTest.java
@@ -15,7 +15,6 @@
*/
package org.openrewrite.groovy.tree;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openrewrite.test.RewriteTest;
@@ -70,7 +69,6 @@ int one() {
}
@Test
- @Disabled("Fails to parse")
void implicitPublic() {
rewriteRun(
groovy(
@@ -85,7 +83,6 @@ class T {
}
@Test
- @Disabled("Fails to parse")
void defaultConstructorArguments() {
rewriteRun(
groovy(
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/EnumTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/EnumTest.java
index 438fc53d27f..10de8091922 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/EnumTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/EnumTest.java
@@ -15,15 +15,15 @@
*/
package org.openrewrite.groovy.tree;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.ExpectedToFail;
import org.openrewrite.test.RewriteTest;
import static org.openrewrite.groovy.Assertions.groovy;
class EnumTest implements RewriteTest {
- @Disabled
+ @ExpectedToFail
@Test
void enumDefinition() {
rewriteRun(
@@ -38,7 +38,7 @@ enum A {
);
}
- @Disabled
+ @ExpectedToFail
@Test
void innerEnum() {
rewriteRun(
@@ -54,7 +54,7 @@ enum B {
);
}
- @Disabled
+ @ExpectedToFail
@Test
void enumWithAnnotations() {
rewriteRun(
@@ -72,7 +72,7 @@ enum Test {
);
}
- @Disabled
+ @ExpectedToFail
@Test
void anonymousClassInitializer() {
rewriteRun(
@@ -99,7 +99,7 @@ void foo() {}
);
}
- @Disabled
+ @ExpectedToFail
@Test
void enumConstructor() {
rewriteRun(
@@ -123,7 +123,7 @@ private static Object[] combineArguments(String context, Throwable ex, Object[]
);
}
- @Disabled
+ @ExpectedToFail
@Test
void noArguments() {
rewriteRun(
@@ -137,7 +137,7 @@ enum A {
);
}
- @Disabled
+ @ExpectedToFail
@Test
void enumWithParameters() {
rewriteRun(
@@ -154,7 +154,7 @@ enum A {
);
}
- @Disabled
+ @ExpectedToFail
@Test
void enumWithoutParameters() {
rewriteRun(
@@ -164,7 +164,7 @@ void enumWithoutParameters() {
);
}
- @Disabled
+ @ExpectedToFail
@Test
void enumUnnecessarilyTerminatedWithSemicolon() {
rewriteRun(
@@ -174,7 +174,7 @@ void enumUnnecessarilyTerminatedWithSemicolon() {
);
}
- @Disabled
+ @ExpectedToFail
@Test
void enumWithEmptyParameters() {
rewriteRun(
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ForLoopTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ForLoopTest.java
index a1432f73256..b2564fabf91 100755
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ForLoopTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ForLoopTest.java
@@ -15,7 +15,6 @@
*/
package org.openrewrite.groovy.tree;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openrewrite.test.RewriteTest;
@@ -148,7 +147,6 @@ void initializerIsAnAssignment() {
);
}
- @Disabled
@Test
void multiVariableInitialization() {
rewriteRun(
@@ -162,6 +160,17 @@ void multiVariableInitialization() {
@Test
void forEachWithColon() {
+ rewriteRun(
+ groovy(
+ """
+ for(def i : [1, 2, 3]) {}
+ """
+ )
+ );
+ }
+
+ @Test
+ void forEachTypedWithColon() {
rewriteRun(
groovy(
"""
@@ -176,9 +185,7 @@ void forIn() {
rewriteRun(
groovy(
"""
- def dependenciesType = ['implementation', 'testImplementation']
- for (type in dependenciesType) {
- }
+ for (type in ['implementation', 'testImplementation']) {}
"""
)
);
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ListTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ListTest.java
index b42f9579fd4..d921377b661 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ListTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/ListTest.java
@@ -23,6 +23,29 @@
@SuppressWarnings("GroovyUnusedAssignment")
class ListTest implements RewriteTest {
+ @Test
+ void emptyListLiteral() {
+ rewriteRun(
+ groovy(
+ """
+ def a = []
+ def b = [ ]
+ """
+ )
+ );
+ }
+
+ @Test
+ void emptyListLiteralWithParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ def y = ([])
+ """
+ )
+ );
+ }
+
@Test
void listLiteral() {
rewriteRun(
@@ -33,4 +56,15 @@ void listLiteral() {
)
);
}
+
+ @Test
+ void listLiteralTrailingComma() {
+ rewriteRun(
+ groovy(
+ """
+ def a = [ "foo" /* "foo" suffix */ , /* "]" prefix */ ]
+ """
+ )
+ );
+ }
}
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/LiteralTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/LiteralTest.java
index 46851b2f65a..0bc2ac3535d 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/LiteralTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/LiteralTest.java
@@ -84,6 +84,17 @@ void slashString() {
);
}
+ @Test
+ void escapedString() {
+ rewriteRun(
+ groovy(
+ """
+ "f\\"o\\\\\\"o"
+ """
+ )
+ );
+ }
+
@Test
void gString() {
rewriteRun(
@@ -169,6 +180,17 @@ void gStringWithSpace() {
);
}
+ @Test
+ void gStringWithEscapedDelimiter() {
+ rewriteRun(
+ groovy(
+ """
+ String s = "${displayName} "
+ """
+ )
+ );
+ }
+
@Test
void mapLiteral() {
rewriteRun(
@@ -216,18 +238,6 @@ void literalValueAndTypeAgree() {
);
}
- @Test
- void emptyListLiteral() {
- rewriteRun(
- groovy(
- """
- def a = []
- def b = [ ]
- """
- )
- );
- }
-
@Test
void multilineStringWithApostrophes() {
rewriteRun(
@@ -254,17 +264,6 @@ void mapLiteralTrailingComma() {
);
}
- @Test
- void listLiteralTrailingComma() {
- rewriteRun(
- groovy(
- """
- def a = [ "foo" /* "foo" suffix */ , /* "]" prefix */ ]
- """
- )
- );
- }
-
@Test
void gStringThatHasEmptyValueExpressionForUnknownReason() {
rewriteRun(
@@ -282,7 +281,7 @@ void escapeCharacters() {
rewriteRun(
groovy(
"""
- "\\\\n\\t"
+ "\\\\\\\\n\\\\t"
'\\\\n\\t'
///\\\\n\\t///
"""
@@ -307,7 +306,7 @@ void stringLiteralInParentheses() {
rewriteRun(
groovy(
"""
- def a = ("-")
+ def a = ( "-" )
"""
),
groovy(
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MapEntryTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MapEntryTest.java
index 65bb4a17492..67ee80177cd 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MapEntryTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MapEntryTest.java
@@ -55,6 +55,13 @@ void emptyMapLiteral() {
);
}
+ @Test
+ void emptyMapLiteralWithParentheses() {
+ rewriteRun(
+ groovy("Map m = ([ : ])")
+ );
+ }
+
@Test
void mapAccess() {
rewriteRun(
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodDeclarationTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodDeclarationTest.java
index 1963ef2db08..6d238895d62 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodDeclarationTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodDeclarationTest.java
@@ -15,7 +15,6 @@
*/
package org.openrewrite.groovy.tree;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openrewrite.Issue;
import org.openrewrite.java.JavaIsoVisitor;
@@ -80,6 +79,19 @@ static int accept(Map m) {
);
}
+ @Test
+ void genericTypeParameter() {
+ rewriteRun(
+ groovy(
+ """
+ interface Foo {
+ T task(Class type)
+ }
+ """
+ )
+ );
+ }
+
@Test
void emptyArguments() {
rewriteRun(
@@ -111,6 +123,19 @@ def foo(bar, baz) {
);
}
+ @Test
+ void varargsArguments() {
+ rewriteRun(
+ groovy(
+ """
+ def foo(String... messages) {
+ println(messages[0])
+ }
+ """
+ )
+ );
+ }
+
@Test
void defaultArgumentValues() {
rewriteRun(
@@ -182,16 +207,16 @@ void escapedMethodNameWithSpacesTest() {
}
@Issue("https://github.com/openrewrite/rewrite/issues/4705")
- @Disabled
@Test
void functionWithDefAndExplicitReturnType() {
rewriteRun(
groovy(
- """
- class A {
- def int one() { 1 }
- }
"""
+ class A {
+ def /*int*/ int one() { 1 }
+ @Foo def /*Object*/ Object two() { 2 }
+ }
+ """
)
);
}
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodInvocationTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodInvocationTest.java
index e22c1e08d46..4e893f7ffb0 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodInvocationTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodInvocationTest.java
@@ -30,11 +30,11 @@ void gradle() {
plugins {
id 'java-library'
}
-
+
repositories {
mavenCentral()
}
-
+
dependencies {
implementation 'org.hibernate:hibernate-core:3.6.7.Final'
api 'com.google.guava:guava:23.0'
@@ -45,6 +45,21 @@ void gradle() {
);
}
+ @Test
+ @Issue("https://github.com/openrewrite/rewrite/issues/4615")
+ void gradleWithParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ plugins {
+ id 'java-library'
+ }
+ def version = (rootProject.jobName.startsWith('a')) ? "latest.release" : "3.0"
+ """
+ )
+ );
+ }
+
@Test
void emptyArgsWithParens() {
rewriteRun(
@@ -52,6 +67,19 @@ void emptyArgsWithParens() {
);
}
+ @Test
+ void noParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ class SomeObject {}
+ def foo(String a, int b, SomeObject c, String d) {}
+ foo "a", 3, new SomeObject(), "d"
+ """
+ )
+ );
+ }
+
@Test
@SuppressWarnings("GroovyVariableNotAssigned")
void nullSafeDereference() {
@@ -148,6 +176,28 @@ def acceptsNamedArguments(Map a, int n, int m) { }
);
}
+ @Test
+ void useClassAsArgument() {
+ rewriteRun(
+ groovy(
+ """
+ foo(String)
+ """
+ )
+ );
+ }
+
+ @Test
+ void useClassAsArgumentJavaStyle() {
+ rewriteRun(
+ groovy(
+ """
+ foo(String.class)
+ """
+ )
+ );
+ }
+
@Test
@SuppressWarnings("GroovyAssignabilityCheck")
void closureWithImplicitParameter() {
@@ -163,6 +213,88 @@ def acceptsClosure(Closure cl) {}
);
}
+ @Test
+ void closureInObjectInObject() {
+ rewriteRun(
+ groovy(
+ """
+ class Test {
+ Test child = new Test()
+ def acceptsClosure(Closure cl) {}
+ }
+
+ new Test().child.acceptsClosure {}
+ """
+ )
+ );
+ }
+
+ @Issue("https://github.com/openrewrite/rewrite/issues/4766")
+ @Test
+ void gradleFileWithMultipleClosuresWithoutParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ copySpec {
+ from { 'src/main/webapp' } { exclude "**/*.jpg" }
+ rename '(.+)-staging(.+)', '$1$2'
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void multipleClosureArgumentsWithoutParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ def foo(Closure a, Closure b, Closure c) {}
+ foo { } { } {
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void multipleClosureArgumentsWithParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ def foo(Closure a, Closure b, Closure c) {}
+ foo({ }, { }, {
+ })
+ """
+ )
+ );
+ }
+
+ @Test
+ void multipleArgumentsWithClosuresAndNonClosuresWithoutParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ def foo(String a, Closure b, Closure c, String d) {}
+ foo "a", { }, {
+ }, "d"
+ """
+ )
+ );
+ }
+
+ @Test
+ void trailingClosures() {
+ rewriteRun(
+ groovy(
+ """
+ def foo(String a, int b, String c, Closure d, Closure e, Closure f) {}
+ foo("bar", 3, "baz") { } { } {}
+ """
+ )
+ );
+ }
+
@Issue("https://github.com/openrewrite/rewrite/issues/1236")
@Test
@SuppressWarnings("GroovyAssignabilityCheck")
@@ -230,6 +362,25 @@ void closureReturn() {
);
}
+ @Issue("https://github.com/openrewrite/rewrite/issues/4055")
+ @Test
+ void chainOfMethodInvocations() {
+ rewriteRun(
+ groovy(
+ """
+ Micronaut.build(args)
+ .banner(false)
+ .propertySources(PropertySource.of("my-config", [name: "MyApp"]))
+ .environments("prod") // Only prod
+ .overrideConfig("custom-config.yml") // Load custom config
+ .packages("com.company")
+ .mainClass(Application)
+ .start()
+ """
+ )
+ );
+ }
+
@Issue("https://github.com/openrewrite/rewrite/issues/2552")
@Test
void closureInvocation() {
@@ -253,7 +404,7 @@ class StringUtils {
static boolean isEmpty(String value) {
return value == null || value.isEmpty()
}
-
+
static void main(String[] args) {
isEmpty("")
}
@@ -262,4 +413,82 @@ static void main(String[] args) {
)
);
}
+
+ @Issue("https://github.com/openrewrite/rewrite/issues/4703")
+ @Test
+ void insideParenthesesSimple() {
+ rewriteRun(
+ groovy(
+ """
+ ((a.invoke "b" ))
+ """
+ )
+ );
+ }
+
+ @Test
+ void lotOfSpacesAroundConstantWithParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ ( ( ( "x" ) ).toString() )
+ """
+ )
+ );
+ }
+
+ @Issue("https://github.com/openrewrite/rewrite/issues/4703")
+ @Test
+ void insideParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ static def foo(Map map) {
+ ((map.containsKey("foo"))
+ && ((map.get("foo")).equals("bar")))
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ void insideParenthesesWithNewline() {
+ rewriteRun(
+ groovy(
+ """
+ static def foo(Map map) {
+ ((
+ map.containsKey("foo"))
+ && ((map.get("foo")).equals("bar")))
+ }
+ """
+ )
+ );
+ }
+
+ @Issue("https://github.com/openrewrite/rewrite/issues/4703")
+ @Test
+ void insideParenthesesWithoutNewLineAndEscapedMethodName() {
+ rewriteRun(
+ groovy(
+ """
+ static def foo(Map someMap) {((((((someMap.get("(bar")))) ).'equals' "baz" ) ) }
+ """
+ )
+ );
+ }
+
+ @Test
+ void insideFourParenthesesAndEnters() {
+ rewriteRun(
+ groovy(
+ """
+ ((((
+ something(a)
+ ))))
+ """
+ )
+ );
+ }
}
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/RangeTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/RangeTest.java
index bdea313eb33..e0ff32f3d94 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/RangeTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/RangeTest.java
@@ -46,4 +46,17 @@ void parenthesized() {
)
);
}
+
+ @Test
+ void parenthesizedAndInvokeMethodWithParentheses() {
+ rewriteRun(
+ groovy(
+ """
+ (((( 8..19 ))).each { majorVersion ->
+ if (majorVersion == 9) return
+ })
+ """
+ )
+ );
+ }
}
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/RealWorldGroovyTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/RealWorldGroovyTest.java
new file mode 100644
index 00000000000..4b128e21c18
--- /dev/null
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/RealWorldGroovyTest.java
@@ -0,0 +1,420 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.groovy.tree;
+
+import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.ExpectedToFail;
+import org.openrewrite.Issue;
+import org.openrewrite.test.RewriteTest;
+
+import static org.openrewrite.groovy.Assertions.groovy;
+
+/**
+ * A test with groovy examples picked from OSS repositories.
+ */
+class RealWorldGroovyTest implements RewriteTest {
+
+ @Test
+ @Issue("https://github.com/spring-projects/spring-boot/blob/v3.4.1/settings.gradle")
+ void springBootSettingsGradle() {
+ rewriteRun(
+ groovy(
+ """
+ pluginManagement {
+ evaluate(new File("${rootDir}/buildSrc/SpringRepositorySupport.groovy")).apply(this)
+ repositories {
+ mavenCentral()
+ gradlePluginPortal()
+ spring.mavenRepositories();
+ }
+ resolutionStrategy {
+ eachPlugin {
+ if (requested.id.id == "org.jetbrains.kotlin.jvm") {
+ useVersion "${kotlinVersion}"
+ }
+ if (requested.id.id == "org.jetbrains.kotlin.plugin.spring") {
+ useVersion "${kotlinVersion}"
+ }
+ }
+ }
+ }
+
+ plugins {
+ id "io.spring.develocity.conventions" version "0.0.22"
+ }
+
+ rootProject.name="spring-boot-build"
+
+ enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
+
+ settings.gradle.projectsLoaded {
+ develocity {
+ buildScan {
+ def toolchainVersion = settings.gradle.rootProject.findProperty('toolchainVersion')
+ if (toolchainVersion != null) {
+ value('Toolchain version', toolchainVersion)
+ tag("JDK-$toolchainVersion")
+ }
+ }
+ }
+ }
+
+ include "spring-boot-system-tests:spring-boot-image-tests"
+
+ file("${rootDir}/spring-boot-project/spring-boot-starters").eachDirMatch(~/spring-boot-starter.*/) {
+ include "spring-boot-project:spring-boot-starters:${it.name}"
+ }
+
+ file("${rootDir}/spring-boot-tests/spring-boot-smoke-tests").eachDirMatch(~/spring-boot-smoke-test.*/) {
+ include "spring-boot-tests:spring-boot-smoke-tests:${it.name}"
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ @Issue("https://github.com/spring-projects/spring-boot/blob/v3.4.1/spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/resources/classloader-test-app.groovy")
+ void springBootClassloaderTestApp() {
+ rewriteRun(
+ groovy(
+ """
+ import org.springframework.util.*
+
+ @Component
+ public class Test implements CommandLineRunner {
+
+ public void run(String... args) throws Exception {
+ println "HasClasses-" + ClassUtils.isPresent("missing", null) + "-" +
+ ClassUtils.isPresent("org.springframework.boot.SpringApplication", null) + "-" +
+ ClassUtils.isPresent(args[0], null)
+ }
+
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ @Issue("https://github.com/spring-projects/spring-ldap/blob/v3.4.1/buildSrc/src/main/groovy/io/spring/gradle/convention/JavadocOptionsPlugin.groovy")
+ void springLdapJavadocOptionsPlugin() {
+ rewriteRun(
+ groovy(
+ """
+ import org.gradle.api.Plugin
+ import org.gradle.api.Project
+ import org.gradle.api.tasks.javadoc.Javadoc
+
+ public class JavadocOptionsPlugin implements Plugin {
+
+ @Override
+ public void apply(Project project) {
+ project.getTasks().withType(Javadoc).all { t->
+ t.options.addStringOption('Xdoclint:none', '-quiet')
+ }
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ @Issue("https://github.com/spring-projects/spring-ldap/blob/v3.4.1/buildSrc/src/test/resources/samples/integrationtest/withgroovy/src/integration-test/groovy/sample/TheTest.groovy")
+ void springLdapTheTest() {
+ rewriteRun(
+ groovy(
+ """
+ import org.springframework.core.Ordered
+ import spock.lang.Specification
+
+ class TheTest extends Specification {
+ def "has Ordered"() {
+ expect: 'Loads Ordered fine'
+ Ordered ordered = new Ordered() {
+ @Override
+ int getOrder() {
+ return 0
+ }
+ }
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ @Issue("https://github.com/spring-projects/spring-session-data-geode/blob/v3.4.1/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaZipPlugin.groovy")
+ void springTestDataGeodeSchemaZipPlugin() {
+ rewriteRun(
+ groovy(
+ """
+ import org.gradle.api.Plugin
+ import org.gradle.api.Project
+ import org.gradle.api.file.DuplicatesStrategy
+ import org.gradle.api.plugins.JavaPlugin
+ import org.gradle.api.tasks.bundling.Zip
+
+ /**
+ * Zips all Spring XML schemas (XSD) files.
+ *
+ * @author Rob Winch
+ * @author John Blum
+ * @see org.gradle.api.Plugin
+ * @see org.gradle.api.Project
+ */
+ class SchemaZipPlugin implements Plugin {
+
+ @Override
+ void apply(Project project) {
+
+ Zip schemaZip = project.tasks.create('schemaZip', Zip)
+
+ schemaZip.archiveBaseName = project.rootProject.name
+ schemaZip.archiveClassifier = 'schema'
+ schemaZip.description = "Builds -${schemaZip.archiveClassifier} archive containing all XSDs" +
+ " for deployment to static.springframework.org/schema."
+ schemaZip.group = 'Distribution'
+
+ project.rootProject.subprojects.each { module ->
+
+ module.getPlugins().withType(JavaPlugin.class).all {
+
+ Properties schemas = new Properties();
+
+ module.sourceSets.main.resources
+ .find { it.path.endsWith('META-INF/spring.schemas') }
+ ?.withInputStream { schemas.load(it) }
+
+ for (def key : schemas.keySet()) {
+
+ def zipEntryName = key.replaceAll(/http.*schema.(.*).spring-.*/, '$1')
+
+ assert zipEntryName != key
+
+ File xsdFile = module.sourceSets.main.resources.find {
+ it.path.endsWith(schemas.get(key))
+ }
+
+ assert xsdFile != null
+
+ schemaZip.into(zipEntryName) {
+ duplicatesStrategy DuplicatesStrategy.EXCLUDE
+ from xsdFile.path
+ }
+ }
+ }
+ }
+ }
+ }
+ """
+ )
+ );
+ }
+
+ @Test
+ @Issue("https://github.com/spring-projects/spring-webflow/blob/v3.4.1/gradle/docs.gradle")
+ void springWebflowGradleDocs() {
+ rewriteRun(
+ groovy(
+ """
+ apply plugin: "maven-publish"
+
+ configurations {
+ asciidoctorExtensions
+ }
+
+ dependencies {
+ asciidoctorExtensions "io.spring.asciidoctor.backends:spring-asciidoctor-backends:0.0.7"
+ }
+
+ asciidoctorPdf {
+ baseDirFollowsSourceFile()
+ asciidoctorj {
+ sources {
+ include 'index.adoc'
+ }
+ options doctype: 'book'
+ attributes 'icons': 'font',
+ 'sectanchors': '',
+ 'sectnums': '',
+ 'toc': '',
+ 'source-highlighter' : 'coderay',
+ revnumber: project.version,
+ 'project-version': project.version
+ }
+ }
+
+ asciidoctor {
+ baseDirFollowsSourceFile()
+ configurations "asciidoctorExtensions"
+ outputOptions {
+ backends "spring-html"
+ }
+ sources {
+ include 'index.adoc'
+ }
+ options doctype: 'book'
+
+ attributes 'docinfo': 'shared',
+ stylesdir: 'css/',
+ stylesheet: 'spring.css',
+ 'linkcss': true,
+ 'icons': 'font',
+ 'sectanchors': '',
+ 'source-highlighter': 'highlight.js',
+ 'highlightjsdir': 'js/highlight',
+ 'highlightjs-theme': 'github',
+ 'idprefix': '',
+ 'idseparator': '-',
+ 'spring-version': project.version,
+ 'allow-uri-read': '',
+ 'toc': 'left',
+ 'toclevels': '4',
+ revnumber: project.version,
+ 'project-version': project.version
+ }
+
+ task api(type: Javadoc) {
+ group = "Documentation"
+ description = "Generates aggregated Javadoc API documentation."
+ title = "${rootProject.description} ${version} API"
+ options.memberLevel = JavadocMemberLevel.PROTECTED
+ options.author = true
+ options.header = rootProject.description
+ options.overview = "src/api/overview.html"
+ source subprojects.collect { project ->
+ project.sourceSets.main.allJava
+ }
+ destinationDir = new File(buildDir, "api")
+ classpath = files(subprojects.collect { project ->
+ project.sourceSets.main.compileClasspath
+ })
+ maxMemory = "1024m"
+ }
+
+ task docsZip(type: Zip) {
+ group = "Distribution"
+ archiveBaseName = "spring-webflow"
+ archiveClassifier = "docs"
+ description = "Builds -${archiveClassifier.get()} archive containing api and reference " +
+ "for deployment at static.springframework.org/spring-webflow/docs."
+
+ from (api) {
+ into "api"
+ }
+ from (asciidoctor) {
+ into "reference"
+ }
+ from (asciidoctorPdf) {
+ into "reference"
+ }
+ }
+
+ task schemaZip(type: Zip) {
+ group = "Distribution"
+ archiveBaseName = "spring-webflow"
+ archiveClassifier = "schema"
+ description = "Builds -${archiveClassifier.get()} archive containing all " +
+ "XSDs for deployment at static.springframework.org/schema."
+
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+ subprojects.each { subproject ->
+ Properties schemas = new Properties()
+
+ subproject.sourceSets.main.resources.find {
+ it.path.endsWith("META-INF/spring.schemas")
+ }?.withInputStream { schemas.load(it) }
+
+ for (def key : schemas.keySet()) {
+ def shortName = key.replaceAll(/http.*schema.(.*).spring-.*/, '$1')
+ assert shortName != key
+ File xsdFile = subproject.sourceSets.main.allSource.find {
+ it.path.endsWith(schemas.get(key))
+ } as File
+ assert xsdFile != null
+ into (shortName) {
+ from xsdFile.path
+ }
+ }
+ }
+
+ project(":spring-webflow").sourceSets.main.resources.matching {
+ include '**/engine/model/builder/xml/*.xsd'
+ }.each { File file ->
+ into ('webflow') {
+ from file.path
+ }
+ }
+ }
+
+ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
+ group = "Distribution"
+ archiveBaseName = "spring-webflow"
+ archiveClassifier = "dist"
+ description = "Builds -${archiveClassifier.get()} archive, containing all jars and docs, " +
+ "suitable for community download page."
+
+ def baseDir = "${archiveBaseName.get()}-${project.version}"
+
+ from("src/dist") {
+ include "notice.txt"
+ into "${baseDir}"
+ expand(copyright: new Date().format("yyyy"), version: project.version)
+ }
+ from("src/dist") {
+ include "readme.txt"
+ include "license.txt"
+ into "${baseDir}"
+ expand(version: project.version)
+ }
+ from(zipTree(docsZip.archiveFile)) {
+ into "${baseDir}/docs"
+ }
+ from(zipTree(schemaZip.archiveFile)) {
+ into "${baseDir}/schema"
+ }
+
+ subprojects.each { subproject ->
+ into ("${baseDir}/libs") {
+ from subproject.jar
+ if (subproject.tasks.findByPath("sourcesJar")) {
+ from subproject.sourcesJar
+ }
+ if (subproject.tasks.findByPath("javadocJar")) {
+ from subproject.javadocJar
+ }
+ }
+ }
+ }
+
+ publishing {
+ publications {
+ mavenJava(MavenPublication) {
+ artifact docsZip
+ artifact schemaZip
+ artifact distZip
+ }
+ }
+ }
+ """
+ )
+ );
+ }
+}
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/TernaryTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/TernaryTest.java
index 09ef3f92b64..bb6bfb5fb4a 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/TernaryTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/TernaryTest.java
@@ -31,7 +31,9 @@ void insideParentheses() {
// NOT inside parentheses, but verifies the parser's
// test for "inside parentheses" condition
- groovy("(true) ? 1 : 2")
+ groovy("(true) ? 1 : 2"),
+ // And combine the two cases
+ groovy("((true) ? 1 : 2)")
);
}
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/TryTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/TryTest.java
index d580583b017..5dd1e34fd58 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/TryTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/TryTest.java
@@ -15,8 +15,8 @@
*/
package org.openrewrite.groovy.tree;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.ExpectedToFail;
import org.openrewrite.Issue;
import org.openrewrite.test.RewriteTest;
@@ -90,7 +90,7 @@ void tryCatchFinally() {
}
@Issue("https://github.com/openrewrite/rewrite/issues/1944")
- @Disabled
+ @ExpectedToFail
@Test
void multiCatch() {
rewriteRun(
@@ -106,7 +106,7 @@ void multiCatch() {
}
@Issue("https://github.com/openrewrite/rewrite/issues/1945")
- @Disabled
+ @ExpectedToFail
@Test
void tryWithResource() {
rewriteRun(
@@ -123,7 +123,7 @@ void tryWithResource() {
}
@Issue("https://github.com/openrewrite/rewrite/issues/1945")
- @Disabled
+ @ExpectedToFail
@Test
void tryWithResources() {
rewriteRun(
diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/VariableDeclarationsTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/VariableDeclarationsTest.java
index 3915c6c39f8..df3cf0ff4d6 100644
--- a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/VariableDeclarationsTest.java
+++ b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/VariableDeclarationsTest.java
@@ -15,7 +15,6 @@
*/
package org.openrewrite.groovy.tree;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openrewrite.ExecutionContext;
import org.openrewrite.Issue;
@@ -32,7 +31,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.openrewrite.groovy.Assertions.groovy;
-@SuppressWarnings({"GroovyUnusedAssignment", "DataFlowIssue"})
+@SuppressWarnings({"GroovyUnusedAssignment", "DataFlowIssue", "GrUnnecessaryDefModifier"})
class VariableDeclarationsTest implements RewriteTest {
@Test
@@ -129,7 +128,6 @@ void numericValueWithUnderscores() {
);
}
- @Disabled
@Test
void singleTypeMultipleVariableDeclaration() {
rewriteRun(
@@ -137,7 +135,6 @@ void singleTypeMultipleVariableDeclaration() {
);
}
- @Disabled
@Test
void multipleTypeMultipleVariableDeclaration() {
rewriteRun(
@@ -190,7 +187,6 @@ public J visitVariableDeclarations(J.VariableDeclarations multiVariable, Executi
}
@Issue("https://github.com/openrewrite/rewrite/issues/4702")
- @Disabled
@Test
void nestedTypeParameters() {
rewriteRun(
@@ -203,4 +199,29 @@ class A {
)
);
}
+
+ @Issue("https://github.com/openrewrite/rewrite/issues/4705")
+ @Test
+ void defAndExplicitReturnType() {
+ rewriteRun(
+ groovy(
+ """
+ def /*int*/ int one = 1
+ def /*Object*/ Object two = 2
+ """
+ )
+ );
+ }
+
+ @Issue("https://github.com/openrewrite/rewrite/issues/4877")
+ @Test
+ void defVariableStartsWithDef() {
+ rewriteRun(
+ groovy(
+ """
+ def defaultPublicStaticFinal = 0
+ """
+ )
+ );
+ }
}
diff --git a/rewrite-hcl/src/main/antlr/HCLLexer.g4 b/rewrite-hcl/src/main/antlr/HCLLexer.g4
index 474d5a9babf..8ae20167657 100644
--- a/rewrite-hcl/src/main/antlr/HCLLexer.g4
+++ b/rewrite-hcl/src/main/antlr/HCLLexer.g4
@@ -14,8 +14,8 @@ lexer grammar HCLLexer;
private Stack heredocIdentifier = new Stack();
}
-FOR_BRACE : '{' (WS|NEWLINE)* 'for' WS;
-FOR_BRACK : '[' (WS|NEWLINE)* 'for' WS;
+FOR_BRACE : '{' (WS|NEWLINE|COMMENT|LINE_COMMENT)* 'for' WS;
+FOR_BRACK : '[' (WS|NEWLINE|COMMENT|LINE_COMMENT)* 'for' WS;
IF : 'if';
IN : 'in';
@@ -49,10 +49,10 @@ Identifier
// Lexical Elements - Comments and Whitespace
// https://github.com/hashicorp/hcl2/blob/master/hcl/hclsyntax/spec.md#comments-and-whitespace
-WS : [ \t\r\u000C]+ -> channel(HIDDEN);
-COMMENT : '/*' .*? '*/' -> channel(HIDDEN);
-LINE_COMMENT : ('//' | '#') ~[\r\n]* '\r'?'\n' -> channel(HIDDEN);
-NEWLINE : '\n' -> channel(HIDDEN);
+WS : [ \t\r\u000C]+ -> channel(HIDDEN);
+COMMENT : '/*' .*? '*/' -> channel(HIDDEN);
+LINE_COMMENT : ('//' | '#') ~[\r\n]* '\r'? ('\n' | EOF) -> channel(HIDDEN);
+NEWLINE : '\n' -> channel(HIDDEN);
fragment LetterOrDigit
: Letter
@@ -81,7 +81,7 @@ fragment HexDigit
// https://github.com/hashicorp/hcl2/blob/master/hcl/hclsyntax/spec.md#numeric-literals
NumericLiteral
- : [0-9]+ '.' [0-9]* ExponentPart?
+ : [0-9]+ '.' [0-9]+ ExponentPart?
| [0-9]+ ExponentPart
| [0-9]+
;
@@ -129,6 +129,7 @@ MOD : '%';
ELLIPSIS : '...';
TILDE : '~';
+
// ----------------------------------------------------------------------------------------------
mode TEMPLATE;
// ----------------------------------------------------------------------------------------------
diff --git a/rewrite-hcl/src/main/antlr/HCLParser.g4 b/rewrite-hcl/src/main/antlr/HCLParser.g4
index 9e8bebafb83..5d48086569c 100644
--- a/rewrite-hcl/src/main/antlr/HCLParser.g4
+++ b/rewrite-hcl/src/main/antlr/HCLParser.g4
@@ -52,6 +52,7 @@ exprTerm
| functionCall #FunctionCallExpression
| exprTerm index #IndexAccessExpression
| exprTerm getAttr #AttributeAccessExpression
+ | exprTerm legacyIndexAttr #LegacyIndexAttributeExpression
| exprTerm splat #SplatExpression
| LPAREN expression RPAREN #ParentheticalExpression
;
@@ -86,7 +87,7 @@ object
;
objectelem
- : (Identifier | LPAREN Identifier RPAREN | QUOTE quotedTemplatePart* QUOTE) (ASSIGN | COLON) expression COMMA?
+ : (Identifier | LPAREN Identifier RPAREN | QUOTE quotedTemplatePart* QUOTE | expression) (ASSIGN | COLON) expression COMMA?
;
// For Expressions
@@ -144,6 +145,14 @@ getAttr
: DOT Identifier
;
+// Legacy Index Access Operator
+// https://github.com/hashicorp/hcl/blob/923b06b5d6adf61a647101c605f7463a1bd56cbf/hclsyntax/spec.md#L547
+// Interestingly not mentioned in hcl2 syntax specification anymore
+
+legacyIndexAttr
+ : DOT NumericLiteral
+ ;
+
// Splat Operators
// https://github.com/hashicorp/hcl2/blob/master/hcl/hclsyntax/spec.md#splat-operators
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclIsoVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclIsoVisitor.java
index 6f5b3d2ceb9..b442182a944 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclIsoVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclIsoVisitor.java
@@ -102,6 +102,11 @@ public Hcl.Index.Position visitIndexPosition(Hcl.Index.Position indexPosition, P
return (Hcl.Index.Position) super.visitIndexPosition(indexPosition, p);
}
+ @Override
+ public Hcl.LegacyIndexAttributeAccess visitLegacyIndexAttribute(Hcl.LegacyIndexAttributeAccess legacyIndexAttributeAccess, P p) {
+ return (Hcl.LegacyIndexAttributeAccess) super.visitLegacyIndexAttribute(legacyIndexAttributeAccess, p);
+ }
+
@Override
public Hcl.Literal visitLiteral(Hcl.Literal literal, P p) {
return (Hcl.Literal) super.visitLiteral(literal, p);
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclTemplate.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclTemplate.java
index 5fb3297f4c3..e7b2dd0933e 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclTemplate.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclTemplate.java
@@ -69,7 +69,7 @@ public H apply(Cursor scope, HclCoordinates coordinates, Object.
@Override
public Hcl visitConfigFile(Hcl.ConfigFile configFile, Integer p) {
Hcl.ConfigFile c = (Hcl.ConfigFile) super.visitConfigFile(configFile, p);
- if (loc.equals(Space.Location.CONFIG_FILE_EOF)) {
+ if (loc == Space.Location.CONFIG_FILE_EOF) {
List gen = substitutions.unsubstitute(templateParser.parseBodyContent(substitutedTemplate));
if (coordinates.getComparator() != null) {
@@ -100,7 +100,7 @@ public Hcl visitConfigFile(Hcl.ConfigFile configFile, Integer p) {
)
);
}
- } else if (loc.equals(Space.Location.CONFIG_FILE)) {
+ } else if (loc == Space.Location.CONFIG_FILE) {
List gen = substitutions.unsubstitute(templateParser.parseBodyContent(substitutedTemplate));
c = c.withBody(
ListUtils.concatAll(
@@ -116,7 +116,7 @@ public Hcl visitConfigFile(Hcl.ConfigFile configFile, Integer p) {
@Override
public Hcl visitBlock(Hcl.Block block, Integer p) {
Hcl.Block b = (Hcl.Block) super.visitBlock(block, p);
- if (loc.equals(Space.Location.BLOCK_CLOSE)) {
+ if (loc == Space.Location.BLOCK_CLOSE) {
if (b.isScope(insertionPoint)) {
List gen = substitutions.unsubstitute(templateParser.parseBodyContent(substitutedTemplate));
@@ -145,7 +145,7 @@ public Hcl visitBlock(Hcl.Block block, Integer p) {
.orElse(SpacesStyle.DEFAULT)).visit(b, p, getCursor().getParentOrThrow());
assert b != null;
}
- } else if (loc.equals(Space.Location.BLOCK)) {
+ } else if (loc == Space.Location.BLOCK) {
if (b.isScope(insertionPoint)) {
b = (Hcl.Block) autoFormat(templateParser.parseBodyContent(substitutedTemplate).get(0), p,
getCursor().getParentOrThrow());
@@ -158,7 +158,7 @@ public Hcl visitBlock(Hcl.Block block, Integer p) {
public Hcl visitExpression(Expression expression, Integer p) {
Hcl e = super.visitExpression(expression, p);
- if (loc.equals(Space.Location.EXPRESSION_PREFIX)) {
+ if (loc == Space.Location.EXPRESSION_PREFIX) {
if (e.isScope(insertionPoint)) {
e = templateParser.parseExpression(substitutedTemplate).withPrefix(expression.getPrefix());
}
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclVisitor.java
index 6c7d095e00a..119e13d06ee 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/HclVisitor.java
@@ -77,6 +77,23 @@ public Hcl visitAttributeAccess(Hcl.AttributeAccess attributeAccess, P p) {
return a;
}
+ public Hcl visitLegacyIndexAttribute(Hcl.LegacyIndexAttributeAccess legacyIndexAttributeAccess, P p) {
+ Hcl.LegacyIndexAttributeAccess li = legacyIndexAttributeAccess;
+ li = li.withPrefix(visitSpace(li.getPrefix(), Space.Location.LEGACY_INDEX_ATTRIBUTE_ACCESS, p));
+ li = li.withMarkers(visitMarkers(li.getMarkers(), p));
+ Expression temp = (Expression) visitExpression(li, p);
+ if (!(temp instanceof Hcl.LegacyIndexAttributeAccess)) {
+ return temp;
+ } else {
+ li = (Hcl.LegacyIndexAttributeAccess) temp;
+ }
+ li = li.getPadding().withBase(
+ visitRightPadded(li.getPadding().getBase(), HclRightPadded.Location.LEGACY_INDEX_ATTRIBUTE_ACCESS_BASE, p));
+ li = li.withIndex((Hcl.Literal) visitLiteral(li.getIndex(), p));
+ return li;
+ }
+
+
public Hcl visitBinary(Hcl.Binary binary, P p) {
Hcl.Binary b = binary;
b = b.withPrefix(visitSpace(b.getPrefix(), Space.Location.BINARY, p));
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/AttributeSpaceVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/AttributeSpaceVisitor.java
index dc497dd9af1..a384b1d7d4b 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/AttributeSpaceVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/AttributeSpaceVisitor.java
@@ -52,7 +52,7 @@ public Hcl.Attribute visitAttribute(Hcl.Attribute attribute, P p) {
if (parent instanceof Hcl.Block || parent instanceof Hcl.ObjectValue) {
List siblingAttributes = getSiblingAttributes(parent);
- if (attribute.getType().equals(Hcl.Attribute.Type.Assignment)) {
+ if (attribute.getType() == Hcl.Attribute.Type.Assignment) {
HclLeftPadded type = a.getPadding().getType();
if (Boolean.TRUE.equals(style.getBodyContent().getColumnarAlignment())) {
@@ -106,7 +106,7 @@ private List attributesInGroup(List siblings, Hcl.
boolean groupFound = false;
Hcl.Attribute perviousSibling = null;
for (Hcl.Attribute sibling : siblings) {
- if (sibling.getType().equals(Hcl.Attribute.Type.Assignment)) {
+ if (sibling.getType() == Hcl.Attribute.Type.Assignment) {
boolean siblingPrefixHasNewLines = sibling.getPrefix().getWhitespace().split("\r\n|\r|\n").length > 2;
boolean siblingIsMultiline = sibling.getValue().print(getCursor()).split("\r\n|\r|\n").length > 2;
boolean previousSiblingIsMultiline = perviousSibling != null && perviousSibling.getValue().print(getCursor()).split("\r\n|\r|\n").length > 2;
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/BracketsVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/BracketsVisitor.java
index 6bbd596c11e..cb885fa0818 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/BracketsVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/BracketsVisitor.java
@@ -42,11 +42,11 @@ public BracketsVisitor(BracketsStyle style, @Nullable Tree stopAfter) {
@Override
public Space visitSpace(Space space, Space.Location loc, P p) {
- if (loc.equals(Space.Location.BLOCK_CLOSE) && !space.getLastWhitespace().contains("\n")) {
+ if (loc == Space.Location.BLOCK_CLOSE && !space.getLastWhitespace().contains("\n")) {
return space.withLastWhitespace("\n");
}
- if (loc.equals(Space.Location.BLOCK_OPEN) && !space.getWhitespace().equals(" ")) {
+ if (loc == Space.Location.BLOCK_OPEN && !space.getWhitespace().equals(" ")) {
return space.withWhitespace(" ");
}
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/TabsAndIndentsVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/TabsAndIndentsVisitor.java
index 8c2be10c242..1b561786f24 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/TabsAndIndentsVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/format/TabsAndIndentsVisitor.java
@@ -103,7 +103,7 @@ public Space visitSpace(Space space, Space.Location loc, P p) {
IndentType indentType = getCursor().getParentOrThrow().getNearestMessage("indentType", IndentType.ALIGN);
// block spaces are always aligned to their parent
- boolean alignBlockToParent = loc.equals(Space.Location.BLOCK_CLOSE) || loc.equals(Space.Location.OBJECT_VALUE_ATTRIBUTE_SUFFIX);
+ boolean alignBlockToParent = loc == Space.Location.BLOCK_CLOSE || loc == Space.Location.OBJECT_VALUE_ATTRIBUTE_SUFFIX;
if (alignBlockToParent) {
indentType = IndentType.ALIGN;
@@ -266,7 +266,7 @@ private Space indentTo(Space space, int column, Space.Location spaceLocation) {
space = space.withComments(ListUtils.map(space.getComments(), c -> {
// The suffix of the last element in the comment list sets the whitespace for the end of the block.
// The column for comments that come before the last element are incremented.
- int incrementBy = spaceLocation.equals(Space.Location.BLOCK_CLOSE) && !c.equals(lastElement) ? style.getIndentSize() : 0;
+ int incrementBy = spaceLocation == Space.Location.BLOCK_CLOSE && !c.equals(lastElement) ? style.getIndentSize() : 0;
return c.getStyle() == Comment.Style.INLINE ?
indentMultilineComment(c, column + incrementBy) :
indentSingleLineComment(c, column + incrementBy);
@@ -274,8 +274,8 @@ private Space indentTo(Space space, int column, Space.Location spaceLocation) {
// Prevent formatting trailing comments, the whitespace in a trailing comment won't have a new line character.
// Compilation unit prefixes are an exception, since they do not exist in a block.
- if (space.getWhitespace().contains("\n") || spaceLocation.equals(Space.Location.CONFIG_FILE)) {
- int incrementBy = spaceLocation.equals(Space.Location.BLOCK_CLOSE) ? style.getIndentSize() : 0;
+ if (space.getWhitespace().contains("\n") || spaceLocation == Space.Location.CONFIG_FILE) {
+ int incrementBy = spaceLocation == Space.Location.BLOCK_CLOSE ? style.getIndentSize() : 0;
int indent = getLengthOfWhitespace(space.getWhitespace());
if (indent != (column + incrementBy)) {
int shift = column + incrementBy - indent;
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/HclParserVisitor.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/HclParserVisitor.java
index 9974ff15de1..8e538c32cd9 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/HclParserVisitor.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/HclParserVisitor.java
@@ -409,6 +409,25 @@ public Hcl visitIndexAccessExpression(HCLParser.IndexAccessExpressionContext ctx
));
}
+ @Override
+ public Hcl visitLegacyIndexAttributeExpression(HCLParser.LegacyIndexAttributeExpressionContext ctx) {
+ return convert(ctx, (c, prefix) -> {
+ String valueSource = c.legacyIndexAttr().NumericLiteral().getText();
+ Integer value = Integer.parseInt(valueSource);
+ return new Hcl.LegacyIndexAttributeAccess(
+ randomId(),
+ Space.format(prefix),
+ Markers.EMPTY,
+ new HclRightPadded<>(
+ (Expression) visit(c.exprTerm()),
+ sourceBefore("."),
+ Markers.EMPTY
+ ),
+ new Hcl.Literal(randomId(), Space.format(prefix(c.legacyIndexAttr().NumericLiteral())), Markers.EMPTY, value, valueSource)
+ );
+ });
+ }
+
@Override
public Hcl visitLiteralValue(HCLParser.LiteralValueContext ctx) {
return convert(ctx, (c, prefix) -> {
@@ -444,10 +463,15 @@ public Hcl visitObject(HCLParser.ObjectContext ctx) {
Space tuplePrefix = sourceBefore("{");
List> mappedValues = new ArrayList<>();
List values = ctx.objectelem();
- for (int i = 0; i < values.size(); i++) {
- HCLParser.ObjectelemContext value = values.get(i);
- mappedValues.add(HclRightPadded.build((Expression) visit(value))
- .withAfter(i == values.size() - 1 ? sourceBefore("}") : Space.EMPTY));
+ if (values.isEmpty()) {
+ mappedValues.add(
+ HclRightPadded.build(new Hcl.Empty(randomId(), sourceBefore("}"), Markers.EMPTY)));
+ } else {
+ for (int i = 0; i < values.size(); i++) {
+ HCLParser.ObjectelemContext value = values.get(i);
+ mappedValues.add(HclRightPadded.build((Expression) visit(value))
+ .withAfter(i == values.size() - 1 ? sourceBefore("}") : Space.EMPTY));
+ }
}
return new Hcl.ObjectValue(randomId(), Space.format(prefix), Markers.EMPTY,
@@ -469,7 +493,13 @@ public Hcl visitObjectelem(HCLParser.ObjectelemContext ctx) {
if (ctx.LPAREN() != null) {
parenthesesPrefix = sourceBefore("(");
}
- name = visitIdentifier(ctx.Identifier());
+ if (ctx.Identifier() != null) {
+ name = visitIdentifier(ctx.Identifier());
+ } else if (ctx.expression(0) != null) {
+ name = (Expression) visit(ctx.expression(0));
+ } else {
+ throw new IllegalStateException("Unsupported LHS in object element");
+ }
if (ctx.RPAREN() != null) {
name = new Hcl.Parentheses(randomId(), parenthesesPrefix, Markers.EMPTY,
HclRightPadded.build(name).withAfter(sourceBefore(")")));
@@ -486,7 +516,7 @@ public Hcl visitObjectelem(HCLParser.ObjectelemContext ctx) {
c.ASSIGN() != null ? Hcl.Attribute.Type.Assignment : Hcl.Attribute.Type.ObjectElement,
Markers.EMPTY
),
- (Expression) visit(c.expression()),
+ (Expression) visit(c.expression().get(c.expression().size() - 1)),
ctx.COMMA() == null ?
null :
new Hcl.Empty(randomId(), sourceBefore(","), Markers.EMPTY)
@@ -731,25 +761,26 @@ private int positionOfNext(String untilDelim, @Nullable Character stop) {
int delimIndex = cursor;
for (; delimIndex < source.length() - untilDelim.length() + 1; delimIndex++) {
- if (inSingleLineComment && source.charAt(delimIndex) == '\n') {
- inSingleLineComment = false;
+ if (inSingleLineComment) {
+ if (source.charAt(delimIndex) == '\n') {
+ inSingleLineComment = false;
+ }
} else {
if (source.length() - untilDelim.length() > delimIndex + 1) {
if ('#' == source.charAt(delimIndex)) {
inSingleLineComment = true;
- delimIndex++;
} else switch (source.substring(delimIndex, delimIndex + 2)) {
case "//":
inSingleLineComment = true;
- delimIndex += 2;
+ delimIndex += 1;
break;
case "/*":
inMultiLineComment = true;
- delimIndex += 2;
+ delimIndex += 1;
break;
case "*/":
inMultiLineComment = false;
- delimIndex += 2;
+ delimIndex += 1;
break;
}
}
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/HclPrinter.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/HclPrinter.java
index 76bb09325a4..cd9bc28e7f1 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/HclPrinter.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/HclPrinter.java
@@ -23,6 +23,7 @@
import org.openrewrite.marker.Marker;
import org.openrewrite.marker.Markers;
+import java.util.Collections;
import java.util.List;
import java.util.function.UnaryOperator;
@@ -90,7 +91,7 @@ public Hcl visitAttribute(Hcl.Attribute attribute, PrintOutputCapture p) {
beforeSyntax(attribute, Space.Location.ATTRIBUTE, p);
visit(attribute.getName(), p);
visitSpace(attribute.getPadding().getType().getBefore(), Space.Location.ATTRIBUTE_ASSIGNMENT, p);
- p.append(attribute.getType().equals(Hcl.Attribute.Type.Assignment) ? "=" : ":");
+ p.append(attribute.getType() == Hcl.Attribute.Type.Assignment ? "=" : ":");
visit(attribute.getValue(), p);
if (attribute.getComma() != null) {
visitSpace(attribute.getComma().getPrefix(), Space.Location.OBJECT_VALUE_ATTRIBUTE_COMMA, p);
@@ -288,6 +289,18 @@ public Hcl visitIndexPosition(Hcl.Index.Position indexPosition, PrintOutputCaptu
return indexPosition;
}
+ @Override
+ public Hcl visitLegacyIndexAttribute(Hcl.LegacyIndexAttributeAccess laccess, PrintOutputCapture
p) {
+ beforeSyntax(laccess, Space.Location.LEGACY_INDEX_ATTRIBUTE_ACCESS, p);
+ visitRightPadded(
+ Collections.singletonList(laccess.getPadding().getBase()),
+ HclRightPadded.Location.LEGACY_INDEX_ATTRIBUTE_ACCESS_BASE, "", p);
+ p.append(".");
+ visitLiteral(laccess.getIndex(), p);
+ afterSyntax(laccess, p);
+ return laccess;
+ }
+
@Override
public Hcl visitLiteral(Hcl.Literal literal, PrintOutputCapture
p) {
beforeSyntax(literal, Space.Location.LITERAL, p);
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLLexer.interp b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLLexer.interp
index b210722ef06..6cbc5b58e15 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLLexer.interp
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLLexer.interp
@@ -169,4 +169,4 @@ HEREDOC_PREAMBLE
HEREDOC
atn:
-[4, 0, 47, 446, 6, -1, 6, -1, 6, -1, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 1, 0, 1, 0, 1, 0, 5, 0, 124, 8, 0, 10, 0, 12, 0, 127, 9, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 5, 1, 138, 8, 1, 10, 1, 12, 1, 141, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 7, 1, 7, 3, 7, 165, 8, 7, 1, 8, 1, 8, 1, 8, 5, 8, 170, 8, 8, 10, 8, 12, 8, 173, 9, 8, 1, 9, 4, 9, 176, 8, 9, 11, 9, 12, 9, 177, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 5, 10, 186, 8, 10, 10, 10, 12, 10, 189, 9, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 3, 11, 199, 8, 11, 1, 11, 5, 11, 202, 8, 11, 10, 11, 12, 11, 205, 9, 11, 1, 11, 3, 11, 208, 8, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 3, 13, 220, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 226, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 246, 8, 15, 1, 16, 1, 16, 1, 17, 4, 17, 251, 8, 17, 11, 17, 12, 17, 252, 1, 17, 1, 17, 5, 17, 257, 8, 17, 10, 17, 12, 17, 260, 9, 17, 1, 17, 3, 17, 263, 8, 17, 1, 17, 4, 17, 266, 8, 17, 11, 17, 12, 17, 267, 1, 17, 1, 17, 4, 17, 272, 8, 17, 11, 17, 12, 17, 273, 3, 17, 276, 8, 17, 1, 18, 1, 18, 3, 18, 280, 8, 18, 1, 18, 4, 18, 283, 8, 18, 11, 18, 12, 18, 284, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 3, 19, 296, 8, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 3, 22, 311, 8, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 35, 1, 35, 1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 43, 1, 44, 1, 44, 1, 45, 1, 45, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 49, 4, 49, 382, 8, 49, 11, 49, 12, 49, 383, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 3, 50, 396, 8, 50, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 5, 53, 411, 8, 53, 10, 53, 12, 53, 414, 9, 53, 1, 53, 1, 53, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 56, 4, 56, 433, 8, 56, 11, 56, 12, 56, 434, 1, 56, 1, 56, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 3, 57, 445, 8, 57, 1, 187, 0, 58, 4, 1, 6, 2, 8, 3, 10, 4, 12, 5, 14, 6, 16, 7, 18, 0, 20, 8, 22, 9, 24, 10, 26, 11, 28, 12, 30, 0, 32, 0, 34, 0, 36, 0, 38, 13, 40, 0, 42, 14, 44, 15, 46, 16, 48, 17, 50, 18, 52, 19, 54, 20, 56, 21, 58, 22, 60, 23, 62, 24, 64, 25, 66, 26, 68, 27, 70, 28, 72, 29, 74, 30, 76, 31, 78, 32, 80, 33, 82, 34, 84, 35, 86, 36, 88, 37, 90, 38, 92, 39, 94, 40, 96, 41, 98, 42, 100, 43, 102, 44, 104, 45, 106, 0, 108, 0, 110, 0, 112, 0, 114, 0, 116, 46, 118, 47, 4, 0, 1, 2, 3, 14, 4, 0, 10, 10, 13, 13, 34, 34, 36, 37, 3, 0, 9, 9, 12, 13, 32, 32, 2, 0, 10, 10, 13, 13, 1, 0, 48, 57, 4, 0, 36, 36, 65, 90, 95, 95, 97, 122, 2, 0, 0, 127, 55296, 56319, 1, 0, 55296, 56319, 1, 0, 56320, 57343, 5, 0, 34, 34, 92, 92, 110, 110, 114, 114, 116, 116, 3, 0, 48, 57, 65, 70, 97, 102, 2, 0, 69, 69, 101, 101, 2, 0, 43, 43, 45, 45, 3, 0, 10, 10, 13, 13, 36, 37, 1, 0, 123, 123, 476, 0, 4, 1, 0, 0, 0, 0, 6, 1, 0, 0, 0, 0, 8, 1, 0, 0, 0, 0, 10, 1, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 14, 1, 0, 0, 0, 0, 16, 1, 0, 0, 0, 0, 20, 1, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 24, 1, 0, 0, 0, 0, 26, 1, 0, 0, 0, 0, 28, 1, 0, 0, 0, 0, 38, 1, 0, 0, 0, 0, 42, 1, 0, 0, 0, 0, 44, 1, 0, 0, 0, 0, 46, 1, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 50, 1, 0, 0, 0, 0, 52, 1, 0, 0, 0, 0, 54, 1, 0, 0, 0, 0, 56, 1, 0, 0, 0, 0, 58, 1, 0, 0, 0, 0, 60, 1, 0, 0, 0, 0, 62, 1, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 66, 1, 0, 0, 0, 0, 68, 1, 0, 0, 0, 0, 70, 1, 0, 0, 0, 0, 72, 1, 0, 0, 0, 0, 74, 1, 0, 0, 0, 0, 76, 1, 0, 0, 0, 0, 78, 1, 0, 0, 0, 0, 80, 1, 0, 0, 0, 0, 82, 1, 0, 0, 0, 0, 84, 1, 0, 0, 0, 0, 86, 1, 0, 0, 0, 0, 88, 1, 0, 0, 0, 0, 90, 1, 0, 0, 0, 0, 92, 1, 0, 0, 0, 0, 94, 1, 0, 0, 0, 0, 96, 1, 0, 0, 0, 0, 98, 1, 0, 0, 0, 1, 100, 1, 0, 0, 0, 1, 102, 1, 0, 0, 0, 1, 104, 1, 0, 0, 0, 1, 106, 1, 0, 0, 0, 2, 108, 1, 0, 0, 0, 2, 110, 1, 0, 0, 0, 3, 112, 1, 0, 0, 0, 3, 114, 1, 0, 0, 0, 3, 116, 1, 0, 0, 0, 3, 118, 1, 0, 0, 0, 4, 120, 1, 0, 0, 0, 6, 134, 1, 0, 0, 0, 8, 148, 1, 0, 0, 0, 10, 151, 1, 0, 0, 0, 12, 154, 1, 0, 0, 0, 14, 157, 1, 0, 0, 0, 16, 160, 1, 0, 0, 0, 18, 164, 1, 0, 0, 0, 20, 166, 1, 0, 0, 0, 22, 175, 1, 0, 0, 0, 24, 181, 1, 0, 0, 0, 26, 198, 1, 0, 0, 0, 28, 213, 1, 0, 0, 0, 30, 219, 1, 0, 0, 0, 32, 225, 1, 0, 0, 0, 34, 245, 1, 0, 0, 0, 36, 247, 1, 0, 0, 0, 38, 275, 1, 0, 0, 0, 40, 277, 1, 0, 0, 0, 42, 295, 1, 0, 0, 0, 44, 297, 1, 0, 0, 0, 46, 301, 1, 0, 0, 0, 48, 306, 1, 0, 0, 0, 50, 314, 1, 0, 0, 0, 52, 316, 1, 0, 0, 0, 54, 319, 1, 0, 0, 0, 56, 322, 1, 0, 0, 0, 58, 324, 1, 0, 0, 0, 60, 326, 1, 0, 0, 0, 62, 328, 1, 0, 0, 0, 64, 330, 1, 0, 0, 0, 66, 332, 1, 0, 0, 0, 68, 335, 1, 0, 0, 0, 70, 338, 1, 0, 0, 0, 72, 340, 1, 0, 0, 0, 74, 342, 1, 0, 0, 0, 76, 344, 1, 0, 0, 0, 78, 346, 1, 0, 0, 0, 80, 348, 1, 0, 0, 0, 82, 350, 1, 0, 0, 0, 84, 353, 1, 0, 0, 0, 86, 355, 1, 0, 0, 0, 88, 357, 1, 0, 0, 0, 90, 360, 1, 0, 0, 0, 92, 363, 1, 0, 0, 0, 94, 365, 1, 0, 0, 0, 96, 367, 1, 0, 0, 0, 98, 371, 1, 0, 0, 0, 100, 373, 1, 0, 0, 0, 102, 381, 1, 0, 0, 0, 104, 395, 1, 0, 0, 0, 106, 397, 1, 0, 0, 0, 108, 402, 1, 0, 0, 0, 110, 407, 1, 0, 0, 0, 112, 419, 1, 0, 0, 0, 114, 423, 1, 0, 0, 0, 116, 432, 1, 0, 0, 0, 118, 444, 1, 0, 0, 0, 120, 125, 5, 123, 0, 0, 121, 124, 3, 22, 9, 0, 122, 124, 3, 28, 12, 0, 123, 121, 1, 0, 0, 0, 123, 122, 1, 0, 0, 0, 124, 127, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 125, 126, 1, 0, 0, 0, 126, 128, 1, 0, 0, 0, 127, 125, 1, 0, 0, 0, 128, 129, 5, 102, 0, 0, 129, 130, 5, 111, 0, 0, 130, 131, 5, 114, 0, 0, 131, 132, 1, 0, 0, 0, 132, 133, 3, 22, 9, 0, 133, 5, 1, 0, 0, 0, 134, 139, 5, 91, 0, 0, 135, 138, 3, 22, 9, 0, 136, 138, 3, 28, 12, 0, 137, 135, 1, 0, 0, 0, 137, 136, 1, 0, 0, 0, 138, 141, 1, 0, 0, 0, 139, 137, 1, 0, 0, 0, 139, 140, 1, 0, 0, 0, 140, 142, 1, 0, 0, 0, 141, 139, 1, 0, 0, 0, 142, 143, 5, 102, 0, 0, 143, 144, 5, 111, 0, 0, 144, 145, 5, 114, 0, 0, 145, 146, 1, 0, 0, 0, 146, 147, 3, 22, 9, 0, 147, 7, 1, 0, 0, 0, 148, 149, 5, 105, 0, 0, 149, 150, 5, 102, 0, 0, 150, 9, 1, 0, 0, 0, 151, 152, 5, 105, 0, 0, 152, 153, 5, 110, 0, 0, 153, 11, 1, 0, 0, 0, 154, 155, 5, 123, 0, 0, 155, 156, 6, 4, 0, 0, 156, 13, 1, 0, 0, 0, 157, 158, 5, 125, 0, 0, 158, 159, 6, 5, 1, 0, 159, 15, 1, 0, 0, 0, 160, 161, 5, 61, 0, 0, 161, 17, 1, 0, 0, 0, 162, 165, 8, 0, 0, 0, 163, 165, 3, 34, 15, 0, 164, 162, 1, 0, 0, 0, 164, 163, 1, 0, 0, 0, 165, 19, 1, 0, 0, 0, 166, 171, 3, 32, 14, 0, 167, 170, 3, 30, 13, 0, 168, 170, 5, 45, 0, 0, 169, 167, 1, 0, 0, 0, 169, 168, 1, 0, 0, 0, 170, 173, 1, 0, 0, 0, 171, 169, 1, 0, 0, 0, 171, 172, 1, 0, 0, 0, 172, 21, 1, 0, 0, 0, 173, 171, 1, 0, 0, 0, 174, 176, 7, 1, 0, 0, 175, 174, 1, 0, 0, 0, 176, 177, 1, 0, 0, 0, 177, 175, 1, 0, 0, 0, 177, 178, 1, 0, 0, 0, 178, 179, 1, 0, 0, 0, 179, 180, 6, 9, 2, 0, 180, 23, 1, 0, 0, 0, 181, 182, 5, 47, 0, 0, 182, 183, 5, 42, 0, 0, 183, 187, 1, 0, 0, 0, 184, 186, 9, 0, 0, 0, 185, 184, 1, 0, 0, 0, 186, 189, 1, 0, 0, 0, 187, 188, 1, 0, 0, 0, 187, 185, 1, 0, 0, 0, 188, 190, 1, 0, 0, 0, 189, 187, 1, 0, 0, 0, 190, 191, 5, 42, 0, 0, 191, 192, 5, 47, 0, 0, 192, 193, 1, 0, 0, 0, 193, 194, 6, 10, 2, 0, 194, 25, 1, 0, 0, 0, 195, 196, 5, 47, 0, 0, 196, 199, 5, 47, 0, 0, 197, 199, 5, 35, 0, 0, 198, 195, 1, 0, 0, 0, 198, 197, 1, 0, 0, 0, 199, 203, 1, 0, 0, 0, 200, 202, 8, 2, 0, 0, 201, 200, 1, 0, 0, 0, 202, 205, 1, 0, 0, 0, 203, 201, 1, 0, 0, 0, 203, 204, 1, 0, 0, 0, 204, 207, 1, 0, 0, 0, 205, 203, 1, 0, 0, 0, 206, 208, 5, 13, 0, 0, 207, 206, 1, 0, 0, 0, 207, 208, 1, 0, 0, 0, 208, 209, 1, 0, 0, 0, 209, 210, 5, 10, 0, 0, 210, 211, 1, 0, 0, 0, 211, 212, 6, 11, 2, 0, 212, 27, 1, 0, 0, 0, 213, 214, 5, 10, 0, 0, 214, 215, 1, 0, 0, 0, 215, 216, 6, 12, 2, 0, 216, 29, 1, 0, 0, 0, 217, 220, 3, 32, 14, 0, 218, 220, 7, 3, 0, 0, 219, 217, 1, 0, 0, 0, 219, 218, 1, 0, 0, 0, 220, 31, 1, 0, 0, 0, 221, 226, 7, 4, 0, 0, 222, 226, 8, 5, 0, 0, 223, 224, 7, 6, 0, 0, 224, 226, 7, 7, 0, 0, 225, 221, 1, 0, 0, 0, 225, 222, 1, 0, 0, 0, 225, 223, 1, 0, 0, 0, 226, 33, 1, 0, 0, 0, 227, 228, 5, 92, 0, 0, 228, 246, 7, 8, 0, 0, 229, 230, 5, 92, 0, 0, 230, 231, 3, 36, 16, 0, 231, 232, 3, 36, 16, 0, 232, 233, 3, 36, 16, 0, 233, 234, 3, 36, 16, 0, 234, 246, 1, 0, 0, 0, 235, 236, 5, 92, 0, 0, 236, 237, 3, 36, 16, 0, 237, 238, 3, 36, 16, 0, 238, 239, 3, 36, 16, 0, 239, 240, 3, 36, 16, 0, 240, 241, 3, 36, 16, 0, 241, 242, 3, 36, 16, 0, 242, 243, 3, 36, 16, 0, 243, 244, 3, 36, 16, 0, 244, 246, 1, 0, 0, 0, 245, 227, 1, 0, 0, 0, 245, 229, 1, 0, 0, 0, 245, 235, 1, 0, 0, 0, 246, 35, 1, 0, 0, 0, 247, 248, 7, 9, 0, 0, 248, 37, 1, 0, 0, 0, 249, 251, 7, 3, 0, 0, 250, 249, 1, 0, 0, 0, 251, 252, 1, 0, 0, 0, 252, 250, 1, 0, 0, 0, 252, 253, 1, 0, 0, 0, 253, 254, 1, 0, 0, 0, 254, 258, 5, 46, 0, 0, 255, 257, 7, 3, 0, 0, 256, 255, 1, 0, 0, 0, 257, 260, 1, 0, 0, 0, 258, 256, 1, 0, 0, 0, 258, 259, 1, 0, 0, 0, 259, 262, 1, 0, 0, 0, 260, 258, 1, 0, 0, 0, 261, 263, 3, 40, 18, 0, 262, 261, 1, 0, 0, 0, 262, 263, 1, 0, 0, 0, 263, 276, 1, 0, 0, 0, 264, 266, 7, 3, 0, 0, 265, 264, 1, 0, 0, 0, 266, 267, 1, 0, 0, 0, 267, 265, 1, 0, 0, 0, 267, 268, 1, 0, 0, 0, 268, 269, 1, 0, 0, 0, 269, 276, 3, 40, 18, 0, 270, 272, 7, 3, 0, 0, 271, 270, 1, 0, 0, 0, 272, 273, 1, 0, 0, 0, 273, 271, 1, 0, 0, 0, 273, 274, 1, 0, 0, 0, 274, 276, 1, 0, 0, 0, 275, 250, 1, 0, 0, 0, 275, 265, 1, 0, 0, 0, 275, 271, 1, 0, 0, 0, 276, 39, 1, 0, 0, 0, 277, 279, 7, 10, 0, 0, 278, 280, 7, 11, 0, 0, 279, 278, 1, 0, 0, 0, 279, 280, 1, 0, 0, 0, 280, 282, 1, 0, 0, 0, 281, 283, 7, 3, 0, 0, 282, 281, 1, 0, 0, 0, 283, 284, 1, 0, 0, 0, 284, 282, 1, 0, 0, 0, 284, 285, 1, 0, 0, 0, 285, 41, 1, 0, 0, 0, 286, 287, 5, 116, 0, 0, 287, 288, 5, 114, 0, 0, 288, 289, 5, 117, 0, 0, 289, 296, 5, 101, 0, 0, 290, 291, 5, 102, 0, 0, 291, 292, 5, 97, 0, 0, 292, 293, 5, 108, 0, 0, 293, 294, 5, 115, 0, 0, 294, 296, 5, 101, 0, 0, 295, 286, 1, 0, 0, 0, 295, 290, 1, 0, 0, 0, 296, 43, 1, 0, 0, 0, 297, 298, 5, 34, 0, 0, 298, 299, 1, 0, 0, 0, 299, 300, 6, 20, 3, 0, 300, 45, 1, 0, 0, 0, 301, 302, 5, 110, 0, 0, 302, 303, 5, 117, 0, 0, 303, 304, 5, 108, 0, 0, 304, 305, 5, 108, 0, 0, 305, 47, 1, 0, 0, 0, 306, 307, 5, 60, 0, 0, 307, 308, 5, 60, 0, 0, 308, 310, 1, 0, 0, 0, 309, 311, 5, 45, 0, 0, 310, 309, 1, 0, 0, 0, 310, 311, 1, 0, 0, 0, 311, 312, 1, 0, 0, 0, 312, 313, 6, 22, 4, 0, 313, 49, 1, 0, 0, 0, 314, 315, 5, 43, 0, 0, 315, 51, 1, 0, 0, 0, 316, 317, 5, 38, 0, 0, 317, 318, 5, 38, 0, 0, 318, 53, 1, 0, 0, 0, 319, 320, 5, 61, 0, 0, 320, 321, 5, 61, 0, 0, 321, 55, 1, 0, 0, 0, 322, 323, 5, 60, 0, 0, 323, 57, 1, 0, 0, 0, 324, 325, 5, 58, 0, 0, 325, 59, 1, 0, 0, 0, 326, 327, 5, 91, 0, 0, 327, 61, 1, 0, 0, 0, 328, 329, 5, 40, 0, 0, 329, 63, 1, 0, 0, 0, 330, 331, 5, 45, 0, 0, 331, 65, 1, 0, 0, 0, 332, 333, 5, 124, 0, 0, 333, 334, 5, 124, 0, 0, 334, 67, 1, 0, 0, 0, 335, 336, 5, 33, 0, 0, 336, 337, 5, 61, 0, 0, 337, 69, 1, 0, 0, 0, 338, 339, 5, 62, 0, 0, 339, 71, 1, 0, 0, 0, 340, 341, 5, 63, 0, 0, 341, 73, 1, 0, 0, 0, 342, 343, 5, 93, 0, 0, 343, 75, 1, 0, 0, 0, 344, 345, 5, 41, 0, 0, 345, 77, 1, 0, 0, 0, 346, 347, 5, 42, 0, 0, 347, 79, 1, 0, 0, 0, 348, 349, 5, 33, 0, 0, 349, 81, 1, 0, 0, 0, 350, 351, 5, 60, 0, 0, 351, 352, 5, 61, 0, 0, 352, 83, 1, 0, 0, 0, 353, 354, 5, 46, 0, 0, 354, 85, 1, 0, 0, 0, 355, 356, 5, 47, 0, 0, 356, 87, 1, 0, 0, 0, 357, 358, 5, 62, 0, 0, 358, 359, 5, 61, 0, 0, 359, 89, 1, 0, 0, 0, 360, 361, 5, 61, 0, 0, 361, 362, 5, 62, 0, 0, 362, 91, 1, 0, 0, 0, 363, 364, 5, 44, 0, 0, 364, 93, 1, 0, 0, 0, 365, 366, 5, 37, 0, 0, 366, 95, 1, 0, 0, 0, 367, 368, 5, 46, 0, 0, 368, 369, 5, 46, 0, 0, 369, 370, 5, 46, 0, 0, 370, 97, 1, 0, 0, 0, 371, 372, 5, 126, 0, 0, 372, 99, 1, 0, 0, 0, 373, 374, 5, 36, 0, 0, 374, 375, 5, 123, 0, 0, 375, 376, 1, 0, 0, 0, 376, 377, 6, 48, 5, 0, 377, 378, 1, 0, 0, 0, 378, 379, 6, 48, 6, 0, 379, 101, 1, 0, 0, 0, 380, 382, 3, 104, 50, 0, 381, 380, 1, 0, 0, 0, 382, 383, 1, 0, 0, 0, 383, 381, 1, 0, 0, 0, 383, 384, 1, 0, 0, 0, 384, 103, 1, 0, 0, 0, 385, 396, 8, 0, 0, 0, 386, 387, 5, 36, 0, 0, 387, 396, 5, 36, 0, 0, 388, 389, 5, 36, 0, 0, 389, 396, 4, 50, 0, 0, 390, 391, 5, 37, 0, 0, 391, 396, 5, 37, 0, 0, 392, 393, 5, 37, 0, 0, 393, 396, 4, 50, 1, 0, 394, 396, 3, 34, 15, 0, 395, 385, 1, 0, 0, 0, 395, 386, 1, 0, 0, 0, 395, 388, 1, 0, 0, 0, 395, 390, 1, 0, 0, 0, 395, 392, 1, 0, 0, 0, 395, 394, 1, 0, 0, 0, 396, 105, 1, 0, 0, 0, 397, 398, 5, 34, 0, 0, 398, 399, 1, 0, 0, 0, 399, 400, 6, 51, 7, 0, 400, 401, 6, 51, 8, 0, 401, 107, 1, 0, 0, 0, 402, 403, 5, 10, 0, 0, 403, 404, 1, 0, 0, 0, 404, 405, 6, 52, 9, 0, 405, 406, 6, 52, 10, 0, 406, 109, 1, 0, 0, 0, 407, 412, 3, 32, 14, 0, 408, 411, 3, 30, 13, 0, 409, 411, 5, 45, 0, 0, 410, 408, 1, 0, 0, 0, 410, 409, 1, 0, 0, 0, 411, 414, 1, 0, 0, 0, 412, 410, 1, 0, 0, 0, 412, 413, 1, 0, 0, 0, 413, 415, 1, 0, 0, 0, 414, 412, 1, 0, 0, 0, 415, 416, 6, 53, 11, 0, 416, 417, 1, 0, 0, 0, 417, 418, 6, 53, 12, 0, 418, 111, 1, 0, 0, 0, 419, 420, 5, 10, 0, 0, 420, 421, 1, 0, 0, 0, 421, 422, 6, 54, 9, 0, 422, 113, 1, 0, 0, 0, 423, 424, 5, 36, 0, 0, 424, 425, 5, 123, 0, 0, 425, 426, 1, 0, 0, 0, 426, 427, 6, 55, 13, 0, 427, 428, 1, 0, 0, 0, 428, 429, 6, 55, 14, 0, 429, 430, 6, 55, 6, 0, 430, 115, 1, 0, 0, 0, 431, 433, 3, 118, 57, 0, 432, 431, 1, 0, 0, 0, 433, 434, 1, 0, 0, 0, 434, 432, 1, 0, 0, 0, 434, 435, 1, 0, 0, 0, 435, 436, 1, 0, 0, 0, 436, 437, 6, 56, 15, 0, 437, 117, 1, 0, 0, 0, 438, 445, 8, 12, 0, 0, 439, 440, 5, 36, 0, 0, 440, 445, 8, 13, 0, 0, 441, 442, 5, 37, 0, 0, 442, 445, 8, 13, 0, 0, 443, 445, 3, 34, 15, 0, 444, 438, 1, 0, 0, 0, 444, 439, 1, 0, 0, 0, 444, 441, 1, 0, 0, 0, 444, 443, 1, 0, 0, 0, 445, 119, 1, 0, 0, 0, 35, 0, 1, 2, 3, 123, 125, 137, 139, 164, 169, 171, 177, 187, 198, 203, 207, 219, 225, 245, 252, 258, 262, 267, 273, 275, 279, 284, 295, 310, 383, 395, 410, 412, 434, 444, 16, 1, 4, 0, 1, 5, 1, 0, 1, 0, 5, 1, 0, 5, 2, 0, 1, 48, 2, 5, 0, 0, 7, 15, 0, 4, 0, 0, 7, 12, 0, 2, 3, 0, 1, 53, 3, 7, 8, 0, 1, 55, 4, 7, 43, 0, 1, 56, 5]
\ No newline at end of file
+[4, 0, 47, 450, 6, -1, 6, -1, 6, -1, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 126, 8, 0, 10, 0, 12, 0, 129, 9, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 142, 8, 1, 10, 1, 12, 1, 145, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 7, 1, 7, 3, 7, 169, 8, 7, 1, 8, 1, 8, 1, 8, 5, 8, 174, 8, 8, 10, 8, 12, 8, 177, 9, 8, 1, 9, 4, 9, 180, 8, 9, 11, 9, 12, 9, 181, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 5, 10, 190, 8, 10, 10, 10, 12, 10, 193, 9, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 3, 11, 203, 8, 11, 1, 11, 5, 11, 206, 8, 11, 10, 11, 12, 11, 209, 9, 11, 1, 11, 3, 11, 212, 8, 11, 1, 11, 3, 11, 215, 8, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 3, 13, 225, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 231, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 251, 8, 15, 1, 16, 1, 16, 1, 17, 4, 17, 256, 8, 17, 11, 17, 12, 17, 257, 1, 17, 1, 17, 4, 17, 262, 8, 17, 11, 17, 12, 17, 263, 1, 17, 3, 17, 267, 8, 17, 1, 17, 4, 17, 270, 8, 17, 11, 17, 12, 17, 271, 1, 17, 1, 17, 4, 17, 276, 8, 17, 11, 17, 12, 17, 277, 3, 17, 280, 8, 17, 1, 18, 1, 18, 3, 18, 284, 8, 18, 1, 18, 4, 18, 287, 8, 18, 11, 18, 12, 18, 288, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 3, 19, 300, 8, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 3, 22, 315, 8, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 35, 1, 35, 1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 43, 1, 44, 1, 44, 1, 45, 1, 45, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 49, 4, 49, 386, 8, 49, 11, 49, 12, 49, 387, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 3, 50, 400, 8, 50, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 5, 53, 415, 8, 53, 10, 53, 12, 53, 418, 9, 53, 1, 53, 1, 53, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 56, 4, 56, 437, 8, 56, 11, 56, 12, 56, 438, 1, 56, 1, 56, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 3, 57, 449, 8, 57, 1, 191, 0, 58, 4, 1, 6, 2, 8, 3, 10, 4, 12, 5, 14, 6, 16, 7, 18, 0, 20, 8, 22, 9, 24, 10, 26, 11, 28, 12, 30, 0, 32, 0, 34, 0, 36, 0, 38, 13, 40, 0, 42, 14, 44, 15, 46, 16, 48, 17, 50, 18, 52, 19, 54, 20, 56, 21, 58, 22, 60, 23, 62, 24, 64, 25, 66, 26, 68, 27, 70, 28, 72, 29, 74, 30, 76, 31, 78, 32, 80, 33, 82, 34, 84, 35, 86, 36, 88, 37, 90, 38, 92, 39, 94, 40, 96, 41, 98, 42, 100, 43, 102, 44, 104, 45, 106, 0, 108, 0, 110, 0, 112, 0, 114, 0, 116, 46, 118, 47, 4, 0, 1, 2, 3, 15, 4, 0, 10, 10, 13, 13, 34, 34, 36, 37, 3, 0, 9, 9, 12, 13, 32, 32, 2, 0, 10, 10, 13, 13, 1, 1, 10, 10, 1, 0, 48, 57, 4, 0, 36, 36, 65, 90, 95, 95, 97, 122, 2, 0, 0, 127, 55296, 56319, 1, 0, 55296, 56319, 1, 0, 56320, 57343, 5, 0, 34, 34, 92, 92, 110, 110, 114, 114, 116, 116, 3, 0, 48, 57, 65, 70, 97, 102, 2, 0, 69, 69, 101, 101, 2, 0, 43, 43, 45, 45, 3, 0, 10, 10, 13, 13, 36, 37, 1, 0, 123, 123, 484, 0, 4, 1, 0, 0, 0, 0, 6, 1, 0, 0, 0, 0, 8, 1, 0, 0, 0, 0, 10, 1, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 14, 1, 0, 0, 0, 0, 16, 1, 0, 0, 0, 0, 20, 1, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 24, 1, 0, 0, 0, 0, 26, 1, 0, 0, 0, 0, 28, 1, 0, 0, 0, 0, 38, 1, 0, 0, 0, 0, 42, 1, 0, 0, 0, 0, 44, 1, 0, 0, 0, 0, 46, 1, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 50, 1, 0, 0, 0, 0, 52, 1, 0, 0, 0, 0, 54, 1, 0, 0, 0, 0, 56, 1, 0, 0, 0, 0, 58, 1, 0, 0, 0, 0, 60, 1, 0, 0, 0, 0, 62, 1, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 66, 1, 0, 0, 0, 0, 68, 1, 0, 0, 0, 0, 70, 1, 0, 0, 0, 0, 72, 1, 0, 0, 0, 0, 74, 1, 0, 0, 0, 0, 76, 1, 0, 0, 0, 0, 78, 1, 0, 0, 0, 0, 80, 1, 0, 0, 0, 0, 82, 1, 0, 0, 0, 0, 84, 1, 0, 0, 0, 0, 86, 1, 0, 0, 0, 0, 88, 1, 0, 0, 0, 0, 90, 1, 0, 0, 0, 0, 92, 1, 0, 0, 0, 0, 94, 1, 0, 0, 0, 0, 96, 1, 0, 0, 0, 0, 98, 1, 0, 0, 0, 1, 100, 1, 0, 0, 0, 1, 102, 1, 0, 0, 0, 1, 104, 1, 0, 0, 0, 1, 106, 1, 0, 0, 0, 2, 108, 1, 0, 0, 0, 2, 110, 1, 0, 0, 0, 3, 112, 1, 0, 0, 0, 3, 114, 1, 0, 0, 0, 3, 116, 1, 0, 0, 0, 3, 118, 1, 0, 0, 0, 4, 120, 1, 0, 0, 0, 6, 136, 1, 0, 0, 0, 8, 152, 1, 0, 0, 0, 10, 155, 1, 0, 0, 0, 12, 158, 1, 0, 0, 0, 14, 161, 1, 0, 0, 0, 16, 164, 1, 0, 0, 0, 18, 168, 1, 0, 0, 0, 20, 170, 1, 0, 0, 0, 22, 179, 1, 0, 0, 0, 24, 185, 1, 0, 0, 0, 26, 202, 1, 0, 0, 0, 28, 218, 1, 0, 0, 0, 30, 224, 1, 0, 0, 0, 32, 230, 1, 0, 0, 0, 34, 250, 1, 0, 0, 0, 36, 252, 1, 0, 0, 0, 38, 279, 1, 0, 0, 0, 40, 281, 1, 0, 0, 0, 42, 299, 1, 0, 0, 0, 44, 301, 1, 0, 0, 0, 46, 305, 1, 0, 0, 0, 48, 310, 1, 0, 0, 0, 50, 318, 1, 0, 0, 0, 52, 320, 1, 0, 0, 0, 54, 323, 1, 0, 0, 0, 56, 326, 1, 0, 0, 0, 58, 328, 1, 0, 0, 0, 60, 330, 1, 0, 0, 0, 62, 332, 1, 0, 0, 0, 64, 334, 1, 0, 0, 0, 66, 336, 1, 0, 0, 0, 68, 339, 1, 0, 0, 0, 70, 342, 1, 0, 0, 0, 72, 344, 1, 0, 0, 0, 74, 346, 1, 0, 0, 0, 76, 348, 1, 0, 0, 0, 78, 350, 1, 0, 0, 0, 80, 352, 1, 0, 0, 0, 82, 354, 1, 0, 0, 0, 84, 357, 1, 0, 0, 0, 86, 359, 1, 0, 0, 0, 88, 361, 1, 0, 0, 0, 90, 364, 1, 0, 0, 0, 92, 367, 1, 0, 0, 0, 94, 369, 1, 0, 0, 0, 96, 371, 1, 0, 0, 0, 98, 375, 1, 0, 0, 0, 100, 377, 1, 0, 0, 0, 102, 385, 1, 0, 0, 0, 104, 399, 1, 0, 0, 0, 106, 401, 1, 0, 0, 0, 108, 406, 1, 0, 0, 0, 110, 411, 1, 0, 0, 0, 112, 423, 1, 0, 0, 0, 114, 427, 1, 0, 0, 0, 116, 436, 1, 0, 0, 0, 118, 448, 1, 0, 0, 0, 120, 127, 5, 123, 0, 0, 121, 126, 3, 22, 9, 0, 122, 126, 3, 28, 12, 0, 123, 126, 3, 24, 10, 0, 124, 126, 3, 26, 11, 0, 125, 121, 1, 0, 0, 0, 125, 122, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 125, 124, 1, 0, 0, 0, 126, 129, 1, 0, 0, 0, 127, 125, 1, 0, 0, 0, 127, 128, 1, 0, 0, 0, 128, 130, 1, 0, 0, 0, 129, 127, 1, 0, 0, 0, 130, 131, 5, 102, 0, 0, 131, 132, 5, 111, 0, 0, 132, 133, 5, 114, 0, 0, 133, 134, 1, 0, 0, 0, 134, 135, 3, 22, 9, 0, 135, 5, 1, 0, 0, 0, 136, 143, 5, 91, 0, 0, 137, 142, 3, 22, 9, 0, 138, 142, 3, 28, 12, 0, 139, 142, 3, 24, 10, 0, 140, 142, 3, 26, 11, 0, 141, 137, 1, 0, 0, 0, 141, 138, 1, 0, 0, 0, 141, 139, 1, 0, 0, 0, 141, 140, 1, 0, 0, 0, 142, 145, 1, 0, 0, 0, 143, 141, 1, 0, 0, 0, 143, 144, 1, 0, 0, 0, 144, 146, 1, 0, 0, 0, 145, 143, 1, 0, 0, 0, 146, 147, 5, 102, 0, 0, 147, 148, 5, 111, 0, 0, 148, 149, 5, 114, 0, 0, 149, 150, 1, 0, 0, 0, 150, 151, 3, 22, 9, 0, 151, 7, 1, 0, 0, 0, 152, 153, 5, 105, 0, 0, 153, 154, 5, 102, 0, 0, 154, 9, 1, 0, 0, 0, 155, 156, 5, 105, 0, 0, 156, 157, 5, 110, 0, 0, 157, 11, 1, 0, 0, 0, 158, 159, 5, 123, 0, 0, 159, 160, 6, 4, 0, 0, 160, 13, 1, 0, 0, 0, 161, 162, 5, 125, 0, 0, 162, 163, 6, 5, 1, 0, 163, 15, 1, 0, 0, 0, 164, 165, 5, 61, 0, 0, 165, 17, 1, 0, 0, 0, 166, 169, 8, 0, 0, 0, 167, 169, 3, 34, 15, 0, 168, 166, 1, 0, 0, 0, 168, 167, 1, 0, 0, 0, 169, 19, 1, 0, 0, 0, 170, 175, 3, 32, 14, 0, 171, 174, 3, 30, 13, 0, 172, 174, 5, 45, 0, 0, 173, 171, 1, 0, 0, 0, 173, 172, 1, 0, 0, 0, 174, 177, 1, 0, 0, 0, 175, 173, 1, 0, 0, 0, 175, 176, 1, 0, 0, 0, 176, 21, 1, 0, 0, 0, 177, 175, 1, 0, 0, 0, 178, 180, 7, 1, 0, 0, 179, 178, 1, 0, 0, 0, 180, 181, 1, 0, 0, 0, 181, 179, 1, 0, 0, 0, 181, 182, 1, 0, 0, 0, 182, 183, 1, 0, 0, 0, 183, 184, 6, 9, 2, 0, 184, 23, 1, 0, 0, 0, 185, 186, 5, 47, 0, 0, 186, 187, 5, 42, 0, 0, 187, 191, 1, 0, 0, 0, 188, 190, 9, 0, 0, 0, 189, 188, 1, 0, 0, 0, 190, 193, 1, 0, 0, 0, 191, 192, 1, 0, 0, 0, 191, 189, 1, 0, 0, 0, 192, 194, 1, 0, 0, 0, 193, 191, 1, 0, 0, 0, 194, 195, 5, 42, 0, 0, 195, 196, 5, 47, 0, 0, 196, 197, 1, 0, 0, 0, 197, 198, 6, 10, 2, 0, 198, 25, 1, 0, 0, 0, 199, 200, 5, 47, 0, 0, 200, 203, 5, 47, 0, 0, 201, 203, 5, 35, 0, 0, 202, 199, 1, 0, 0, 0, 202, 201, 1, 0, 0, 0, 203, 207, 1, 0, 0, 0, 204, 206, 8, 2, 0, 0, 205, 204, 1, 0, 0, 0, 206, 209, 1, 0, 0, 0, 207, 205, 1, 0, 0, 0, 207, 208, 1, 0, 0, 0, 208, 211, 1, 0, 0, 0, 209, 207, 1, 0, 0, 0, 210, 212, 5, 13, 0, 0, 211, 210, 1, 0, 0, 0, 211, 212, 1, 0, 0, 0, 212, 214, 1, 0, 0, 0, 213, 215, 7, 3, 0, 0, 214, 213, 1, 0, 0, 0, 215, 216, 1, 0, 0, 0, 216, 217, 6, 11, 2, 0, 217, 27, 1, 0, 0, 0, 218, 219, 5, 10, 0, 0, 219, 220, 1, 0, 0, 0, 220, 221, 6, 12, 2, 0, 221, 29, 1, 0, 0, 0, 222, 225, 3, 32, 14, 0, 223, 225, 7, 4, 0, 0, 224, 222, 1, 0, 0, 0, 224, 223, 1, 0, 0, 0, 225, 31, 1, 0, 0, 0, 226, 231, 7, 5, 0, 0, 227, 231, 8, 6, 0, 0, 228, 229, 7, 7, 0, 0, 229, 231, 7, 8, 0, 0, 230, 226, 1, 0, 0, 0, 230, 227, 1, 0, 0, 0, 230, 228, 1, 0, 0, 0, 231, 33, 1, 0, 0, 0, 232, 233, 5, 92, 0, 0, 233, 251, 7, 9, 0, 0, 234, 235, 5, 92, 0, 0, 235, 236, 3, 36, 16, 0, 236, 237, 3, 36, 16, 0, 237, 238, 3, 36, 16, 0, 238, 239, 3, 36, 16, 0, 239, 251, 1, 0, 0, 0, 240, 241, 5, 92, 0, 0, 241, 242, 3, 36, 16, 0, 242, 243, 3, 36, 16, 0, 243, 244, 3, 36, 16, 0, 244, 245, 3, 36, 16, 0, 245, 246, 3, 36, 16, 0, 246, 247, 3, 36, 16, 0, 247, 248, 3, 36, 16, 0, 248, 249, 3, 36, 16, 0, 249, 251, 1, 0, 0, 0, 250, 232, 1, 0, 0, 0, 250, 234, 1, 0, 0, 0, 250, 240, 1, 0, 0, 0, 251, 35, 1, 0, 0, 0, 252, 253, 7, 10, 0, 0, 253, 37, 1, 0, 0, 0, 254, 256, 7, 4, 0, 0, 255, 254, 1, 0, 0, 0, 256, 257, 1, 0, 0, 0, 257, 255, 1, 0, 0, 0, 257, 258, 1, 0, 0, 0, 258, 259, 1, 0, 0, 0, 259, 261, 5, 46, 0, 0, 260, 262, 7, 4, 0, 0, 261, 260, 1, 0, 0, 0, 262, 263, 1, 0, 0, 0, 263, 261, 1, 0, 0, 0, 263, 264, 1, 0, 0, 0, 264, 266, 1, 0, 0, 0, 265, 267, 3, 40, 18, 0, 266, 265, 1, 0, 0, 0, 266, 267, 1, 0, 0, 0, 267, 280, 1, 0, 0, 0, 268, 270, 7, 4, 0, 0, 269, 268, 1, 0, 0, 0, 270, 271, 1, 0, 0, 0, 271, 269, 1, 0, 0, 0, 271, 272, 1, 0, 0, 0, 272, 273, 1, 0, 0, 0, 273, 280, 3, 40, 18, 0, 274, 276, 7, 4, 0, 0, 275, 274, 1, 0, 0, 0, 276, 277, 1, 0, 0, 0, 277, 275, 1, 0, 0, 0, 277, 278, 1, 0, 0, 0, 278, 280, 1, 0, 0, 0, 279, 255, 1, 0, 0, 0, 279, 269, 1, 0, 0, 0, 279, 275, 1, 0, 0, 0, 280, 39, 1, 0, 0, 0, 281, 283, 7, 11, 0, 0, 282, 284, 7, 12, 0, 0, 283, 282, 1, 0, 0, 0, 283, 284, 1, 0, 0, 0, 284, 286, 1, 0, 0, 0, 285, 287, 7, 4, 0, 0, 286, 285, 1, 0, 0, 0, 287, 288, 1, 0, 0, 0, 288, 286, 1, 0, 0, 0, 288, 289, 1, 0, 0, 0, 289, 41, 1, 0, 0, 0, 290, 291, 5, 116, 0, 0, 291, 292, 5, 114, 0, 0, 292, 293, 5, 117, 0, 0, 293, 300, 5, 101, 0, 0, 294, 295, 5, 102, 0, 0, 295, 296, 5, 97, 0, 0, 296, 297, 5, 108, 0, 0, 297, 298, 5, 115, 0, 0, 298, 300, 5, 101, 0, 0, 299, 290, 1, 0, 0, 0, 299, 294, 1, 0, 0, 0, 300, 43, 1, 0, 0, 0, 301, 302, 5, 34, 0, 0, 302, 303, 1, 0, 0, 0, 303, 304, 6, 20, 3, 0, 304, 45, 1, 0, 0, 0, 305, 306, 5, 110, 0, 0, 306, 307, 5, 117, 0, 0, 307, 308, 5, 108, 0, 0, 308, 309, 5, 108, 0, 0, 309, 47, 1, 0, 0, 0, 310, 311, 5, 60, 0, 0, 311, 312, 5, 60, 0, 0, 312, 314, 1, 0, 0, 0, 313, 315, 5, 45, 0, 0, 314, 313, 1, 0, 0, 0, 314, 315, 1, 0, 0, 0, 315, 316, 1, 0, 0, 0, 316, 317, 6, 22, 4, 0, 317, 49, 1, 0, 0, 0, 318, 319, 5, 43, 0, 0, 319, 51, 1, 0, 0, 0, 320, 321, 5, 38, 0, 0, 321, 322, 5, 38, 0, 0, 322, 53, 1, 0, 0, 0, 323, 324, 5, 61, 0, 0, 324, 325, 5, 61, 0, 0, 325, 55, 1, 0, 0, 0, 326, 327, 5, 60, 0, 0, 327, 57, 1, 0, 0, 0, 328, 329, 5, 58, 0, 0, 329, 59, 1, 0, 0, 0, 330, 331, 5, 91, 0, 0, 331, 61, 1, 0, 0, 0, 332, 333, 5, 40, 0, 0, 333, 63, 1, 0, 0, 0, 334, 335, 5, 45, 0, 0, 335, 65, 1, 0, 0, 0, 336, 337, 5, 124, 0, 0, 337, 338, 5, 124, 0, 0, 338, 67, 1, 0, 0, 0, 339, 340, 5, 33, 0, 0, 340, 341, 5, 61, 0, 0, 341, 69, 1, 0, 0, 0, 342, 343, 5, 62, 0, 0, 343, 71, 1, 0, 0, 0, 344, 345, 5, 63, 0, 0, 345, 73, 1, 0, 0, 0, 346, 347, 5, 93, 0, 0, 347, 75, 1, 0, 0, 0, 348, 349, 5, 41, 0, 0, 349, 77, 1, 0, 0, 0, 350, 351, 5, 42, 0, 0, 351, 79, 1, 0, 0, 0, 352, 353, 5, 33, 0, 0, 353, 81, 1, 0, 0, 0, 354, 355, 5, 60, 0, 0, 355, 356, 5, 61, 0, 0, 356, 83, 1, 0, 0, 0, 357, 358, 5, 46, 0, 0, 358, 85, 1, 0, 0, 0, 359, 360, 5, 47, 0, 0, 360, 87, 1, 0, 0, 0, 361, 362, 5, 62, 0, 0, 362, 363, 5, 61, 0, 0, 363, 89, 1, 0, 0, 0, 364, 365, 5, 61, 0, 0, 365, 366, 5, 62, 0, 0, 366, 91, 1, 0, 0, 0, 367, 368, 5, 44, 0, 0, 368, 93, 1, 0, 0, 0, 369, 370, 5, 37, 0, 0, 370, 95, 1, 0, 0, 0, 371, 372, 5, 46, 0, 0, 372, 373, 5, 46, 0, 0, 373, 374, 5, 46, 0, 0, 374, 97, 1, 0, 0, 0, 375, 376, 5, 126, 0, 0, 376, 99, 1, 0, 0, 0, 377, 378, 5, 36, 0, 0, 378, 379, 5, 123, 0, 0, 379, 380, 1, 0, 0, 0, 380, 381, 6, 48, 5, 0, 381, 382, 1, 0, 0, 0, 382, 383, 6, 48, 6, 0, 383, 101, 1, 0, 0, 0, 384, 386, 3, 104, 50, 0, 385, 384, 1, 0, 0, 0, 386, 387, 1, 0, 0, 0, 387, 385, 1, 0, 0, 0, 387, 388, 1, 0, 0, 0, 388, 103, 1, 0, 0, 0, 389, 400, 8, 0, 0, 0, 390, 391, 5, 36, 0, 0, 391, 400, 5, 36, 0, 0, 392, 393, 5, 36, 0, 0, 393, 400, 4, 50, 0, 0, 394, 395, 5, 37, 0, 0, 395, 400, 5, 37, 0, 0, 396, 397, 5, 37, 0, 0, 397, 400, 4, 50, 1, 0, 398, 400, 3, 34, 15, 0, 399, 389, 1, 0, 0, 0, 399, 390, 1, 0, 0, 0, 399, 392, 1, 0, 0, 0, 399, 394, 1, 0, 0, 0, 399, 396, 1, 0, 0, 0, 399, 398, 1, 0, 0, 0, 400, 105, 1, 0, 0, 0, 401, 402, 5, 34, 0, 0, 402, 403, 1, 0, 0, 0, 403, 404, 6, 51, 7, 0, 404, 405, 6, 51, 8, 0, 405, 107, 1, 0, 0, 0, 406, 407, 5, 10, 0, 0, 407, 408, 1, 0, 0, 0, 408, 409, 6, 52, 9, 0, 409, 410, 6, 52, 10, 0, 410, 109, 1, 0, 0, 0, 411, 416, 3, 32, 14, 0, 412, 415, 3, 30, 13, 0, 413, 415, 5, 45, 0, 0, 414, 412, 1, 0, 0, 0, 414, 413, 1, 0, 0, 0, 415, 418, 1, 0, 0, 0, 416, 414, 1, 0, 0, 0, 416, 417, 1, 0, 0, 0, 417, 419, 1, 0, 0, 0, 418, 416, 1, 0, 0, 0, 419, 420, 6, 53, 11, 0, 420, 421, 1, 0, 0, 0, 421, 422, 6, 53, 12, 0, 422, 111, 1, 0, 0, 0, 423, 424, 5, 10, 0, 0, 424, 425, 1, 0, 0, 0, 425, 426, 6, 54, 9, 0, 426, 113, 1, 0, 0, 0, 427, 428, 5, 36, 0, 0, 428, 429, 5, 123, 0, 0, 429, 430, 1, 0, 0, 0, 430, 431, 6, 55, 13, 0, 431, 432, 1, 0, 0, 0, 432, 433, 6, 55, 14, 0, 433, 434, 6, 55, 6, 0, 434, 115, 1, 0, 0, 0, 435, 437, 3, 118, 57, 0, 436, 435, 1, 0, 0, 0, 437, 438, 1, 0, 0, 0, 438, 436, 1, 0, 0, 0, 438, 439, 1, 0, 0, 0, 439, 440, 1, 0, 0, 0, 440, 441, 6, 56, 15, 0, 441, 117, 1, 0, 0, 0, 442, 449, 8, 13, 0, 0, 443, 444, 5, 36, 0, 0, 444, 449, 8, 14, 0, 0, 445, 446, 5, 37, 0, 0, 446, 449, 8, 14, 0, 0, 447, 449, 3, 34, 15, 0, 448, 442, 1, 0, 0, 0, 448, 443, 1, 0, 0, 0, 448, 445, 1, 0, 0, 0, 448, 447, 1, 0, 0, 0, 449, 119, 1, 0, 0, 0, 36, 0, 1, 2, 3, 125, 127, 141, 143, 168, 173, 175, 181, 191, 202, 207, 211, 214, 224, 230, 250, 257, 263, 266, 271, 277, 279, 283, 288, 299, 314, 387, 399, 414, 416, 438, 448, 16, 1, 4, 0, 1, 5, 1, 0, 1, 0, 5, 1, 0, 5, 2, 0, 1, 48, 2, 5, 0, 0, 7, 15, 0, 4, 0, 0, 7, 12, 0, 2, 3, 0, 1, 53, 3, 7, 8, 0, 1, 55, 4, 7, 43, 0, 1, 56, 5]
\ No newline at end of file
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLLexer.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLLexer.java
index 31598f56b7a..30ec52013ec 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLLexer.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLLexer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 the original author or authors.
+ * Copyright 2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
*/
// Generated from java-escape by ANTLR 4.11.1
package org.openrewrite.hcl.internal.grammar;
-
+import java.util.Stack;
+import org.antlr.v4.runtime.Lexer;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.atn.ATN;
-import org.antlr.v4.runtime.atn.ATNDeserializer;
-import org.antlr.v4.runtime.atn.LexerATNSimulator;
-import org.antlr.v4.runtime.atn.PredictionContextCache;
+import org.antlr.v4.runtime.atn.*;
import org.antlr.v4.runtime.dfa.DFA;
-
-import java.util.Stack;
+import org.antlr.v4.runtime.misc.*;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})
public class HCLLexer extends Lexer {
@@ -33,12 +33,12 @@ public class HCLLexer extends Lexer {
protected static final PredictionContextCache _sharedContextCache =
new PredictionContextCache();
public static final int
- FOR_BRACE=1, FOR_BRACK=2, IF=3, IN=4, LBRACE=5, RBRACE=6, ASSIGN=7, Identifier=8,
- WS=9, COMMENT=10, LINE_COMMENT=11, NEWLINE=12, NumericLiteral=13, BooleanLiteral=14,
- QUOTE=15, NULL=16, HEREDOC_START=17, PLUS=18, AND=19, EQ=20, LT=21, COLON=22,
- LBRACK=23, LPAREN=24, MINUS=25, OR=26, NEQ=27, GT=28, QUESTION=29, RBRACK=30,
- RPAREN=31, MUL=32, NOT=33, LEQ=34, DOT=35, DIV=36, GEQ=37, ARROW=38, COMMA=39,
- MOD=40, ELLIPSIS=41, TILDE=42, TEMPLATE_INTERPOLATION_START=43, TemplateStringLiteral=44,
+ FOR_BRACE=1, FOR_BRACK=2, IF=3, IN=4, LBRACE=5, RBRACE=6, ASSIGN=7, Identifier=8,
+ WS=9, COMMENT=10, LINE_COMMENT=11, NEWLINE=12, NumericLiteral=13, BooleanLiteral=14,
+ QUOTE=15, NULL=16, HEREDOC_START=17, PLUS=18, AND=19, EQ=20, LT=21, COLON=22,
+ LBRACK=23, LPAREN=24, MINUS=25, OR=26, NEQ=27, GT=28, QUESTION=29, RBRACK=30,
+ RPAREN=31, MUL=32, NOT=33, LEQ=34, DOT=35, DIV=36, GEQ=37, ARROW=38, COMMA=39,
+ MOD=40, ELLIPSIS=41, TILDE=42, TEMPLATE_INTERPOLATION_START=43, TemplateStringLiteral=44,
TemplateStringLiteralChar=45, HTemplateLiteral=46, HTemplateLiteralChar=47;
public static final int
TEMPLATE=1, HEREDOC_PREAMBLE=2, HEREDOC=3;
@@ -52,15 +52,15 @@ public class HCLLexer extends Lexer {
private static String[] makeRuleNames() {
return new String[] {
- "FOR_BRACE", "FOR_BRACK", "IF", "IN", "LBRACE", "RBRACE", "ASSIGN", "StringLiteralChar",
- "Identifier", "WS", "COMMENT", "LINE_COMMENT", "NEWLINE", "LetterOrDigit",
- "Letter", "EscapeSequence", "HexDigit", "NumericLiteral", "ExponentPart",
- "BooleanLiteral", "QUOTE", "NULL", "HEREDOC_START", "PLUS", "AND", "EQ",
- "LT", "COLON", "LBRACK", "LPAREN", "MINUS", "OR", "NEQ", "GT", "QUESTION",
- "RBRACK", "RPAREN", "MUL", "NOT", "LEQ", "DOT", "DIV", "GEQ", "ARROW",
- "COMMA", "MOD", "ELLIPSIS", "TILDE", "TEMPLATE_INTERPOLATION_START",
- "TemplateStringLiteral", "TemplateStringLiteralChar", "END_QUOTE", "HP_NEWLINE",
- "HPIdentifier", "H_NEWLINE", "H_TEMPLATE_INTERPOLATION_START", "HTemplateLiteral",
+ "FOR_BRACE", "FOR_BRACK", "IF", "IN", "LBRACE", "RBRACE", "ASSIGN", "StringLiteralChar",
+ "Identifier", "WS", "COMMENT", "LINE_COMMENT", "NEWLINE", "LetterOrDigit",
+ "Letter", "EscapeSequence", "HexDigit", "NumericLiteral", "ExponentPart",
+ "BooleanLiteral", "QUOTE", "NULL", "HEREDOC_START", "PLUS", "AND", "EQ",
+ "LT", "COLON", "LBRACK", "LPAREN", "MINUS", "OR", "NEQ", "GT", "QUESTION",
+ "RBRACK", "RPAREN", "MUL", "NOT", "LEQ", "DOT", "DIV", "GEQ", "ARROW",
+ "COMMA", "MOD", "ELLIPSIS", "TILDE", "TEMPLATE_INTERPOLATION_START",
+ "TemplateStringLiteral", "TemplateStringLiteralChar", "END_QUOTE", "HP_NEWLINE",
+ "HPIdentifier", "H_NEWLINE", "H_TEMPLATE_INTERPOLATION_START", "HTemplateLiteral",
"HTemplateLiteralChar"
};
}
@@ -68,23 +68,23 @@ private static String[] makeRuleNames() {
private static String[] makeLiteralNames() {
return new String[] {
- null, null, null, "'if'", "'in'", "'{'", "'}'", "'='", null, null, null,
- null, null, null, null, null, "'null'", null, "'+'", "'&&'", "'=='",
- "'<'", "':'", "'['", "'('", "'-'", "'||'", "'!='", "'>'", "'?'", "']'",
- "')'", "'*'", "'!'", "'<='", "'.'", "'/'", "'>='", "'=>'", "','", "'%'",
+ null, null, null, "'if'", "'in'", "'{'", "'}'", "'='", null, null, null,
+ null, null, null, null, null, "'null'", null, "'+'", "'&&'", "'=='",
+ "'<'", "':'", "'['", "'('", "'-'", "'||'", "'!='", "'>'", "'?'", "']'",
+ "')'", "'*'", "'!'", "'<='", "'.'", "'/'", "'>='", "'=>'", "','", "'%'",
"'...'", "'~'"
};
}
private static final String[] _LITERAL_NAMES = makeLiteralNames();
private static String[] makeSymbolicNames() {
return new String[] {
- null, "FOR_BRACE", "FOR_BRACK", "IF", "IN", "LBRACE", "RBRACE", "ASSIGN",
- "Identifier", "WS", "COMMENT", "LINE_COMMENT", "NEWLINE", "NumericLiteral",
- "BooleanLiteral", "QUOTE", "NULL", "HEREDOC_START", "PLUS", "AND", "EQ",
- "LT", "COLON", "LBRACK", "LPAREN", "MINUS", "OR", "NEQ", "GT", "QUESTION",
- "RBRACK", "RPAREN", "MUL", "NOT", "LEQ", "DOT", "DIV", "GEQ", "ARROW",
- "COMMA", "MOD", "ELLIPSIS", "TILDE", "TEMPLATE_INTERPOLATION_START",
- "TemplateStringLiteral", "TemplateStringLiteralChar", "HTemplateLiteral",
+ null, "FOR_BRACE", "FOR_BRACK", "IF", "IN", "LBRACE", "RBRACE", "ASSIGN",
+ "Identifier", "WS", "COMMENT", "LINE_COMMENT", "NEWLINE", "NumericLiteral",
+ "BooleanLiteral", "QUOTE", "NULL", "HEREDOC_START", "PLUS", "AND", "EQ",
+ "LT", "COLON", "LBRACK", "LPAREN", "MINUS", "OR", "NEQ", "GT", "QUESTION",
+ "RBRACK", "RPAREN", "MUL", "NOT", "LEQ", "DOT", "DIV", "GEQ", "ARROW",
+ "COMMA", "MOD", "ELLIPSIS", "TILDE", "TEMPLATE_INTERPOLATION_START",
+ "TemplateStringLiteral", "TemplateStringLiteralChar", "HTemplateLiteral",
"HTemplateLiteralChar"
};
}
@@ -257,7 +257,7 @@ private boolean TemplateStringLiteralChar_sempred(RuleContext _localctx, int pre
}
public static final String _serializedATN =
- "\u0004\u0000/\u01be\u0006\uffff\uffff\u0006\uffff\uffff\u0006\uffff\uffff"+
+ "\u0004\u0000/\u01c2\u0006\uffff\uffff\u0006\uffff\uffff\u0006\uffff\uffff"+
"\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+
"\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004\u0007\u0004\u0002"+
"\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007\u0007\u0007\u0002"+
@@ -274,62 +274,63 @@ private boolean TemplateStringLiteralChar_sempred(RuleContext _localctx, int pre
"-\u0007-\u0002.\u0007.\u0002/\u0007/\u00020\u00070\u00021\u00071\u0002"+
"2\u00072\u00023\u00073\u00024\u00074\u00025\u00075\u00026\u00076\u0002"+
"7\u00077\u00028\u00078\u00029\u00079\u0001\u0000\u0001\u0000\u0001\u0000"+
- "\u0005\u0000|\b\u0000\n\u0000\f\u0000\u007f\t\u0000\u0001\u0000\u0001"+
- "\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0001\u0001"+
- "\u0001\u0001\u0001\u0005\u0001\u008a\b\u0001\n\u0001\f\u0001\u008d\t\u0001"+
- "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+
- "\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003\u0001\u0003"+
- "\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0005\u0001\u0005\u0001\u0005"+
- "\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007\u0003\u0007\u00a5\b\u0007"+
- "\u0001\b\u0001\b\u0001\b\u0005\b\u00aa\b\b\n\b\f\b\u00ad\t\b\u0001\t\u0004"+
- "\t\u00b0\b\t\u000b\t\f\t\u00b1\u0001\t\u0001\t\u0001\n\u0001\n\u0001\n"+
- "\u0001\n\u0005\n\u00ba\b\n\n\n\f\n\u00bd\t\n\u0001\n\u0001\n\u0001\n\u0001"+
- "\n\u0001\n\u0001\u000b\u0001\u000b\u0001\u000b\u0003\u000b\u00c7\b\u000b"+
- "\u0001\u000b\u0005\u000b\u00ca\b\u000b\n\u000b\f\u000b\u00cd\t\u000b\u0001"+
- "\u000b\u0003\u000b\u00d0\b\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001"+
- "\u000b\u0001\f\u0001\f\u0001\f\u0001\f\u0001\r\u0001\r\u0003\r\u00dc\b"+
- "\r\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0003\u000e\u00e2\b"+
- "\u000e\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001"+
+ "\u0001\u0000\u0001\u0000\u0005\u0000~\b\u0000\n\u0000\f\u0000\u0081\t"+
+ "\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001"+
+ "\u0000\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0005"+
+ "\u0001\u008e\b\u0001\n\u0001\f\u0001\u0091\t\u0001\u0001\u0001\u0001\u0001"+
+ "\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u0001\u0002"+
+ "\u0001\u0002\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0004\u0001\u0004"+
+ "\u0001\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0006\u0001\u0006"+
+ "\u0001\u0007\u0001\u0007\u0003\u0007\u00a9\b\u0007\u0001\b\u0001\b\u0001"+
+ "\b\u0005\b\u00ae\b\b\n\b\f\b\u00b1\t\b\u0001\t\u0004\t\u00b4\b\t\u000b"+
+ "\t\f\t\u00b5\u0001\t\u0001\t\u0001\n\u0001\n\u0001\n\u0001\n\u0005\n\u00be"+
+ "\b\n\n\n\f\n\u00c1\t\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\u000b"+
+ "\u0001\u000b\u0001\u000b\u0003\u000b\u00cb\b\u000b\u0001\u000b\u0005\u000b"+
+ "\u00ce\b\u000b\n\u000b\f\u000b\u00d1\t\u000b\u0001\u000b\u0003\u000b\u00d4"+
+ "\b\u000b\u0001\u000b\u0003\u000b\u00d7\b\u000b\u0001\u000b\u0001\u000b"+
+ "\u0001\f\u0001\f\u0001\f\u0001\f\u0001\r\u0001\r\u0003\r\u00e1\b\r\u0001"+
+ "\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0003\u000e\u00e7\b\u000e\u0001"+
"\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001"+
"\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001"+
- "\u000f\u0003\u000f\u00f6\b\u000f\u0001\u0010\u0001\u0010\u0001\u0011\u0004"+
- "\u0011\u00fb\b\u0011\u000b\u0011\f\u0011\u00fc\u0001\u0011\u0001\u0011"+
- "\u0005\u0011\u0101\b\u0011\n\u0011\f\u0011\u0104\t\u0011\u0001\u0011\u0003"+
- "\u0011\u0107\b\u0011\u0001\u0011\u0004\u0011\u010a\b\u0011\u000b\u0011"+
- "\f\u0011\u010b\u0001\u0011\u0001\u0011\u0004\u0011\u0110\b\u0011\u000b"+
- "\u0011\f\u0011\u0111\u0003\u0011\u0114\b\u0011\u0001\u0012\u0001\u0012"+
- "\u0003\u0012\u0118\b\u0012\u0001\u0012\u0004\u0012\u011b\b\u0012\u000b"+
- "\u0012\f\u0012\u011c\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001"+
- "\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0003\u0013\u0128"+
- "\b\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0015\u0001"+
- "\u0015\u0001\u0015\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016\u0001"+
- "\u0016\u0001\u0016\u0003\u0016\u0137\b\u0016\u0001\u0016\u0001\u0016\u0001"+
- "\u0017\u0001\u0017\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0019\u0001"+
- "\u0019\u0001\u0019\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b\u0001"+
- "\u001c\u0001\u001c\u0001\u001d\u0001\u001d\u0001\u001e\u0001\u001e\u0001"+
- "\u001f\u0001\u001f\u0001\u001f\u0001 \u0001 \u0001 \u0001!\u0001!\u0001"+
- "\"\u0001\"\u0001#\u0001#\u0001$\u0001$\u0001%\u0001%\u0001&\u0001&\u0001"+
- "\'\u0001\'\u0001\'\u0001(\u0001(\u0001)\u0001)\u0001*\u0001*\u0001*\u0001"+
- "+\u0001+\u0001+\u0001,\u0001,\u0001-\u0001-\u0001.\u0001.\u0001.\u0001"+
- ".\u0001/\u0001/\u00010\u00010\u00010\u00010\u00010\u00010\u00010\u0001"+
- "1\u00041\u017e\b1\u000b1\f1\u017f\u00012\u00012\u00012\u00012\u00012\u0001"+
- "2\u00012\u00012\u00012\u00012\u00032\u018c\b2\u00013\u00013\u00013\u0001"+
- "3\u00013\u00014\u00014\u00014\u00014\u00014\u00015\u00015\u00015\u0005"+
- "5\u019b\b5\n5\f5\u019e\t5\u00015\u00015\u00015\u00015\u00016\u00016\u0001"+
- "6\u00016\u00017\u00017\u00017\u00017\u00017\u00017\u00017\u00017\u0001"+
- "8\u00048\u01b1\b8\u000b8\f8\u01b2\u00018\u00018\u00019\u00019\u00019\u0001"+
- "9\u00019\u00019\u00039\u01bd\b9\u0001\u00bb\u0000:\u0004\u0001\u0006\u0002"+
- "\b\u0003\n\u0004\f\u0005\u000e\u0006\u0010\u0007\u0012\u0000\u0014\b\u0016"+
- "\t\u0018\n\u001a\u000b\u001c\f\u001e\u0000 \u0000\"\u0000$\u0000&\r(\u0000"+
- "*\u000e,\u000f.\u00100\u00112\u00124\u00136\u00148\u0015:\u0016<\u0017"+
- ">\u0018@\u0019B\u001aD\u001bF\u001cH\u001dJ\u001eL\u001fN P!R\"T#V$X%"+
- "Z&\\\'^(`)b*d+f,h-j\u0000l\u0000n\u0000p\u0000r\u0000t.v/\u0004\u0000"+
- "\u0001\u0002\u0003\u000e\u0004\u0000\n\n\r\r\"\"$%\u0003\u0000\t\t\f\r"+
- " \u0002\u0000\n\n\r\r\u0001\u000009\u0004\u0000$$AZ__az\u0002\u0000\u0000"+
- "\u007f\u8000\ud800\u8000\udbff\u0001\u0000\u8000\ud800\u8000\udbff\u0001"+
- "\u0000\u8000\udc00\u8000\udfff\u0005\u0000\"\"\\\\nnrrtt\u0003\u00000"+
- "9AFaf\u0002\u0000EEee\u0002\u0000++--\u0003\u0000\n\n\r\r$%\u0001\u0000"+
- "{{\u01dc\u0000\u0004\u0001\u0000\u0000\u0000\u0000\u0006\u0001\u0000\u0000"+
+ "\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0001\u000f\u0003"+
+ "\u000f\u00fb\b\u000f\u0001\u0010\u0001\u0010\u0001\u0011\u0004\u0011\u0100"+
+ "\b\u0011\u000b\u0011\f\u0011\u0101\u0001\u0011\u0001\u0011\u0004\u0011"+
+ "\u0106\b\u0011\u000b\u0011\f\u0011\u0107\u0001\u0011\u0003\u0011\u010b"+
+ "\b\u0011\u0001\u0011\u0004\u0011\u010e\b\u0011\u000b\u0011\f\u0011\u010f"+
+ "\u0001\u0011\u0001\u0011\u0004\u0011\u0114\b\u0011\u000b\u0011\f\u0011"+
+ "\u0115\u0003\u0011\u0118\b\u0011\u0001\u0012\u0001\u0012\u0003\u0012\u011c"+
+ "\b\u0012\u0001\u0012\u0004\u0012\u011f\b\u0012\u000b\u0012\f\u0012\u0120"+
+ "\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013"+
+ "\u0001\u0013\u0001\u0013\u0001\u0013\u0003\u0013\u012c\b\u0013\u0001\u0014"+
+ "\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0015\u0001\u0015\u0001\u0015"+
+ "\u0001\u0015\u0001\u0015\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0016"+
+ "\u0003\u0016\u013b\b\u0016\u0001\u0016\u0001\u0016\u0001\u0017\u0001\u0017"+
+ "\u0001\u0018\u0001\u0018\u0001\u0018\u0001\u0019\u0001\u0019\u0001\u0019"+
+ "\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b\u0001\u001c\u0001\u001c"+
+ "\u0001\u001d\u0001\u001d\u0001\u001e\u0001\u001e\u0001\u001f\u0001\u001f"+
+ "\u0001\u001f\u0001 \u0001 \u0001 \u0001!\u0001!\u0001\"\u0001\"\u0001"+
+ "#\u0001#\u0001$\u0001$\u0001%\u0001%\u0001&\u0001&\u0001\'\u0001\'\u0001"+
+ "\'\u0001(\u0001(\u0001)\u0001)\u0001*\u0001*\u0001*\u0001+\u0001+\u0001"+
+ "+\u0001,\u0001,\u0001-\u0001-\u0001.\u0001.\u0001.\u0001.\u0001/\u0001"+
+ "/\u00010\u00010\u00010\u00010\u00010\u00010\u00010\u00011\u00041\u0182"+
+ "\b1\u000b1\f1\u0183\u00012\u00012\u00012\u00012\u00012\u00012\u00012\u0001"+
+ "2\u00012\u00012\u00032\u0190\b2\u00013\u00013\u00013\u00013\u00013\u0001"+
+ "4\u00014\u00014\u00014\u00014\u00015\u00015\u00015\u00055\u019f\b5\n5"+
+ "\f5\u01a2\t5\u00015\u00015\u00015\u00015\u00016\u00016\u00016\u00016\u0001"+
+ "7\u00017\u00017\u00017\u00017\u00017\u00017\u00017\u00018\u00048\u01b5"+
+ "\b8\u000b8\f8\u01b6\u00018\u00018\u00019\u00019\u00019\u00019\u00019\u0001"+
+ "9\u00039\u01c1\b9\u0001\u00bf\u0000:\u0004\u0001\u0006\u0002\b\u0003\n"+
+ "\u0004\f\u0005\u000e\u0006\u0010\u0007\u0012\u0000\u0014\b\u0016\t\u0018"+
+ "\n\u001a\u000b\u001c\f\u001e\u0000 \u0000\"\u0000$\u0000&\r(\u0000*\u000e"+
+ ",\u000f.\u00100\u00112\u00124\u00136\u00148\u0015:\u0016<\u0017>\u0018"+
+ "@\u0019B\u001aD\u001bF\u001cH\u001dJ\u001eL\u001fN P!R\"T#V$X%Z&\\\'^"+
+ "(`)b*d+f,h-j\u0000l\u0000n\u0000p\u0000r\u0000t.v/\u0004\u0000\u0001\u0002"+
+ "\u0003\u000f\u0004\u0000\n\n\r\r\"\"$%\u0003\u0000\t\t\f\r \u0002\u0000"+
+ "\n\n\r\r\u0001\u0001\n\n\u0001\u000009\u0004\u0000$$AZ__az\u0002\u0000"+
+ "\u0000\u007f\u8000\ud800\u8000\udbff\u0001\u0000\u8000\ud800\u8000\udbff"+
+ "\u0001\u0000\u8000\udc00\u8000\udfff\u0005\u0000\"\"\\\\nnrrtt\u0003\u0000"+
+ "09AFaf\u0002\u0000EEee\u0002\u0000++--\u0003\u0000\n\n\r\r$%\u0001\u0000"+
+ "{{\u01e4\u0000\u0004\u0001\u0000\u0000\u0000\u0000\u0006\u0001\u0000\u0000"+
"\u0000\u0000\b\u0001\u0000\u0000\u0000\u0000\n\u0001\u0000\u0000\u0000"+
"\u0000\f\u0001\u0000\u0000\u0000\u0000\u000e\u0001\u0000\u0000\u0000\u0000"+
"\u0010\u0001\u0000\u0000\u0000\u0000\u0014\u0001\u0000\u0000\u0000\u0000"+
@@ -352,206 +353,210 @@ private boolean TemplateStringLiteralChar_sempred(RuleContext _localctx, int pre
"\u0000\u0000\u0001j\u0001\u0000\u0000\u0000\u0002l\u0001\u0000\u0000\u0000"+
"\u0002n\u0001\u0000\u0000\u0000\u0003p\u0001\u0000\u0000\u0000\u0003r"+
"\u0001\u0000\u0000\u0000\u0003t\u0001\u0000\u0000\u0000\u0003v\u0001\u0000"+
- "\u0000\u0000\u0004x\u0001\u0000\u0000\u0000\u0006\u0086\u0001\u0000\u0000"+
- "\u0000\b\u0094\u0001\u0000\u0000\u0000\n\u0097\u0001\u0000\u0000\u0000"+
- "\f\u009a\u0001\u0000\u0000\u0000\u000e\u009d\u0001\u0000\u0000\u0000\u0010"+
- "\u00a0\u0001\u0000\u0000\u0000\u0012\u00a4\u0001\u0000\u0000\u0000\u0014"+
- "\u00a6\u0001\u0000\u0000\u0000\u0016\u00af\u0001\u0000\u0000\u0000\u0018"+
- "\u00b5\u0001\u0000\u0000\u0000\u001a\u00c6\u0001\u0000\u0000\u0000\u001c"+
- "\u00d5\u0001\u0000\u0000\u0000\u001e\u00db\u0001\u0000\u0000\u0000 \u00e1"+
- "\u0001\u0000\u0000\u0000\"\u00f5\u0001\u0000\u0000\u0000$\u00f7\u0001"+
- "\u0000\u0000\u0000&\u0113\u0001\u0000\u0000\u0000(\u0115\u0001\u0000\u0000"+
- "\u0000*\u0127\u0001\u0000\u0000\u0000,\u0129\u0001\u0000\u0000\u0000."+
- "\u012d\u0001\u0000\u0000\u00000\u0132\u0001\u0000\u0000\u00002\u013a\u0001"+
- "\u0000\u0000\u00004\u013c\u0001\u0000\u0000\u00006\u013f\u0001\u0000\u0000"+
- "\u00008\u0142\u0001\u0000\u0000\u0000:\u0144\u0001\u0000\u0000\u0000<"+
- "\u0146\u0001\u0000\u0000\u0000>\u0148\u0001\u0000\u0000\u0000@\u014a\u0001"+
- "\u0000\u0000\u0000B\u014c\u0001\u0000\u0000\u0000D\u014f\u0001\u0000\u0000"+
- "\u0000F\u0152\u0001\u0000\u0000\u0000H\u0154\u0001\u0000\u0000\u0000J"+
- "\u0156\u0001\u0000\u0000\u0000L\u0158\u0001\u0000\u0000\u0000N\u015a\u0001"+
- "\u0000\u0000\u0000P\u015c\u0001\u0000\u0000\u0000R\u015e\u0001\u0000\u0000"+
- "\u0000T\u0161\u0001\u0000\u0000\u0000V\u0163\u0001\u0000\u0000\u0000X"+
- "\u0165\u0001\u0000\u0000\u0000Z\u0168\u0001\u0000\u0000\u0000\\\u016b"+
- "\u0001\u0000\u0000\u0000^\u016d\u0001\u0000\u0000\u0000`\u016f\u0001\u0000"+
- "\u0000\u0000b\u0173\u0001\u0000\u0000\u0000d\u0175\u0001\u0000\u0000\u0000"+
- "f\u017d\u0001\u0000\u0000\u0000h\u018b\u0001\u0000\u0000\u0000j\u018d"+
- "\u0001\u0000\u0000\u0000l\u0192\u0001\u0000\u0000\u0000n\u0197\u0001\u0000"+
- "\u0000\u0000p\u01a3\u0001\u0000\u0000\u0000r\u01a7\u0001\u0000\u0000\u0000"+
- "t\u01b0\u0001\u0000\u0000\u0000v\u01bc\u0001\u0000\u0000\u0000x}\u0005"+
- "{\u0000\u0000y|\u0003\u0016\t\u0000z|\u0003\u001c\f\u0000{y\u0001\u0000"+
- "\u0000\u0000{z\u0001\u0000\u0000\u0000|\u007f\u0001\u0000\u0000\u0000"+
- "}{\u0001\u0000\u0000\u0000}~\u0001\u0000\u0000\u0000~\u0080\u0001\u0000"+
- "\u0000\u0000\u007f}\u0001\u0000\u0000\u0000\u0080\u0081\u0005f\u0000\u0000"+
- "\u0081\u0082\u0005o\u0000\u0000\u0082\u0083\u0005r\u0000\u0000\u0083\u0084"+
- "\u0001\u0000\u0000\u0000\u0084\u0085\u0003\u0016\t\u0000\u0085\u0005\u0001"+
- "\u0000\u0000\u0000\u0086\u008b\u0005[\u0000\u0000\u0087\u008a\u0003\u0016"+
- "\t\u0000\u0088\u008a\u0003\u001c\f\u0000\u0089\u0087\u0001\u0000\u0000"+
- "\u0000\u0089\u0088\u0001\u0000\u0000\u0000\u008a\u008d\u0001\u0000\u0000"+
- "\u0000\u008b\u0089\u0001\u0000\u0000\u0000\u008b\u008c\u0001\u0000\u0000"+
- "\u0000\u008c\u008e\u0001\u0000\u0000\u0000\u008d\u008b\u0001\u0000\u0000"+
- "\u0000\u008e\u008f\u0005f\u0000\u0000\u008f\u0090\u0005o\u0000\u0000\u0090"+
- "\u0091\u0005r\u0000\u0000\u0091\u0092\u0001\u0000\u0000\u0000\u0092\u0093"+
- "\u0003\u0016\t\u0000\u0093\u0007\u0001\u0000\u0000\u0000\u0094\u0095\u0005"+
- "i\u0000\u0000\u0095\u0096\u0005f\u0000\u0000\u0096\t\u0001\u0000\u0000"+
- "\u0000\u0097\u0098\u0005i\u0000\u0000\u0098\u0099\u0005n\u0000\u0000\u0099"+
- "\u000b\u0001\u0000\u0000\u0000\u009a\u009b\u0005{\u0000\u0000\u009b\u009c"+
- "\u0006\u0004\u0000\u0000\u009c\r\u0001\u0000\u0000\u0000\u009d\u009e\u0005"+
- "}\u0000\u0000\u009e\u009f\u0006\u0005\u0001\u0000\u009f\u000f\u0001\u0000"+
- "\u0000\u0000\u00a0\u00a1\u0005=\u0000\u0000\u00a1\u0011\u0001\u0000\u0000"+
- "\u0000\u00a2\u00a5\b\u0000\u0000\u0000\u00a3\u00a5\u0003\"\u000f\u0000"+
- "\u00a4\u00a2\u0001\u0000\u0000\u0000\u00a4\u00a3\u0001\u0000\u0000\u0000"+
- "\u00a5\u0013\u0001\u0000\u0000\u0000\u00a6\u00ab\u0003 \u000e\u0000\u00a7"+
- "\u00aa\u0003\u001e\r\u0000\u00a8\u00aa\u0005-\u0000\u0000\u00a9\u00a7"+
- "\u0001\u0000\u0000\u0000\u00a9\u00a8\u0001\u0000\u0000\u0000\u00aa\u00ad"+
- "\u0001\u0000\u0000\u0000\u00ab\u00a9\u0001\u0000\u0000\u0000\u00ab\u00ac"+
- "\u0001\u0000\u0000\u0000\u00ac\u0015\u0001\u0000\u0000\u0000\u00ad\u00ab"+
- "\u0001\u0000\u0000\u0000\u00ae\u00b0\u0007\u0001\u0000\u0000\u00af\u00ae"+
- "\u0001\u0000\u0000\u0000\u00b0\u00b1\u0001\u0000\u0000\u0000\u00b1\u00af"+
- "\u0001\u0000\u0000\u0000\u00b1\u00b2\u0001\u0000\u0000\u0000\u00b2\u00b3"+
- "\u0001\u0000\u0000\u0000\u00b3\u00b4\u0006\t\u0002\u0000\u00b4\u0017\u0001"+
- "\u0000\u0000\u0000\u00b5\u00b6\u0005/\u0000\u0000\u00b6\u00b7\u0005*\u0000"+
- "\u0000\u00b7\u00bb\u0001\u0000\u0000\u0000\u00b8\u00ba\t\u0000\u0000\u0000"+
- "\u00b9\u00b8\u0001\u0000\u0000\u0000\u00ba\u00bd\u0001\u0000\u0000\u0000"+
- "\u00bb\u00bc\u0001\u0000\u0000\u0000\u00bb\u00b9\u0001\u0000\u0000\u0000"+
- "\u00bc\u00be\u0001\u0000\u0000\u0000\u00bd\u00bb\u0001\u0000\u0000\u0000"+
- "\u00be\u00bf\u0005*\u0000\u0000\u00bf\u00c0\u0005/\u0000\u0000\u00c0\u00c1"+
- "\u0001\u0000\u0000\u0000\u00c1\u00c2\u0006\n\u0002\u0000\u00c2\u0019\u0001"+
- "\u0000\u0000\u0000\u00c3\u00c4\u0005/\u0000\u0000\u00c4\u00c7\u0005/\u0000"+
- "\u0000\u00c5\u00c7\u0005#\u0000\u0000\u00c6\u00c3\u0001\u0000\u0000\u0000"+
- "\u00c6\u00c5\u0001\u0000\u0000\u0000\u00c7\u00cb\u0001\u0000\u0000\u0000"+
- "\u00c8\u00ca\b\u0002\u0000\u0000\u00c9\u00c8\u0001\u0000\u0000\u0000\u00ca"+
- "\u00cd\u0001\u0000\u0000\u0000\u00cb\u00c9\u0001\u0000\u0000\u0000\u00cb"+
- "\u00cc\u0001\u0000\u0000\u0000\u00cc\u00cf\u0001\u0000\u0000\u0000\u00cd"+
- "\u00cb\u0001\u0000\u0000\u0000\u00ce\u00d0\u0005\r\u0000\u0000\u00cf\u00ce"+
- "\u0001\u0000\u0000\u0000\u00cf\u00d0\u0001\u0000\u0000\u0000\u00d0\u00d1"+
- "\u0001\u0000\u0000\u0000\u00d1\u00d2\u0005\n\u0000\u0000\u00d2\u00d3\u0001"+
- "\u0000\u0000\u0000\u00d3\u00d4\u0006\u000b\u0002\u0000\u00d4\u001b\u0001"+
- "\u0000\u0000\u0000\u00d5\u00d6\u0005\n\u0000\u0000\u00d6\u00d7\u0001\u0000"+
- "\u0000\u0000\u00d7\u00d8\u0006\f\u0002\u0000\u00d8\u001d\u0001\u0000\u0000"+
- "\u0000\u00d9\u00dc\u0003 \u000e\u0000\u00da\u00dc\u0007\u0003\u0000\u0000"+
- "\u00db\u00d9\u0001\u0000\u0000\u0000\u00db\u00da\u0001\u0000\u0000\u0000"+
- "\u00dc\u001f\u0001\u0000\u0000\u0000\u00dd\u00e2\u0007\u0004\u0000\u0000"+
- "\u00de\u00e2\b\u0005\u0000\u0000\u00df\u00e0\u0007\u0006\u0000\u0000\u00e0"+
- "\u00e2\u0007\u0007\u0000\u0000\u00e1\u00dd\u0001\u0000\u0000\u0000\u00e1"+
- "\u00de\u0001\u0000\u0000\u0000\u00e1\u00df\u0001\u0000\u0000\u0000\u00e2"+
- "!\u0001\u0000\u0000\u0000\u00e3\u00e4\u0005\\\u0000\u0000\u00e4\u00f6"+
- "\u0007\b\u0000\u0000\u00e5\u00e6\u0005\\\u0000\u0000\u00e6\u00e7\u0003"+
- "$\u0010\u0000\u00e7\u00e8\u0003$\u0010\u0000\u00e8\u00e9\u0003$\u0010"+
- "\u0000\u00e9\u00ea\u0003$\u0010\u0000\u00ea\u00f6\u0001\u0000\u0000\u0000"+
- "\u00eb\u00ec\u0005\\\u0000\u0000\u00ec\u00ed\u0003$\u0010\u0000\u00ed"+
- "\u00ee\u0003$\u0010\u0000\u00ee\u00ef\u0003$\u0010\u0000\u00ef\u00f0\u0003"+
- "$\u0010\u0000\u00f0\u00f1\u0003$\u0010\u0000\u00f1\u00f2\u0003$\u0010"+
- "\u0000\u00f2\u00f3\u0003$\u0010\u0000\u00f3\u00f4\u0003$\u0010\u0000\u00f4"+
- "\u00f6\u0001\u0000\u0000\u0000\u00f5\u00e3\u0001\u0000\u0000\u0000\u00f5"+
- "\u00e5\u0001\u0000\u0000\u0000\u00f5\u00eb\u0001\u0000\u0000\u0000\u00f6"+
- "#\u0001\u0000\u0000\u0000\u00f7\u00f8\u0007\t\u0000\u0000\u00f8%\u0001"+
- "\u0000\u0000\u0000\u00f9\u00fb\u0007\u0003\u0000\u0000\u00fa\u00f9\u0001"+
- "\u0000\u0000\u0000\u00fb\u00fc\u0001\u0000\u0000\u0000\u00fc\u00fa\u0001"+
- "\u0000\u0000\u0000\u00fc\u00fd\u0001\u0000\u0000\u0000\u00fd\u00fe\u0001"+
- "\u0000\u0000\u0000\u00fe\u0102\u0005.\u0000\u0000\u00ff\u0101\u0007\u0003"+
- "\u0000\u0000\u0100\u00ff\u0001\u0000\u0000\u0000\u0101\u0104\u0001\u0000"+
- "\u0000\u0000\u0102\u0100\u0001\u0000\u0000\u0000\u0102\u0103\u0001\u0000"+
- "\u0000\u0000\u0103\u0106\u0001\u0000\u0000\u0000\u0104\u0102\u0001\u0000"+
- "\u0000\u0000\u0105\u0107\u0003(\u0012\u0000\u0106\u0105\u0001\u0000\u0000"+
- "\u0000\u0106\u0107\u0001\u0000\u0000\u0000\u0107\u0114\u0001\u0000\u0000"+
- "\u0000\u0108\u010a\u0007\u0003\u0000\u0000\u0109\u0108\u0001\u0000\u0000"+
- "\u0000\u010a\u010b\u0001\u0000\u0000\u0000\u010b\u0109\u0001\u0000\u0000"+
- "\u0000\u010b\u010c\u0001\u0000\u0000\u0000\u010c\u010d\u0001\u0000\u0000"+
- "\u0000\u010d\u0114\u0003(\u0012\u0000\u010e\u0110\u0007\u0003\u0000\u0000"+
- "\u010f\u010e\u0001\u0000\u0000\u0000\u0110\u0111\u0001\u0000\u0000\u0000"+
- "\u0111\u010f\u0001\u0000\u0000\u0000\u0111\u0112\u0001\u0000\u0000\u0000"+
- "\u0112\u0114\u0001\u0000\u0000\u0000\u0113\u00fa\u0001\u0000\u0000\u0000"+
- "\u0113\u0109\u0001\u0000\u0000\u0000\u0113\u010f\u0001\u0000\u0000\u0000"+
- "\u0114\'\u0001\u0000\u0000\u0000\u0115\u0117\u0007\n\u0000\u0000\u0116"+
- "\u0118\u0007\u000b\u0000\u0000\u0117\u0116\u0001\u0000\u0000\u0000\u0117"+
- "\u0118\u0001\u0000\u0000\u0000\u0118\u011a\u0001\u0000\u0000\u0000\u0119"+
- "\u011b\u0007\u0003\u0000\u0000\u011a\u0119\u0001\u0000\u0000\u0000\u011b"+
- "\u011c\u0001\u0000\u0000\u0000\u011c\u011a\u0001\u0000\u0000\u0000\u011c"+
- "\u011d\u0001\u0000\u0000\u0000\u011d)\u0001\u0000\u0000\u0000\u011e\u011f"+
- "\u0005t\u0000\u0000\u011f\u0120\u0005r\u0000\u0000\u0120\u0121\u0005u"+
- "\u0000\u0000\u0121\u0128\u0005e\u0000\u0000\u0122\u0123\u0005f\u0000\u0000"+
- "\u0123\u0124\u0005a\u0000\u0000\u0124\u0125\u0005l\u0000\u0000\u0125\u0126"+
- "\u0005s\u0000\u0000\u0126\u0128\u0005e\u0000\u0000\u0127\u011e\u0001\u0000"+
- "\u0000\u0000\u0127\u0122\u0001\u0000\u0000\u0000\u0128+\u0001\u0000\u0000"+
- "\u0000\u0129\u012a\u0005\"\u0000\u0000\u012a\u012b\u0001\u0000\u0000\u0000"+
- "\u012b\u012c\u0006\u0014\u0003\u0000\u012c-\u0001\u0000\u0000\u0000\u012d"+
- "\u012e\u0005n\u0000\u0000\u012e\u012f\u0005u\u0000\u0000\u012f\u0130\u0005"+
- "l\u0000\u0000\u0130\u0131\u0005l\u0000\u0000\u0131/\u0001\u0000\u0000"+
- "\u0000\u0132\u0133\u0005<\u0000\u0000\u0133\u0134\u0005<\u0000\u0000\u0134"+
- "\u0136\u0001\u0000\u0000\u0000\u0135\u0137\u0005-\u0000\u0000\u0136\u0135"+
- "\u0001\u0000\u0000\u0000\u0136\u0137\u0001\u0000\u0000\u0000\u0137\u0138"+
- "\u0001\u0000\u0000\u0000\u0138\u0139\u0006\u0016\u0004\u0000\u01391\u0001"+
- "\u0000\u0000\u0000\u013a\u013b\u0005+\u0000\u0000\u013b3\u0001\u0000\u0000"+
- "\u0000\u013c\u013d\u0005&\u0000\u0000\u013d\u013e\u0005&\u0000\u0000\u013e"+
- "5\u0001\u0000\u0000\u0000\u013f\u0140\u0005=\u0000\u0000\u0140\u0141\u0005"+
- "=\u0000\u0000\u01417\u0001\u0000\u0000\u0000\u0142\u0143\u0005<\u0000"+
- "\u0000\u01439\u0001\u0000\u0000\u0000\u0144\u0145\u0005:\u0000\u0000\u0145"+
- ";\u0001\u0000\u0000\u0000\u0146\u0147\u0005[\u0000\u0000\u0147=\u0001"+
- "\u0000\u0000\u0000\u0148\u0149\u0005(\u0000\u0000\u0149?\u0001\u0000\u0000"+
- "\u0000\u014a\u014b\u0005-\u0000\u0000\u014bA\u0001\u0000\u0000\u0000\u014c"+
- "\u014d\u0005|\u0000\u0000\u014d\u014e\u0005|\u0000\u0000\u014eC\u0001"+
- "\u0000\u0000\u0000\u014f\u0150\u0005!\u0000\u0000\u0150\u0151\u0005=\u0000"+
- "\u0000\u0151E\u0001\u0000\u0000\u0000\u0152\u0153\u0005>\u0000\u0000\u0153"+
- "G\u0001\u0000\u0000\u0000\u0154\u0155\u0005?\u0000\u0000\u0155I\u0001"+
- "\u0000\u0000\u0000\u0156\u0157\u0005]\u0000\u0000\u0157K\u0001\u0000\u0000"+
- "\u0000\u0158\u0159\u0005)\u0000\u0000\u0159M\u0001\u0000\u0000\u0000\u015a"+
- "\u015b\u0005*\u0000\u0000\u015bO\u0001\u0000\u0000\u0000\u015c\u015d\u0005"+
- "!\u0000\u0000\u015dQ\u0001\u0000\u0000\u0000\u015e\u015f\u0005<\u0000"+
- "\u0000\u015f\u0160\u0005=\u0000\u0000\u0160S\u0001\u0000\u0000\u0000\u0161"+
- "\u0162\u0005.\u0000\u0000\u0162U\u0001\u0000\u0000\u0000\u0163\u0164\u0005"+
- "/\u0000\u0000\u0164W\u0001\u0000\u0000\u0000\u0165\u0166\u0005>\u0000"+
- "\u0000\u0166\u0167\u0005=\u0000\u0000\u0167Y\u0001\u0000\u0000\u0000\u0168"+
- "\u0169\u0005=\u0000\u0000\u0169\u016a\u0005>\u0000\u0000\u016a[\u0001"+
- "\u0000\u0000\u0000\u016b\u016c\u0005,\u0000\u0000\u016c]\u0001\u0000\u0000"+
- "\u0000\u016d\u016e\u0005%\u0000\u0000\u016e_\u0001\u0000\u0000\u0000\u016f"+
- "\u0170\u0005.\u0000\u0000\u0170\u0171\u0005.\u0000\u0000\u0171\u0172\u0005"+
- ".\u0000\u0000\u0172a\u0001\u0000\u0000\u0000\u0173\u0174\u0005~\u0000"+
- "\u0000\u0174c\u0001\u0000\u0000\u0000\u0175\u0176\u0005$\u0000\u0000\u0176"+
- "\u0177\u0005{\u0000\u0000\u0177\u0178\u0001\u0000\u0000\u0000\u0178\u0179"+
- "\u00060\u0005\u0000\u0179\u017a\u0001\u0000\u0000\u0000\u017a\u017b\u0006"+
- "0\u0006\u0000\u017be\u0001\u0000\u0000\u0000\u017c\u017e\u0003h2\u0000"+
- "\u017d\u017c\u0001\u0000\u0000\u0000\u017e\u017f\u0001\u0000\u0000\u0000"+
- "\u017f\u017d\u0001\u0000\u0000\u0000\u017f\u0180\u0001\u0000\u0000\u0000"+
- "\u0180g\u0001\u0000\u0000\u0000\u0181\u018c\b\u0000\u0000\u0000\u0182"+
- "\u0183\u0005$\u0000\u0000\u0183\u018c\u0005$\u0000\u0000\u0184\u0185\u0005"+
- "$\u0000\u0000\u0185\u018c\u00042\u0000\u0000\u0186\u0187\u0005%\u0000"+
- "\u0000\u0187\u018c\u0005%\u0000\u0000\u0188\u0189\u0005%\u0000\u0000\u0189"+
- "\u018c\u00042\u0001\u0000\u018a\u018c\u0003\"\u000f\u0000\u018b\u0181"+
- "\u0001\u0000\u0000\u0000\u018b\u0182\u0001\u0000\u0000\u0000\u018b\u0184"+
- "\u0001\u0000\u0000\u0000\u018b\u0186\u0001\u0000\u0000\u0000\u018b\u0188"+
- "\u0001\u0000\u0000\u0000\u018b\u018a\u0001\u0000\u0000\u0000\u018ci\u0001"+
- "\u0000\u0000\u0000\u018d\u018e\u0005\"\u0000\u0000\u018e\u018f\u0001\u0000"+
- "\u0000\u0000\u018f\u0190\u00063\u0007\u0000\u0190\u0191\u00063\b\u0000"+
- "\u0191k\u0001\u0000\u0000\u0000\u0192\u0193\u0005\n\u0000\u0000\u0193"+
- "\u0194\u0001\u0000\u0000\u0000\u0194\u0195\u00064\t\u0000\u0195\u0196"+
- "\u00064\n\u0000\u0196m\u0001\u0000\u0000\u0000\u0197\u019c\u0003 \u000e"+
- "\u0000\u0198\u019b\u0003\u001e\r\u0000\u0199\u019b\u0005-\u0000\u0000"+
- "\u019a\u0198\u0001\u0000\u0000\u0000\u019a\u0199\u0001\u0000\u0000\u0000"+
- "\u019b\u019e\u0001\u0000\u0000\u0000\u019c\u019a\u0001\u0000\u0000\u0000"+
- "\u019c\u019d\u0001\u0000\u0000\u0000\u019d\u019f\u0001\u0000\u0000\u0000"+
- "\u019e\u019c\u0001\u0000\u0000\u0000\u019f\u01a0\u00065\u000b\u0000\u01a0"+
- "\u01a1\u0001\u0000\u0000\u0000\u01a1\u01a2\u00065\f\u0000\u01a2o\u0001"+
- "\u0000\u0000\u0000\u01a3\u01a4\u0005\n\u0000\u0000\u01a4\u01a5\u0001\u0000"+
- "\u0000\u0000\u01a5\u01a6\u00066\t\u0000\u01a6q\u0001\u0000\u0000\u0000"+
- "\u01a7\u01a8\u0005$\u0000\u0000\u01a8\u01a9\u0005{\u0000\u0000\u01a9\u01aa"+
- "\u0001\u0000\u0000\u0000\u01aa\u01ab\u00067\r\u0000\u01ab\u01ac\u0001"+
- "\u0000\u0000\u0000\u01ac\u01ad\u00067\u000e\u0000\u01ad\u01ae\u00067\u0006"+
- "\u0000\u01aes\u0001\u0000\u0000\u0000\u01af\u01b1\u0003v9\u0000\u01b0"+
- "\u01af\u0001\u0000\u0000\u0000\u01b1\u01b2\u0001\u0000\u0000\u0000\u01b2"+
- "\u01b0\u0001\u0000\u0000\u0000\u01b2\u01b3\u0001\u0000\u0000\u0000\u01b3"+
- "\u01b4\u0001\u0000\u0000\u0000\u01b4\u01b5\u00068\u000f\u0000\u01b5u\u0001"+
- "\u0000\u0000\u0000\u01b6\u01bd\b\f\u0000\u0000\u01b7\u01b8\u0005$\u0000"+
- "\u0000\u01b8\u01bd\b\r\u0000\u0000\u01b9\u01ba\u0005%\u0000\u0000\u01ba"+
- "\u01bd\b\r\u0000\u0000\u01bb\u01bd\u0003\"\u000f\u0000\u01bc\u01b6\u0001"+
- "\u0000\u0000\u0000\u01bc\u01b7\u0001\u0000\u0000\u0000\u01bc\u01b9\u0001"+
- "\u0000\u0000\u0000\u01bc\u01bb\u0001\u0000\u0000\u0000\u01bdw\u0001\u0000"+
- "\u0000\u0000#\u0000\u0001\u0002\u0003{}\u0089\u008b\u00a4\u00a9\u00ab"+
- "\u00b1\u00bb\u00c6\u00cb\u00cf\u00db\u00e1\u00f5\u00fc\u0102\u0106\u010b"+
- "\u0111\u0113\u0117\u011c\u0127\u0136\u017f\u018b\u019a\u019c\u01b2\u01bc"+
- "\u0010\u0001\u0004\u0000\u0001\u0005\u0001\u0000\u0001\u0000\u0005\u0001"+
- "\u0000\u0005\u0002\u0000\u00010\u0002\u0005\u0000\u0000\u0007\u000f\u0000"+
- "\u0004\u0000\u0000\u0007\f\u0000\u0002\u0003\u0000\u00015\u0003\u0007"+
- "\b\u0000\u00017\u0004\u0007+\u0000\u00018\u0005";
+ "\u0000\u0000\u0004x\u0001\u0000\u0000\u0000\u0006\u0088\u0001\u0000\u0000"+
+ "\u0000\b\u0098\u0001\u0000\u0000\u0000\n\u009b\u0001\u0000\u0000\u0000"+
+ "\f\u009e\u0001\u0000\u0000\u0000\u000e\u00a1\u0001\u0000\u0000\u0000\u0010"+
+ "\u00a4\u0001\u0000\u0000\u0000\u0012\u00a8\u0001\u0000\u0000\u0000\u0014"+
+ "\u00aa\u0001\u0000\u0000\u0000\u0016\u00b3\u0001\u0000\u0000\u0000\u0018"+
+ "\u00b9\u0001\u0000\u0000\u0000\u001a\u00ca\u0001\u0000\u0000\u0000\u001c"+
+ "\u00da\u0001\u0000\u0000\u0000\u001e\u00e0\u0001\u0000\u0000\u0000 \u00e6"+
+ "\u0001\u0000\u0000\u0000\"\u00fa\u0001\u0000\u0000\u0000$\u00fc\u0001"+
+ "\u0000\u0000\u0000&\u0117\u0001\u0000\u0000\u0000(\u0119\u0001\u0000\u0000"+
+ "\u0000*\u012b\u0001\u0000\u0000\u0000,\u012d\u0001\u0000\u0000\u0000."+
+ "\u0131\u0001\u0000\u0000\u00000\u0136\u0001\u0000\u0000\u00002\u013e\u0001"+
+ "\u0000\u0000\u00004\u0140\u0001\u0000\u0000\u00006\u0143\u0001\u0000\u0000"+
+ "\u00008\u0146\u0001\u0000\u0000\u0000:\u0148\u0001\u0000\u0000\u0000<"+
+ "\u014a\u0001\u0000\u0000\u0000>\u014c\u0001\u0000\u0000\u0000@\u014e\u0001"+
+ "\u0000\u0000\u0000B\u0150\u0001\u0000\u0000\u0000D\u0153\u0001\u0000\u0000"+
+ "\u0000F\u0156\u0001\u0000\u0000\u0000H\u0158\u0001\u0000\u0000\u0000J"+
+ "\u015a\u0001\u0000\u0000\u0000L\u015c\u0001\u0000\u0000\u0000N\u015e\u0001"+
+ "\u0000\u0000\u0000P\u0160\u0001\u0000\u0000\u0000R\u0162\u0001\u0000\u0000"+
+ "\u0000T\u0165\u0001\u0000\u0000\u0000V\u0167\u0001\u0000\u0000\u0000X"+
+ "\u0169\u0001\u0000\u0000\u0000Z\u016c\u0001\u0000\u0000\u0000\\\u016f"+
+ "\u0001\u0000\u0000\u0000^\u0171\u0001\u0000\u0000\u0000`\u0173\u0001\u0000"+
+ "\u0000\u0000b\u0177\u0001\u0000\u0000\u0000d\u0179\u0001\u0000\u0000\u0000"+
+ "f\u0181\u0001\u0000\u0000\u0000h\u018f\u0001\u0000\u0000\u0000j\u0191"+
+ "\u0001\u0000\u0000\u0000l\u0196\u0001\u0000\u0000\u0000n\u019b\u0001\u0000"+
+ "\u0000\u0000p\u01a7\u0001\u0000\u0000\u0000r\u01ab\u0001\u0000\u0000\u0000"+
+ "t\u01b4\u0001\u0000\u0000\u0000v\u01c0\u0001\u0000\u0000\u0000x\u007f"+
+ "\u0005{\u0000\u0000y~\u0003\u0016\t\u0000z~\u0003\u001c\f\u0000{~\u0003"+
+ "\u0018\n\u0000|~\u0003\u001a\u000b\u0000}y\u0001\u0000\u0000\u0000}z\u0001"+
+ "\u0000\u0000\u0000}{\u0001\u0000\u0000\u0000}|\u0001\u0000\u0000\u0000"+
+ "~\u0081\u0001\u0000\u0000\u0000\u007f}\u0001\u0000\u0000\u0000\u007f\u0080"+
+ "\u0001\u0000\u0000\u0000\u0080\u0082\u0001\u0000\u0000\u0000\u0081\u007f"+
+ "\u0001\u0000\u0000\u0000\u0082\u0083\u0005f\u0000\u0000\u0083\u0084\u0005"+
+ "o\u0000\u0000\u0084\u0085\u0005r\u0000\u0000\u0085\u0086\u0001\u0000\u0000"+
+ "\u0000\u0086\u0087\u0003\u0016\t\u0000\u0087\u0005\u0001\u0000\u0000\u0000"+
+ "\u0088\u008f\u0005[\u0000\u0000\u0089\u008e\u0003\u0016\t\u0000\u008a"+
+ "\u008e\u0003\u001c\f\u0000\u008b\u008e\u0003\u0018\n\u0000\u008c\u008e"+
+ "\u0003\u001a\u000b\u0000\u008d\u0089\u0001\u0000\u0000\u0000\u008d\u008a"+
+ "\u0001\u0000\u0000\u0000\u008d\u008b\u0001\u0000\u0000\u0000\u008d\u008c"+
+ "\u0001\u0000\u0000\u0000\u008e\u0091\u0001\u0000\u0000\u0000\u008f\u008d"+
+ "\u0001\u0000\u0000\u0000\u008f\u0090\u0001\u0000\u0000\u0000\u0090\u0092"+
+ "\u0001\u0000\u0000\u0000\u0091\u008f\u0001\u0000\u0000\u0000\u0092\u0093"+
+ "\u0005f\u0000\u0000\u0093\u0094\u0005o\u0000\u0000\u0094\u0095\u0005r"+
+ "\u0000\u0000\u0095\u0096\u0001\u0000\u0000\u0000\u0096\u0097\u0003\u0016"+
+ "\t\u0000\u0097\u0007\u0001\u0000\u0000\u0000\u0098\u0099\u0005i\u0000"+
+ "\u0000\u0099\u009a\u0005f\u0000\u0000\u009a\t\u0001\u0000\u0000\u0000"+
+ "\u009b\u009c\u0005i\u0000\u0000\u009c\u009d\u0005n\u0000\u0000\u009d\u000b"+
+ "\u0001\u0000\u0000\u0000\u009e\u009f\u0005{\u0000\u0000\u009f\u00a0\u0006"+
+ "\u0004\u0000\u0000\u00a0\r\u0001\u0000\u0000\u0000\u00a1\u00a2\u0005}"+
+ "\u0000\u0000\u00a2\u00a3\u0006\u0005\u0001\u0000\u00a3\u000f\u0001\u0000"+
+ "\u0000\u0000\u00a4\u00a5\u0005=\u0000\u0000\u00a5\u0011\u0001\u0000\u0000"+
+ "\u0000\u00a6\u00a9\b\u0000\u0000\u0000\u00a7\u00a9\u0003\"\u000f\u0000"+
+ "\u00a8\u00a6\u0001\u0000\u0000\u0000\u00a8\u00a7\u0001\u0000\u0000\u0000"+
+ "\u00a9\u0013\u0001\u0000\u0000\u0000\u00aa\u00af\u0003 \u000e\u0000\u00ab"+
+ "\u00ae\u0003\u001e\r\u0000\u00ac\u00ae\u0005-\u0000\u0000\u00ad\u00ab"+
+ "\u0001\u0000\u0000\u0000\u00ad\u00ac\u0001\u0000\u0000\u0000\u00ae\u00b1"+
+ "\u0001\u0000\u0000\u0000\u00af\u00ad\u0001\u0000\u0000\u0000\u00af\u00b0"+
+ "\u0001\u0000\u0000\u0000\u00b0\u0015\u0001\u0000\u0000\u0000\u00b1\u00af"+
+ "\u0001\u0000\u0000\u0000\u00b2\u00b4\u0007\u0001\u0000\u0000\u00b3\u00b2"+
+ "\u0001\u0000\u0000\u0000\u00b4\u00b5\u0001\u0000\u0000\u0000\u00b5\u00b3"+
+ "\u0001\u0000\u0000\u0000\u00b5\u00b6\u0001\u0000\u0000\u0000\u00b6\u00b7"+
+ "\u0001\u0000\u0000\u0000\u00b7\u00b8\u0006\t\u0002\u0000\u00b8\u0017\u0001"+
+ "\u0000\u0000\u0000\u00b9\u00ba\u0005/\u0000\u0000\u00ba\u00bb\u0005*\u0000"+
+ "\u0000\u00bb\u00bf\u0001\u0000\u0000\u0000\u00bc\u00be\t\u0000\u0000\u0000"+
+ "\u00bd\u00bc\u0001\u0000\u0000\u0000\u00be\u00c1\u0001\u0000\u0000\u0000"+
+ "\u00bf\u00c0\u0001\u0000\u0000\u0000\u00bf\u00bd\u0001\u0000\u0000\u0000"+
+ "\u00c0\u00c2\u0001\u0000\u0000\u0000\u00c1\u00bf\u0001\u0000\u0000\u0000"+
+ "\u00c2\u00c3\u0005*\u0000\u0000\u00c3\u00c4\u0005/\u0000\u0000\u00c4\u00c5"+
+ "\u0001\u0000\u0000\u0000\u00c5\u00c6\u0006\n\u0002\u0000\u00c6\u0019\u0001"+
+ "\u0000\u0000\u0000\u00c7\u00c8\u0005/\u0000\u0000\u00c8\u00cb\u0005/\u0000"+
+ "\u0000\u00c9\u00cb\u0005#\u0000\u0000\u00ca\u00c7\u0001\u0000\u0000\u0000"+
+ "\u00ca\u00c9\u0001\u0000\u0000\u0000\u00cb\u00cf\u0001\u0000\u0000\u0000"+
+ "\u00cc\u00ce\b\u0002\u0000\u0000\u00cd\u00cc\u0001\u0000\u0000\u0000\u00ce"+
+ "\u00d1\u0001\u0000\u0000\u0000\u00cf\u00cd\u0001\u0000\u0000\u0000\u00cf"+
+ "\u00d0\u0001\u0000\u0000\u0000\u00d0\u00d3\u0001\u0000\u0000\u0000\u00d1"+
+ "\u00cf\u0001\u0000\u0000\u0000\u00d2\u00d4\u0005\r\u0000\u0000\u00d3\u00d2"+
+ "\u0001\u0000\u0000\u0000\u00d3\u00d4\u0001\u0000\u0000\u0000\u00d4\u00d6"+
+ "\u0001\u0000\u0000\u0000\u00d5\u00d7\u0007\u0003\u0000\u0000\u00d6\u00d5"+
+ "\u0001\u0000\u0000\u0000\u00d7\u00d8\u0001\u0000\u0000\u0000\u00d8\u00d9"+
+ "\u0006\u000b\u0002\u0000\u00d9\u001b\u0001\u0000\u0000\u0000\u00da\u00db"+
+ "\u0005\n\u0000\u0000\u00db\u00dc\u0001\u0000\u0000\u0000\u00dc\u00dd\u0006"+
+ "\f\u0002\u0000\u00dd\u001d\u0001\u0000\u0000\u0000\u00de\u00e1\u0003 "+
+ "\u000e\u0000\u00df\u00e1\u0007\u0004\u0000\u0000\u00e0\u00de\u0001\u0000"+
+ "\u0000\u0000\u00e0\u00df\u0001\u0000\u0000\u0000\u00e1\u001f\u0001\u0000"+
+ "\u0000\u0000\u00e2\u00e7\u0007\u0005\u0000\u0000\u00e3\u00e7\b\u0006\u0000"+
+ "\u0000\u00e4\u00e5\u0007\u0007\u0000\u0000\u00e5\u00e7\u0007\b\u0000\u0000"+
+ "\u00e6\u00e2\u0001\u0000\u0000\u0000\u00e6\u00e3\u0001\u0000\u0000\u0000"+
+ "\u00e6\u00e4\u0001\u0000\u0000\u0000\u00e7!\u0001\u0000\u0000\u0000\u00e8"+
+ "\u00e9\u0005\\\u0000\u0000\u00e9\u00fb\u0007\t\u0000\u0000\u00ea\u00eb"+
+ "\u0005\\\u0000\u0000\u00eb\u00ec\u0003$\u0010\u0000\u00ec\u00ed\u0003"+
+ "$\u0010\u0000\u00ed\u00ee\u0003$\u0010\u0000\u00ee\u00ef\u0003$\u0010"+
+ "\u0000\u00ef\u00fb\u0001\u0000\u0000\u0000\u00f0\u00f1\u0005\\\u0000\u0000"+
+ "\u00f1\u00f2\u0003$\u0010\u0000\u00f2\u00f3\u0003$\u0010\u0000\u00f3\u00f4"+
+ "\u0003$\u0010\u0000\u00f4\u00f5\u0003$\u0010\u0000\u00f5\u00f6\u0003$"+
+ "\u0010\u0000\u00f6\u00f7\u0003$\u0010\u0000\u00f7\u00f8\u0003$\u0010\u0000"+
+ "\u00f8\u00f9\u0003$\u0010\u0000\u00f9\u00fb\u0001\u0000\u0000\u0000\u00fa"+
+ "\u00e8\u0001\u0000\u0000\u0000\u00fa\u00ea\u0001\u0000\u0000\u0000\u00fa"+
+ "\u00f0\u0001\u0000\u0000\u0000\u00fb#\u0001\u0000\u0000\u0000\u00fc\u00fd"+
+ "\u0007\n\u0000\u0000\u00fd%\u0001\u0000\u0000\u0000\u00fe\u0100\u0007"+
+ "\u0004\u0000\u0000\u00ff\u00fe\u0001\u0000\u0000\u0000\u0100\u0101\u0001"+
+ "\u0000\u0000\u0000\u0101\u00ff\u0001\u0000\u0000\u0000\u0101\u0102\u0001"+
+ "\u0000\u0000\u0000\u0102\u0103\u0001\u0000\u0000\u0000\u0103\u0105\u0005"+
+ ".\u0000\u0000\u0104\u0106\u0007\u0004\u0000\u0000\u0105\u0104\u0001\u0000"+
+ "\u0000\u0000\u0106\u0107\u0001\u0000\u0000\u0000\u0107\u0105\u0001\u0000"+
+ "\u0000\u0000\u0107\u0108\u0001\u0000\u0000\u0000\u0108\u010a\u0001\u0000"+
+ "\u0000\u0000\u0109\u010b\u0003(\u0012\u0000\u010a\u0109\u0001\u0000\u0000"+
+ "\u0000\u010a\u010b\u0001\u0000\u0000\u0000\u010b\u0118\u0001\u0000\u0000"+
+ "\u0000\u010c\u010e\u0007\u0004\u0000\u0000\u010d\u010c\u0001\u0000\u0000"+
+ "\u0000\u010e\u010f\u0001\u0000\u0000\u0000\u010f\u010d\u0001\u0000\u0000"+
+ "\u0000\u010f\u0110\u0001\u0000\u0000\u0000\u0110\u0111\u0001\u0000\u0000"+
+ "\u0000\u0111\u0118\u0003(\u0012\u0000\u0112\u0114\u0007\u0004\u0000\u0000"+
+ "\u0113\u0112\u0001\u0000\u0000\u0000\u0114\u0115\u0001\u0000\u0000\u0000"+
+ "\u0115\u0113\u0001\u0000\u0000\u0000\u0115\u0116\u0001\u0000\u0000\u0000"+
+ "\u0116\u0118\u0001\u0000\u0000\u0000\u0117\u00ff\u0001\u0000\u0000\u0000"+
+ "\u0117\u010d\u0001\u0000\u0000\u0000\u0117\u0113\u0001\u0000\u0000\u0000"+
+ "\u0118\'\u0001\u0000\u0000\u0000\u0119\u011b\u0007\u000b\u0000\u0000\u011a"+
+ "\u011c\u0007\f\u0000\u0000\u011b\u011a\u0001\u0000\u0000\u0000\u011b\u011c"+
+ "\u0001\u0000\u0000\u0000\u011c\u011e\u0001\u0000\u0000\u0000\u011d\u011f"+
+ "\u0007\u0004\u0000\u0000\u011e\u011d\u0001\u0000\u0000\u0000\u011f\u0120"+
+ "\u0001\u0000\u0000\u0000\u0120\u011e\u0001\u0000\u0000\u0000\u0120\u0121"+
+ "\u0001\u0000\u0000\u0000\u0121)\u0001\u0000\u0000\u0000\u0122\u0123\u0005"+
+ "t\u0000\u0000\u0123\u0124\u0005r\u0000\u0000\u0124\u0125\u0005u\u0000"+
+ "\u0000\u0125\u012c\u0005e\u0000\u0000\u0126\u0127\u0005f\u0000\u0000\u0127"+
+ "\u0128\u0005a\u0000\u0000\u0128\u0129\u0005l\u0000\u0000\u0129\u012a\u0005"+
+ "s\u0000\u0000\u012a\u012c\u0005e\u0000\u0000\u012b\u0122\u0001\u0000\u0000"+
+ "\u0000\u012b\u0126\u0001\u0000\u0000\u0000\u012c+\u0001\u0000\u0000\u0000"+
+ "\u012d\u012e\u0005\"\u0000\u0000\u012e\u012f\u0001\u0000\u0000\u0000\u012f"+
+ "\u0130\u0006\u0014\u0003\u0000\u0130-\u0001\u0000\u0000\u0000\u0131\u0132"+
+ "\u0005n\u0000\u0000\u0132\u0133\u0005u\u0000\u0000\u0133\u0134\u0005l"+
+ "\u0000\u0000\u0134\u0135\u0005l\u0000\u0000\u0135/\u0001\u0000\u0000\u0000"+
+ "\u0136\u0137\u0005<\u0000\u0000\u0137\u0138\u0005<\u0000\u0000\u0138\u013a"+
+ "\u0001\u0000\u0000\u0000\u0139\u013b\u0005-\u0000\u0000\u013a\u0139\u0001"+
+ "\u0000\u0000\u0000\u013a\u013b\u0001\u0000\u0000\u0000\u013b\u013c\u0001"+
+ "\u0000\u0000\u0000\u013c\u013d\u0006\u0016\u0004\u0000\u013d1\u0001\u0000"+
+ "\u0000\u0000\u013e\u013f\u0005+\u0000\u0000\u013f3\u0001\u0000\u0000\u0000"+
+ "\u0140\u0141\u0005&\u0000\u0000\u0141\u0142\u0005&\u0000\u0000\u01425"+
+ "\u0001\u0000\u0000\u0000\u0143\u0144\u0005=\u0000\u0000\u0144\u0145\u0005"+
+ "=\u0000\u0000\u01457\u0001\u0000\u0000\u0000\u0146\u0147\u0005<\u0000"+
+ "\u0000\u01479\u0001\u0000\u0000\u0000\u0148\u0149\u0005:\u0000\u0000\u0149"+
+ ";\u0001\u0000\u0000\u0000\u014a\u014b\u0005[\u0000\u0000\u014b=\u0001"+
+ "\u0000\u0000\u0000\u014c\u014d\u0005(\u0000\u0000\u014d?\u0001\u0000\u0000"+
+ "\u0000\u014e\u014f\u0005-\u0000\u0000\u014fA\u0001\u0000\u0000\u0000\u0150"+
+ "\u0151\u0005|\u0000\u0000\u0151\u0152\u0005|\u0000\u0000\u0152C\u0001"+
+ "\u0000\u0000\u0000\u0153\u0154\u0005!\u0000\u0000\u0154\u0155\u0005=\u0000"+
+ "\u0000\u0155E\u0001\u0000\u0000\u0000\u0156\u0157\u0005>\u0000\u0000\u0157"+
+ "G\u0001\u0000\u0000\u0000\u0158\u0159\u0005?\u0000\u0000\u0159I\u0001"+
+ "\u0000\u0000\u0000\u015a\u015b\u0005]\u0000\u0000\u015bK\u0001\u0000\u0000"+
+ "\u0000\u015c\u015d\u0005)\u0000\u0000\u015dM\u0001\u0000\u0000\u0000\u015e"+
+ "\u015f\u0005*\u0000\u0000\u015fO\u0001\u0000\u0000\u0000\u0160\u0161\u0005"+
+ "!\u0000\u0000\u0161Q\u0001\u0000\u0000\u0000\u0162\u0163\u0005<\u0000"+
+ "\u0000\u0163\u0164\u0005=\u0000\u0000\u0164S\u0001\u0000\u0000\u0000\u0165"+
+ "\u0166\u0005.\u0000\u0000\u0166U\u0001\u0000\u0000\u0000\u0167\u0168\u0005"+
+ "/\u0000\u0000\u0168W\u0001\u0000\u0000\u0000\u0169\u016a\u0005>\u0000"+
+ "\u0000\u016a\u016b\u0005=\u0000\u0000\u016bY\u0001\u0000\u0000\u0000\u016c"+
+ "\u016d\u0005=\u0000\u0000\u016d\u016e\u0005>\u0000\u0000\u016e[\u0001"+
+ "\u0000\u0000\u0000\u016f\u0170\u0005,\u0000\u0000\u0170]\u0001\u0000\u0000"+
+ "\u0000\u0171\u0172\u0005%\u0000\u0000\u0172_\u0001\u0000\u0000\u0000\u0173"+
+ "\u0174\u0005.\u0000\u0000\u0174\u0175\u0005.\u0000\u0000\u0175\u0176\u0005"+
+ ".\u0000\u0000\u0176a\u0001\u0000\u0000\u0000\u0177\u0178\u0005~\u0000"+
+ "\u0000\u0178c\u0001\u0000\u0000\u0000\u0179\u017a\u0005$\u0000\u0000\u017a"+
+ "\u017b\u0005{\u0000\u0000\u017b\u017c\u0001\u0000\u0000\u0000\u017c\u017d"+
+ "\u00060\u0005\u0000\u017d\u017e\u0001\u0000\u0000\u0000\u017e\u017f\u0006"+
+ "0\u0006\u0000\u017fe\u0001\u0000\u0000\u0000\u0180\u0182\u0003h2\u0000"+
+ "\u0181\u0180\u0001\u0000\u0000\u0000\u0182\u0183\u0001\u0000\u0000\u0000"+
+ "\u0183\u0181\u0001\u0000\u0000\u0000\u0183\u0184\u0001\u0000\u0000\u0000"+
+ "\u0184g\u0001\u0000\u0000\u0000\u0185\u0190\b\u0000\u0000\u0000\u0186"+
+ "\u0187\u0005$\u0000\u0000\u0187\u0190\u0005$\u0000\u0000\u0188\u0189\u0005"+
+ "$\u0000\u0000\u0189\u0190\u00042\u0000\u0000\u018a\u018b\u0005%\u0000"+
+ "\u0000\u018b\u0190\u0005%\u0000\u0000\u018c\u018d\u0005%\u0000\u0000\u018d"+
+ "\u0190\u00042\u0001\u0000\u018e\u0190\u0003\"\u000f\u0000\u018f\u0185"+
+ "\u0001\u0000\u0000\u0000\u018f\u0186\u0001\u0000\u0000\u0000\u018f\u0188"+
+ "\u0001\u0000\u0000\u0000\u018f\u018a\u0001\u0000\u0000\u0000\u018f\u018c"+
+ "\u0001\u0000\u0000\u0000\u018f\u018e\u0001\u0000\u0000\u0000\u0190i\u0001"+
+ "\u0000\u0000\u0000\u0191\u0192\u0005\"\u0000\u0000\u0192\u0193\u0001\u0000"+
+ "\u0000\u0000\u0193\u0194\u00063\u0007\u0000\u0194\u0195\u00063\b\u0000"+
+ "\u0195k\u0001\u0000\u0000\u0000\u0196\u0197\u0005\n\u0000\u0000\u0197"+
+ "\u0198\u0001\u0000\u0000\u0000\u0198\u0199\u00064\t\u0000\u0199\u019a"+
+ "\u00064\n\u0000\u019am\u0001\u0000\u0000\u0000\u019b\u01a0\u0003 \u000e"+
+ "\u0000\u019c\u019f\u0003\u001e\r\u0000\u019d\u019f\u0005-\u0000\u0000"+
+ "\u019e\u019c\u0001\u0000\u0000\u0000\u019e\u019d\u0001\u0000\u0000\u0000"+
+ "\u019f\u01a2\u0001\u0000\u0000\u0000\u01a0\u019e\u0001\u0000\u0000\u0000"+
+ "\u01a0\u01a1\u0001\u0000\u0000\u0000\u01a1\u01a3\u0001\u0000\u0000\u0000"+
+ "\u01a2\u01a0\u0001\u0000\u0000\u0000\u01a3\u01a4\u00065\u000b\u0000\u01a4"+
+ "\u01a5\u0001\u0000\u0000\u0000\u01a5\u01a6\u00065\f\u0000\u01a6o\u0001"+
+ "\u0000\u0000\u0000\u01a7\u01a8\u0005\n\u0000\u0000\u01a8\u01a9\u0001\u0000"+
+ "\u0000\u0000\u01a9\u01aa\u00066\t\u0000\u01aaq\u0001\u0000\u0000\u0000"+
+ "\u01ab\u01ac\u0005$\u0000\u0000\u01ac\u01ad\u0005{\u0000\u0000\u01ad\u01ae"+
+ "\u0001\u0000\u0000\u0000\u01ae\u01af\u00067\r\u0000\u01af\u01b0\u0001"+
+ "\u0000\u0000\u0000\u01b0\u01b1\u00067\u000e\u0000\u01b1\u01b2\u00067\u0006"+
+ "\u0000\u01b2s\u0001\u0000\u0000\u0000\u01b3\u01b5\u0003v9\u0000\u01b4"+
+ "\u01b3\u0001\u0000\u0000\u0000\u01b5\u01b6\u0001\u0000\u0000\u0000\u01b6"+
+ "\u01b4\u0001\u0000\u0000\u0000\u01b6\u01b7\u0001\u0000\u0000\u0000\u01b7"+
+ "\u01b8\u0001\u0000\u0000\u0000\u01b8\u01b9\u00068\u000f\u0000\u01b9u\u0001"+
+ "\u0000\u0000\u0000\u01ba\u01c1\b\r\u0000\u0000\u01bb\u01bc\u0005$\u0000"+
+ "\u0000\u01bc\u01c1\b\u000e\u0000\u0000\u01bd\u01be\u0005%\u0000\u0000"+
+ "\u01be\u01c1\b\u000e\u0000\u0000\u01bf\u01c1\u0003\"\u000f\u0000\u01c0"+
+ "\u01ba\u0001\u0000\u0000\u0000\u01c0\u01bb\u0001\u0000\u0000\u0000\u01c0"+
+ "\u01bd\u0001\u0000\u0000\u0000\u01c0\u01bf\u0001\u0000\u0000\u0000\u01c1"+
+ "w\u0001\u0000\u0000\u0000$\u0000\u0001\u0002\u0003}\u007f\u008d\u008f"+
+ "\u00a8\u00ad\u00af\u00b5\u00bf\u00ca\u00cf\u00d3\u00d6\u00e0\u00e6\u00fa"+
+ "\u0101\u0107\u010a\u010f\u0115\u0117\u011b\u0120\u012b\u013a\u0183\u018f"+
+ "\u019e\u01a0\u01b6\u01c0\u0010\u0001\u0004\u0000\u0001\u0005\u0001\u0000"+
+ "\u0001\u0000\u0005\u0001\u0000\u0005\u0002\u0000\u00010\u0002\u0005\u0000"+
+ "\u0000\u0007\u000f\u0000\u0004\u0000\u0000\u0007\f\u0000\u0002\u0003\u0000"+
+ "\u00015\u0003\u0007\b\u0000\u00017\u0004\u0007+\u0000\u00018\u0005";
public static final ATN _ATN =
new ATNDeserializer().deserialize(_serializedATN.toCharArray());
static {
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLParser.interp b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLParser.interp
index dfee8f1641d..b80f4f5904d 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLParser.interp
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLParser.interp
@@ -123,6 +123,7 @@ functionCall
arguments
index
getAttr
+legacyIndexAttr
splat
attrSplat
fullSplat
@@ -142,4 +143,4 @@ templateInterpolation
atn:
-[4, 1, 47, 361, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 1, 0, 1, 0, 1, 1, 5, 1, 84, 8, 1, 10, 1, 12, 1, 87, 9, 1, 1, 2, 1, 2, 3, 2, 91, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 5, 4, 99, 8, 4, 10, 4, 12, 4, 102, 9, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 111, 8, 5, 1, 6, 1, 6, 1, 6, 3, 6, 116, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 5, 6, 124, 8, 6, 10, 6, 12, 6, 127, 9, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 140, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 5, 7, 148, 8, 7, 10, 7, 12, 7, 151, 9, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 3, 10, 161, 8, 10, 1, 11, 1, 11, 1, 11, 1, 11, 5, 11, 167, 8, 11, 10, 11, 12, 11, 170, 9, 11, 1, 11, 3, 11, 173, 8, 11, 3, 11, 175, 8, 11, 1, 11, 1, 11, 1, 12, 1, 12, 5, 12, 181, 8, 12, 10, 12, 12, 12, 184, 9, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 5, 13, 194, 8, 13, 10, 13, 12, 13, 197, 9, 13, 1, 13, 3, 13, 200, 8, 13, 1, 13, 1, 13, 1, 13, 3, 13, 205, 8, 13, 1, 14, 1, 14, 3, 14, 209, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 216, 8, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 3, 16, 227, 8, 16, 1, 16, 3, 16, 230, 8, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 3, 17, 237, 8, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 3, 20, 250, 8, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 5, 21, 257, 8, 21, 10, 21, 12, 21, 260, 9, 21, 1, 21, 3, 21, 263, 8, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 3, 24, 274, 8, 24, 1, 25, 1, 25, 1, 25, 5, 25, 279, 8, 25, 10, 25, 12, 25, 282, 9, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 5, 26, 289, 8, 26, 10, 26, 12, 26, 292, 9, 26, 1, 27, 1, 27, 3, 27, 296, 8, 27, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 3, 29, 303, 8, 29, 1, 29, 1, 29, 1, 29, 3, 29, 308, 8, 29, 1, 30, 1, 30, 1, 30, 3, 30, 313, 8, 30, 1, 31, 1, 31, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 34, 5, 34, 325, 8, 34, 10, 34, 12, 34, 328, 9, 34, 4, 34, 330, 8, 34, 11, 34, 12, 34, 331, 1, 34, 1, 34, 1, 34, 5, 34, 337, 8, 34, 10, 34, 12, 34, 340, 9, 34, 1, 34, 3, 34, 343, 8, 34, 1, 35, 1, 35, 3, 35, 347, 8, 35, 1, 36, 1, 36, 1, 37, 1, 37, 3, 37, 353, 8, 37, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 39, 0, 2, 12, 14, 40, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 0, 7, 2, 0, 13, 14, 16, 16, 2, 0, 7, 7, 22, 22, 2, 0, 39, 39, 41, 41, 2, 0, 25, 25, 33, 33, 4, 0, 20, 21, 27, 28, 34, 34, 37, 37, 5, 0, 18, 18, 25, 25, 32, 32, 36, 36, 40, 40, 2, 0, 19, 19, 26, 26, 367, 0, 80, 1, 0, 0, 0, 2, 85, 1, 0, 0, 0, 4, 90, 1, 0, 0, 0, 6, 92, 1, 0, 0, 0, 8, 96, 1, 0, 0, 0, 10, 110, 1, 0, 0, 0, 12, 115, 1, 0, 0, 0, 14, 139, 1, 0, 0, 0, 16, 152, 1, 0, 0, 0, 18, 156, 1, 0, 0, 0, 20, 160, 1, 0, 0, 0, 22, 162, 1, 0, 0, 0, 24, 178, 1, 0, 0, 0, 26, 199, 1, 0, 0, 0, 28, 208, 1, 0, 0, 0, 30, 210, 1, 0, 0, 0, 32, 219, 1, 0, 0, 0, 34, 233, 1, 0, 0, 0, 36, 241, 1, 0, 0, 0, 38, 244, 1, 0, 0, 0, 40, 246, 1, 0, 0, 0, 42, 253, 1, 0, 0, 0, 44, 264, 1, 0, 0, 0, 46, 268, 1, 0, 0, 0, 48, 273, 1, 0, 0, 0, 50, 275, 1, 0, 0, 0, 52, 283, 1, 0, 0, 0, 54, 295, 1, 0, 0, 0, 56, 297, 1, 0, 0, 0, 58, 302, 1, 0, 0, 0, 60, 312, 1, 0, 0, 0, 62, 314, 1, 0, 0, 0, 64, 316, 1, 0, 0, 0, 66, 318, 1, 0, 0, 0, 68, 342, 1, 0, 0, 0, 70, 346, 1, 0, 0, 0, 72, 348, 1, 0, 0, 0, 74, 352, 1, 0, 0, 0, 76, 354, 1, 0, 0, 0, 78, 356, 1, 0, 0, 0, 80, 81, 3, 2, 1, 0, 81, 1, 1, 0, 0, 0, 82, 84, 3, 4, 2, 0, 83, 82, 1, 0, 0, 0, 84, 87, 1, 0, 0, 0, 85, 83, 1, 0, 0, 0, 85, 86, 1, 0, 0, 0, 86, 3, 1, 0, 0, 0, 87, 85, 1, 0, 0, 0, 88, 91, 3, 6, 3, 0, 89, 91, 3, 8, 4, 0, 90, 88, 1, 0, 0, 0, 90, 89, 1, 0, 0, 0, 91, 5, 1, 0, 0, 0, 92, 93, 5, 8, 0, 0, 93, 94, 5, 7, 0, 0, 94, 95, 3, 12, 6, 0, 95, 7, 1, 0, 0, 0, 96, 100, 5, 8, 0, 0, 97, 99, 3, 10, 5, 0, 98, 97, 1, 0, 0, 0, 99, 102, 1, 0, 0, 0, 100, 98, 1, 0, 0, 0, 100, 101, 1, 0, 0, 0, 101, 103, 1, 0, 0, 0, 102, 100, 1, 0, 0, 0, 103, 104, 3, 16, 8, 0, 104, 9, 1, 0, 0, 0, 105, 106, 5, 15, 0, 0, 106, 107, 3, 76, 38, 0, 107, 108, 5, 15, 0, 0, 108, 111, 1, 0, 0, 0, 109, 111, 5, 8, 0, 0, 110, 105, 1, 0, 0, 0, 110, 109, 1, 0, 0, 0, 111, 11, 1, 0, 0, 0, 112, 113, 6, 6, -1, 0, 113, 116, 3, 14, 7, 0, 114, 116, 3, 54, 27, 0, 115, 112, 1, 0, 0, 0, 115, 114, 1, 0, 0, 0, 116, 125, 1, 0, 0, 0, 117, 118, 10, 1, 0, 0, 118, 119, 5, 29, 0, 0, 119, 120, 3, 12, 6, 0, 120, 121, 5, 22, 0, 0, 121, 122, 3, 12, 6, 2, 122, 124, 1, 0, 0, 0, 123, 117, 1, 0, 0, 0, 124, 127, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 125, 126, 1, 0, 0, 0, 126, 13, 1, 0, 0, 0, 127, 125, 1, 0, 0, 0, 128, 129, 6, 7, -1, 0, 129, 140, 3, 68, 34, 0, 130, 140, 3, 18, 9, 0, 131, 140, 3, 28, 14, 0, 132, 140, 3, 20, 10, 0, 133, 140, 3, 38, 19, 0, 134, 140, 3, 40, 20, 0, 135, 136, 5, 24, 0, 0, 136, 137, 3, 12, 6, 0, 137, 138, 5, 31, 0, 0, 138, 140, 1, 0, 0, 0, 139, 128, 1, 0, 0, 0, 139, 130, 1, 0, 0, 0, 139, 131, 1, 0, 0, 0, 139, 132, 1, 0, 0, 0, 139, 133, 1, 0, 0, 0, 139, 134, 1, 0, 0, 0, 139, 135, 1, 0, 0, 0, 140, 149, 1, 0, 0, 0, 141, 142, 10, 4, 0, 0, 142, 148, 3, 44, 22, 0, 143, 144, 10, 3, 0, 0, 144, 148, 3, 46, 23, 0, 145, 146, 10, 2, 0, 0, 146, 148, 3, 48, 24, 0, 147, 141, 1, 0, 0, 0, 147, 143, 1, 0, 0, 0, 147, 145, 1, 0, 0, 0, 148, 151, 1, 0, 0, 0, 149, 147, 1, 0, 0, 0, 149, 150, 1, 0, 0, 0, 150, 15, 1, 0, 0, 0, 151, 149, 1, 0, 0, 0, 152, 153, 5, 5, 0, 0, 153, 154, 3, 2, 1, 0, 154, 155, 5, 6, 0, 0, 155, 17, 1, 0, 0, 0, 156, 157, 7, 0, 0, 0, 157, 19, 1, 0, 0, 0, 158, 161, 3, 22, 11, 0, 159, 161, 3, 24, 12, 0, 160, 158, 1, 0, 0, 0, 160, 159, 1, 0, 0, 0, 161, 21, 1, 0, 0, 0, 162, 174, 5, 23, 0, 0, 163, 168, 3, 12, 6, 0, 164, 165, 5, 39, 0, 0, 165, 167, 3, 12, 6, 0, 166, 164, 1, 0, 0, 0, 167, 170, 1, 0, 0, 0, 168, 166, 1, 0, 0, 0, 168, 169, 1, 0, 0, 0, 169, 172, 1, 0, 0, 0, 170, 168, 1, 0, 0, 0, 171, 173, 5, 39, 0, 0, 172, 171, 1, 0, 0, 0, 172, 173, 1, 0, 0, 0, 173, 175, 1, 0, 0, 0, 174, 163, 1, 0, 0, 0, 174, 175, 1, 0, 0, 0, 175, 176, 1, 0, 0, 0, 176, 177, 5, 30, 0, 0, 177, 23, 1, 0, 0, 0, 178, 182, 5, 5, 0, 0, 179, 181, 3, 26, 13, 0, 180, 179, 1, 0, 0, 0, 181, 184, 1, 0, 0, 0, 182, 180, 1, 0, 0, 0, 182, 183, 1, 0, 0, 0, 183, 185, 1, 0, 0, 0, 184, 182, 1, 0, 0, 0, 185, 186, 5, 6, 0, 0, 186, 25, 1, 0, 0, 0, 187, 200, 5, 8, 0, 0, 188, 189, 5, 24, 0, 0, 189, 190, 5, 8, 0, 0, 190, 200, 5, 31, 0, 0, 191, 195, 5, 15, 0, 0, 192, 194, 3, 74, 37, 0, 193, 192, 1, 0, 0, 0, 194, 197, 1, 0, 0, 0, 195, 193, 1, 0, 0, 0, 195, 196, 1, 0, 0, 0, 196, 198, 1, 0, 0, 0, 197, 195, 1, 0, 0, 0, 198, 200, 5, 15, 0, 0, 199, 187, 1, 0, 0, 0, 199, 188, 1, 0, 0, 0, 199, 191, 1, 0, 0, 0, 200, 201, 1, 0, 0, 0, 201, 202, 7, 1, 0, 0, 202, 204, 3, 12, 6, 0, 203, 205, 5, 39, 0, 0, 204, 203, 1, 0, 0, 0, 204, 205, 1, 0, 0, 0, 205, 27, 1, 0, 0, 0, 206, 209, 3, 30, 15, 0, 207, 209, 3, 32, 16, 0, 208, 206, 1, 0, 0, 0, 208, 207, 1, 0, 0, 0, 209, 29, 1, 0, 0, 0, 210, 211, 5, 2, 0, 0, 211, 212, 3, 34, 17, 0, 212, 213, 5, 22, 0, 0, 213, 215, 3, 12, 6, 0, 214, 216, 3, 36, 18, 0, 215, 214, 1, 0, 0, 0, 215, 216, 1, 0, 0, 0, 216, 217, 1, 0, 0, 0, 217, 218, 5, 30, 0, 0, 218, 31, 1, 0, 0, 0, 219, 220, 5, 1, 0, 0, 220, 221, 3, 34, 17, 0, 221, 222, 5, 22, 0, 0, 222, 223, 3, 12, 6, 0, 223, 224, 5, 38, 0, 0, 224, 226, 3, 12, 6, 0, 225, 227, 5, 41, 0, 0, 226, 225, 1, 0, 0, 0, 226, 227, 1, 0, 0, 0, 227, 229, 1, 0, 0, 0, 228, 230, 3, 36, 18, 0, 229, 228, 1, 0, 0, 0, 229, 230, 1, 0, 0, 0, 230, 231, 1, 0, 0, 0, 231, 232, 5, 6, 0, 0, 232, 33, 1, 0, 0, 0, 233, 236, 5, 8, 0, 0, 234, 235, 5, 39, 0, 0, 235, 237, 5, 8, 0, 0, 236, 234, 1, 0, 0, 0, 236, 237, 1, 0, 0, 0, 237, 238, 1, 0, 0, 0, 238, 239, 5, 4, 0, 0, 239, 240, 3, 12, 6, 0, 240, 35, 1, 0, 0, 0, 241, 242, 5, 3, 0, 0, 242, 243, 3, 12, 6, 0, 243, 37, 1, 0, 0, 0, 244, 245, 5, 8, 0, 0, 245, 39, 1, 0, 0, 0, 246, 247, 5, 8, 0, 0, 247, 249, 5, 24, 0, 0, 248, 250, 3, 42, 21, 0, 249, 248, 1, 0, 0, 0, 249, 250, 1, 0, 0, 0, 250, 251, 1, 0, 0, 0, 251, 252, 5, 31, 0, 0, 252, 41, 1, 0, 0, 0, 253, 258, 3, 12, 6, 0, 254, 255, 5, 39, 0, 0, 255, 257, 3, 12, 6, 0, 256, 254, 1, 0, 0, 0, 257, 260, 1, 0, 0, 0, 258, 256, 1, 0, 0, 0, 258, 259, 1, 0, 0, 0, 259, 262, 1, 0, 0, 0, 260, 258, 1, 0, 0, 0, 261, 263, 7, 2, 0, 0, 262, 261, 1, 0, 0, 0, 262, 263, 1, 0, 0, 0, 263, 43, 1, 0, 0, 0, 264, 265, 5, 23, 0, 0, 265, 266, 3, 12, 6, 0, 266, 267, 5, 30, 0, 0, 267, 45, 1, 0, 0, 0, 268, 269, 5, 35, 0, 0, 269, 270, 5, 8, 0, 0, 270, 47, 1, 0, 0, 0, 271, 274, 3, 50, 25, 0, 272, 274, 3, 52, 26, 0, 273, 271, 1, 0, 0, 0, 273, 272, 1, 0, 0, 0, 274, 49, 1, 0, 0, 0, 275, 276, 5, 35, 0, 0, 276, 280, 5, 32, 0, 0, 277, 279, 3, 46, 23, 0, 278, 277, 1, 0, 0, 0, 279, 282, 1, 0, 0, 0, 280, 278, 1, 0, 0, 0, 280, 281, 1, 0, 0, 0, 281, 51, 1, 0, 0, 0, 282, 280, 1, 0, 0, 0, 283, 284, 5, 23, 0, 0, 284, 285, 5, 32, 0, 0, 285, 290, 5, 30, 0, 0, 286, 289, 3, 46, 23, 0, 287, 289, 3, 44, 22, 0, 288, 286, 1, 0, 0, 0, 288, 287, 1, 0, 0, 0, 289, 292, 1, 0, 0, 0, 290, 288, 1, 0, 0, 0, 290, 291, 1, 0, 0, 0, 291, 53, 1, 0, 0, 0, 292, 290, 1, 0, 0, 0, 293, 296, 3, 56, 28, 0, 294, 296, 3, 58, 29, 0, 295, 293, 1, 0, 0, 0, 295, 294, 1, 0, 0, 0, 296, 55, 1, 0, 0, 0, 297, 298, 7, 3, 0, 0, 298, 299, 3, 14, 7, 0, 299, 57, 1, 0, 0, 0, 300, 303, 3, 14, 7, 0, 301, 303, 3, 56, 28, 0, 302, 300, 1, 0, 0, 0, 302, 301, 1, 0, 0, 0, 303, 304, 1, 0, 0, 0, 304, 307, 3, 60, 30, 0, 305, 308, 3, 14, 7, 0, 306, 308, 3, 54, 27, 0, 307, 305, 1, 0, 0, 0, 307, 306, 1, 0, 0, 0, 308, 59, 1, 0, 0, 0, 309, 313, 3, 62, 31, 0, 310, 313, 3, 64, 32, 0, 311, 313, 3, 66, 33, 0, 312, 309, 1, 0, 0, 0, 312, 310, 1, 0, 0, 0, 312, 311, 1, 0, 0, 0, 313, 61, 1, 0, 0, 0, 314, 315, 7, 4, 0, 0, 315, 63, 1, 0, 0, 0, 316, 317, 7, 5, 0, 0, 317, 65, 1, 0, 0, 0, 318, 319, 7, 6, 0, 0, 319, 67, 1, 0, 0, 0, 320, 321, 5, 17, 0, 0, 321, 329, 5, 8, 0, 0, 322, 326, 5, 12, 0, 0, 323, 325, 3, 70, 35, 0, 324, 323, 1, 0, 0, 0, 325, 328, 1, 0, 0, 0, 326, 324, 1, 0, 0, 0, 326, 327, 1, 0, 0, 0, 327, 330, 1, 0, 0, 0, 328, 326, 1, 0, 0, 0, 329, 322, 1, 0, 0, 0, 330, 331, 1, 0, 0, 0, 331, 329, 1, 0, 0, 0, 331, 332, 1, 0, 0, 0, 332, 333, 1, 0, 0, 0, 333, 343, 5, 8, 0, 0, 334, 338, 5, 15, 0, 0, 335, 337, 3, 74, 37, 0, 336, 335, 1, 0, 0, 0, 337, 340, 1, 0, 0, 0, 338, 336, 1, 0, 0, 0, 338, 339, 1, 0, 0, 0, 339, 341, 1, 0, 0, 0, 340, 338, 1, 0, 0, 0, 341, 343, 5, 15, 0, 0, 342, 320, 1, 0, 0, 0, 342, 334, 1, 0, 0, 0, 343, 69, 1, 0, 0, 0, 344, 347, 3, 78, 39, 0, 345, 347, 3, 72, 36, 0, 346, 344, 1, 0, 0, 0, 346, 345, 1, 0, 0, 0, 347, 71, 1, 0, 0, 0, 348, 349, 5, 46, 0, 0, 349, 73, 1, 0, 0, 0, 350, 353, 3, 78, 39, 0, 351, 353, 3, 76, 38, 0, 352, 350, 1, 0, 0, 0, 352, 351, 1, 0, 0, 0, 353, 75, 1, 0, 0, 0, 354, 355, 5, 44, 0, 0, 355, 77, 1, 0, 0, 0, 356, 357, 5, 43, 0, 0, 357, 358, 3, 12, 6, 0, 358, 359, 5, 6, 0, 0, 359, 79, 1, 0, 0, 0, 39, 85, 90, 100, 110, 115, 125, 139, 147, 149, 160, 168, 172, 174, 182, 195, 199, 204, 208, 215, 226, 229, 236, 249, 258, 262, 273, 280, 288, 290, 295, 302, 307, 312, 326, 331, 338, 342, 346, 352]
\ No newline at end of file
+[4, 1, 47, 369, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 1, 0, 1, 0, 1, 1, 5, 1, 86, 8, 1, 10, 1, 12, 1, 89, 9, 1, 1, 2, 1, 2, 3, 2, 93, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 5, 4, 101, 8, 4, 10, 4, 12, 4, 104, 9, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 113, 8, 5, 1, 6, 1, 6, 1, 6, 3, 6, 118, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 5, 6, 126, 8, 6, 10, 6, 12, 6, 129, 9, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 142, 8, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 5, 7, 152, 8, 7, 10, 7, 12, 7, 155, 9, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 3, 10, 165, 8, 10, 1, 11, 1, 11, 1, 11, 1, 11, 5, 11, 171, 8, 11, 10, 11, 12, 11, 174, 9, 11, 1, 11, 3, 11, 177, 8, 11, 3, 11, 179, 8, 11, 1, 11, 1, 11, 1, 12, 1, 12, 5, 12, 185, 8, 12, 10, 12, 12, 12, 188, 9, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 5, 13, 198, 8, 13, 10, 13, 12, 13, 201, 9, 13, 1, 13, 1, 13, 3, 13, 205, 8, 13, 1, 13, 1, 13, 1, 13, 3, 13, 210, 8, 13, 1, 14, 1, 14, 3, 14, 214, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 3, 15, 221, 8, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 3, 16, 232, 8, 16, 1, 16, 3, 16, 235, 8, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 3, 17, 242, 8, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 3, 20, 255, 8, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 5, 21, 262, 8, 21, 10, 21, 12, 21, 265, 9, 21, 1, 21, 3, 21, 268, 8, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 3, 25, 282, 8, 25, 1, 26, 1, 26, 1, 26, 5, 26, 287, 8, 26, 10, 26, 12, 26, 290, 9, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 5, 27, 297, 8, 27, 10, 27, 12, 27, 300, 9, 27, 1, 28, 1, 28, 3, 28, 304, 8, 28, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 3, 30, 311, 8, 30, 1, 30, 1, 30, 1, 30, 3, 30, 316, 8, 30, 1, 31, 1, 31, 1, 31, 3, 31, 321, 8, 31, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 35, 5, 35, 333, 8, 35, 10, 35, 12, 35, 336, 9, 35, 4, 35, 338, 8, 35, 11, 35, 12, 35, 339, 1, 35, 1, 35, 1, 35, 5, 35, 345, 8, 35, 10, 35, 12, 35, 348, 9, 35, 1, 35, 3, 35, 351, 8, 35, 1, 36, 1, 36, 3, 36, 355, 8, 36, 1, 37, 1, 37, 1, 38, 1, 38, 3, 38, 361, 8, 38, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 0, 2, 12, 14, 41, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 0, 7, 2, 0, 13, 14, 16, 16, 2, 0, 7, 7, 22, 22, 2, 0, 39, 39, 41, 41, 2, 0, 25, 25, 33, 33, 4, 0, 20, 21, 27, 28, 34, 34, 37, 37, 5, 0, 18, 18, 25, 25, 32, 32, 36, 36, 40, 40, 2, 0, 19, 19, 26, 26, 376, 0, 82, 1, 0, 0, 0, 2, 87, 1, 0, 0, 0, 4, 92, 1, 0, 0, 0, 6, 94, 1, 0, 0, 0, 8, 98, 1, 0, 0, 0, 10, 112, 1, 0, 0, 0, 12, 117, 1, 0, 0, 0, 14, 141, 1, 0, 0, 0, 16, 156, 1, 0, 0, 0, 18, 160, 1, 0, 0, 0, 20, 164, 1, 0, 0, 0, 22, 166, 1, 0, 0, 0, 24, 182, 1, 0, 0, 0, 26, 204, 1, 0, 0, 0, 28, 213, 1, 0, 0, 0, 30, 215, 1, 0, 0, 0, 32, 224, 1, 0, 0, 0, 34, 238, 1, 0, 0, 0, 36, 246, 1, 0, 0, 0, 38, 249, 1, 0, 0, 0, 40, 251, 1, 0, 0, 0, 42, 258, 1, 0, 0, 0, 44, 269, 1, 0, 0, 0, 46, 273, 1, 0, 0, 0, 48, 276, 1, 0, 0, 0, 50, 281, 1, 0, 0, 0, 52, 283, 1, 0, 0, 0, 54, 291, 1, 0, 0, 0, 56, 303, 1, 0, 0, 0, 58, 305, 1, 0, 0, 0, 60, 310, 1, 0, 0, 0, 62, 320, 1, 0, 0, 0, 64, 322, 1, 0, 0, 0, 66, 324, 1, 0, 0, 0, 68, 326, 1, 0, 0, 0, 70, 350, 1, 0, 0, 0, 72, 354, 1, 0, 0, 0, 74, 356, 1, 0, 0, 0, 76, 360, 1, 0, 0, 0, 78, 362, 1, 0, 0, 0, 80, 364, 1, 0, 0, 0, 82, 83, 3, 2, 1, 0, 83, 1, 1, 0, 0, 0, 84, 86, 3, 4, 2, 0, 85, 84, 1, 0, 0, 0, 86, 89, 1, 0, 0, 0, 87, 85, 1, 0, 0, 0, 87, 88, 1, 0, 0, 0, 88, 3, 1, 0, 0, 0, 89, 87, 1, 0, 0, 0, 90, 93, 3, 6, 3, 0, 91, 93, 3, 8, 4, 0, 92, 90, 1, 0, 0, 0, 92, 91, 1, 0, 0, 0, 93, 5, 1, 0, 0, 0, 94, 95, 5, 8, 0, 0, 95, 96, 5, 7, 0, 0, 96, 97, 3, 12, 6, 0, 97, 7, 1, 0, 0, 0, 98, 102, 5, 8, 0, 0, 99, 101, 3, 10, 5, 0, 100, 99, 1, 0, 0, 0, 101, 104, 1, 0, 0, 0, 102, 100, 1, 0, 0, 0, 102, 103, 1, 0, 0, 0, 103, 105, 1, 0, 0, 0, 104, 102, 1, 0, 0, 0, 105, 106, 3, 16, 8, 0, 106, 9, 1, 0, 0, 0, 107, 108, 5, 15, 0, 0, 108, 109, 3, 78, 39, 0, 109, 110, 5, 15, 0, 0, 110, 113, 1, 0, 0, 0, 111, 113, 5, 8, 0, 0, 112, 107, 1, 0, 0, 0, 112, 111, 1, 0, 0, 0, 113, 11, 1, 0, 0, 0, 114, 115, 6, 6, -1, 0, 115, 118, 3, 14, 7, 0, 116, 118, 3, 56, 28, 0, 117, 114, 1, 0, 0, 0, 117, 116, 1, 0, 0, 0, 118, 127, 1, 0, 0, 0, 119, 120, 10, 1, 0, 0, 120, 121, 5, 29, 0, 0, 121, 122, 3, 12, 6, 0, 122, 123, 5, 22, 0, 0, 123, 124, 3, 12, 6, 2, 124, 126, 1, 0, 0, 0, 125, 119, 1, 0, 0, 0, 126, 129, 1, 0, 0, 0, 127, 125, 1, 0, 0, 0, 127, 128, 1, 0, 0, 0, 128, 13, 1, 0, 0, 0, 129, 127, 1, 0, 0, 0, 130, 131, 6, 7, -1, 0, 131, 142, 3, 70, 35, 0, 132, 142, 3, 18, 9, 0, 133, 142, 3, 28, 14, 0, 134, 142, 3, 20, 10, 0, 135, 142, 3, 38, 19, 0, 136, 142, 3, 40, 20, 0, 137, 138, 5, 24, 0, 0, 138, 139, 3, 12, 6, 0, 139, 140, 5, 31, 0, 0, 140, 142, 1, 0, 0, 0, 141, 130, 1, 0, 0, 0, 141, 132, 1, 0, 0, 0, 141, 133, 1, 0, 0, 0, 141, 134, 1, 0, 0, 0, 141, 135, 1, 0, 0, 0, 141, 136, 1, 0, 0, 0, 141, 137, 1, 0, 0, 0, 142, 153, 1, 0, 0, 0, 143, 144, 10, 5, 0, 0, 144, 152, 3, 44, 22, 0, 145, 146, 10, 4, 0, 0, 146, 152, 3, 46, 23, 0, 147, 148, 10, 3, 0, 0, 148, 152, 3, 48, 24, 0, 149, 150, 10, 2, 0, 0, 150, 152, 3, 50, 25, 0, 151, 143, 1, 0, 0, 0, 151, 145, 1, 0, 0, 0, 151, 147, 1, 0, 0, 0, 151, 149, 1, 0, 0, 0, 152, 155, 1, 0, 0, 0, 153, 151, 1, 0, 0, 0, 153, 154, 1, 0, 0, 0, 154, 15, 1, 0, 0, 0, 155, 153, 1, 0, 0, 0, 156, 157, 5, 5, 0, 0, 157, 158, 3, 2, 1, 0, 158, 159, 5, 6, 0, 0, 159, 17, 1, 0, 0, 0, 160, 161, 7, 0, 0, 0, 161, 19, 1, 0, 0, 0, 162, 165, 3, 22, 11, 0, 163, 165, 3, 24, 12, 0, 164, 162, 1, 0, 0, 0, 164, 163, 1, 0, 0, 0, 165, 21, 1, 0, 0, 0, 166, 178, 5, 23, 0, 0, 167, 172, 3, 12, 6, 0, 168, 169, 5, 39, 0, 0, 169, 171, 3, 12, 6, 0, 170, 168, 1, 0, 0, 0, 171, 174, 1, 0, 0, 0, 172, 170, 1, 0, 0, 0, 172, 173, 1, 0, 0, 0, 173, 176, 1, 0, 0, 0, 174, 172, 1, 0, 0, 0, 175, 177, 5, 39, 0, 0, 176, 175, 1, 0, 0, 0, 176, 177, 1, 0, 0, 0, 177, 179, 1, 0, 0, 0, 178, 167, 1, 0, 0, 0, 178, 179, 1, 0, 0, 0, 179, 180, 1, 0, 0, 0, 180, 181, 5, 30, 0, 0, 181, 23, 1, 0, 0, 0, 182, 186, 5, 5, 0, 0, 183, 185, 3, 26, 13, 0, 184, 183, 1, 0, 0, 0, 185, 188, 1, 0, 0, 0, 186, 184, 1, 0, 0, 0, 186, 187, 1, 0, 0, 0, 187, 189, 1, 0, 0, 0, 188, 186, 1, 0, 0, 0, 189, 190, 5, 6, 0, 0, 190, 25, 1, 0, 0, 0, 191, 205, 5, 8, 0, 0, 192, 193, 5, 24, 0, 0, 193, 194, 5, 8, 0, 0, 194, 205, 5, 31, 0, 0, 195, 199, 5, 15, 0, 0, 196, 198, 3, 76, 38, 0, 197, 196, 1, 0, 0, 0, 198, 201, 1, 0, 0, 0, 199, 197, 1, 0, 0, 0, 199, 200, 1, 0, 0, 0, 200, 202, 1, 0, 0, 0, 201, 199, 1, 0, 0, 0, 202, 205, 5, 15, 0, 0, 203, 205, 3, 12, 6, 0, 204, 191, 1, 0, 0, 0, 204, 192, 1, 0, 0, 0, 204, 195, 1, 0, 0, 0, 204, 203, 1, 0, 0, 0, 205, 206, 1, 0, 0, 0, 206, 207, 7, 1, 0, 0, 207, 209, 3, 12, 6, 0, 208, 210, 5, 39, 0, 0, 209, 208, 1, 0, 0, 0, 209, 210, 1, 0, 0, 0, 210, 27, 1, 0, 0, 0, 211, 214, 3, 30, 15, 0, 212, 214, 3, 32, 16, 0, 213, 211, 1, 0, 0, 0, 213, 212, 1, 0, 0, 0, 214, 29, 1, 0, 0, 0, 215, 216, 5, 2, 0, 0, 216, 217, 3, 34, 17, 0, 217, 218, 5, 22, 0, 0, 218, 220, 3, 12, 6, 0, 219, 221, 3, 36, 18, 0, 220, 219, 1, 0, 0, 0, 220, 221, 1, 0, 0, 0, 221, 222, 1, 0, 0, 0, 222, 223, 5, 30, 0, 0, 223, 31, 1, 0, 0, 0, 224, 225, 5, 1, 0, 0, 225, 226, 3, 34, 17, 0, 226, 227, 5, 22, 0, 0, 227, 228, 3, 12, 6, 0, 228, 229, 5, 38, 0, 0, 229, 231, 3, 12, 6, 0, 230, 232, 5, 41, 0, 0, 231, 230, 1, 0, 0, 0, 231, 232, 1, 0, 0, 0, 232, 234, 1, 0, 0, 0, 233, 235, 3, 36, 18, 0, 234, 233, 1, 0, 0, 0, 234, 235, 1, 0, 0, 0, 235, 236, 1, 0, 0, 0, 236, 237, 5, 6, 0, 0, 237, 33, 1, 0, 0, 0, 238, 241, 5, 8, 0, 0, 239, 240, 5, 39, 0, 0, 240, 242, 5, 8, 0, 0, 241, 239, 1, 0, 0, 0, 241, 242, 1, 0, 0, 0, 242, 243, 1, 0, 0, 0, 243, 244, 5, 4, 0, 0, 244, 245, 3, 12, 6, 0, 245, 35, 1, 0, 0, 0, 246, 247, 5, 3, 0, 0, 247, 248, 3, 12, 6, 0, 248, 37, 1, 0, 0, 0, 249, 250, 5, 8, 0, 0, 250, 39, 1, 0, 0, 0, 251, 252, 5, 8, 0, 0, 252, 254, 5, 24, 0, 0, 253, 255, 3, 42, 21, 0, 254, 253, 1, 0, 0, 0, 254, 255, 1, 0, 0, 0, 255, 256, 1, 0, 0, 0, 256, 257, 5, 31, 0, 0, 257, 41, 1, 0, 0, 0, 258, 263, 3, 12, 6, 0, 259, 260, 5, 39, 0, 0, 260, 262, 3, 12, 6, 0, 261, 259, 1, 0, 0, 0, 262, 265, 1, 0, 0, 0, 263, 261, 1, 0, 0, 0, 263, 264, 1, 0, 0, 0, 264, 267, 1, 0, 0, 0, 265, 263, 1, 0, 0, 0, 266, 268, 7, 2, 0, 0, 267, 266, 1, 0, 0, 0, 267, 268, 1, 0, 0, 0, 268, 43, 1, 0, 0, 0, 269, 270, 5, 23, 0, 0, 270, 271, 3, 12, 6, 0, 271, 272, 5, 30, 0, 0, 272, 45, 1, 0, 0, 0, 273, 274, 5, 35, 0, 0, 274, 275, 5, 8, 0, 0, 275, 47, 1, 0, 0, 0, 276, 277, 5, 35, 0, 0, 277, 278, 5, 13, 0, 0, 278, 49, 1, 0, 0, 0, 279, 282, 3, 52, 26, 0, 280, 282, 3, 54, 27, 0, 281, 279, 1, 0, 0, 0, 281, 280, 1, 0, 0, 0, 282, 51, 1, 0, 0, 0, 283, 284, 5, 35, 0, 0, 284, 288, 5, 32, 0, 0, 285, 287, 3, 46, 23, 0, 286, 285, 1, 0, 0, 0, 287, 290, 1, 0, 0, 0, 288, 286, 1, 0, 0, 0, 288, 289, 1, 0, 0, 0, 289, 53, 1, 0, 0, 0, 290, 288, 1, 0, 0, 0, 291, 292, 5, 23, 0, 0, 292, 293, 5, 32, 0, 0, 293, 298, 5, 30, 0, 0, 294, 297, 3, 46, 23, 0, 295, 297, 3, 44, 22, 0, 296, 294, 1, 0, 0, 0, 296, 295, 1, 0, 0, 0, 297, 300, 1, 0, 0, 0, 298, 296, 1, 0, 0, 0, 298, 299, 1, 0, 0, 0, 299, 55, 1, 0, 0, 0, 300, 298, 1, 0, 0, 0, 301, 304, 3, 58, 29, 0, 302, 304, 3, 60, 30, 0, 303, 301, 1, 0, 0, 0, 303, 302, 1, 0, 0, 0, 304, 57, 1, 0, 0, 0, 305, 306, 7, 3, 0, 0, 306, 307, 3, 14, 7, 0, 307, 59, 1, 0, 0, 0, 308, 311, 3, 14, 7, 0, 309, 311, 3, 58, 29, 0, 310, 308, 1, 0, 0, 0, 310, 309, 1, 0, 0, 0, 311, 312, 1, 0, 0, 0, 312, 315, 3, 62, 31, 0, 313, 316, 3, 14, 7, 0, 314, 316, 3, 56, 28, 0, 315, 313, 1, 0, 0, 0, 315, 314, 1, 0, 0, 0, 316, 61, 1, 0, 0, 0, 317, 321, 3, 64, 32, 0, 318, 321, 3, 66, 33, 0, 319, 321, 3, 68, 34, 0, 320, 317, 1, 0, 0, 0, 320, 318, 1, 0, 0, 0, 320, 319, 1, 0, 0, 0, 321, 63, 1, 0, 0, 0, 322, 323, 7, 4, 0, 0, 323, 65, 1, 0, 0, 0, 324, 325, 7, 5, 0, 0, 325, 67, 1, 0, 0, 0, 326, 327, 7, 6, 0, 0, 327, 69, 1, 0, 0, 0, 328, 329, 5, 17, 0, 0, 329, 337, 5, 8, 0, 0, 330, 334, 5, 12, 0, 0, 331, 333, 3, 72, 36, 0, 332, 331, 1, 0, 0, 0, 333, 336, 1, 0, 0, 0, 334, 332, 1, 0, 0, 0, 334, 335, 1, 0, 0, 0, 335, 338, 1, 0, 0, 0, 336, 334, 1, 0, 0, 0, 337, 330, 1, 0, 0, 0, 338, 339, 1, 0, 0, 0, 339, 337, 1, 0, 0, 0, 339, 340, 1, 0, 0, 0, 340, 341, 1, 0, 0, 0, 341, 351, 5, 8, 0, 0, 342, 346, 5, 15, 0, 0, 343, 345, 3, 76, 38, 0, 344, 343, 1, 0, 0, 0, 345, 348, 1, 0, 0, 0, 346, 344, 1, 0, 0, 0, 346, 347, 1, 0, 0, 0, 347, 349, 1, 0, 0, 0, 348, 346, 1, 0, 0, 0, 349, 351, 5, 15, 0, 0, 350, 328, 1, 0, 0, 0, 350, 342, 1, 0, 0, 0, 351, 71, 1, 0, 0, 0, 352, 355, 3, 80, 40, 0, 353, 355, 3, 74, 37, 0, 354, 352, 1, 0, 0, 0, 354, 353, 1, 0, 0, 0, 355, 73, 1, 0, 0, 0, 356, 357, 5, 46, 0, 0, 357, 75, 1, 0, 0, 0, 358, 361, 3, 80, 40, 0, 359, 361, 3, 78, 39, 0, 360, 358, 1, 0, 0, 0, 360, 359, 1, 0, 0, 0, 361, 77, 1, 0, 0, 0, 362, 363, 5, 44, 0, 0, 363, 79, 1, 0, 0, 0, 364, 365, 5, 43, 0, 0, 365, 366, 3, 12, 6, 0, 366, 367, 5, 6, 0, 0, 367, 81, 1, 0, 0, 0, 39, 87, 92, 102, 112, 117, 127, 141, 151, 153, 164, 172, 176, 178, 186, 199, 204, 209, 213, 220, 231, 234, 241, 254, 263, 267, 281, 288, 296, 298, 303, 310, 315, 320, 334, 339, 346, 350, 354, 360]
\ No newline at end of file
diff --git a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLParser.java b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLParser.java
index 94796886905..2827484b3c4 100644
--- a/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLParser.java
+++ b/rewrite-hcl/src/main/java/org/openrewrite/hcl/internal/grammar/HCLParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2024 the original author or authors.
+ * Copyright 2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,18 +15,14 @@
*/
// Generated from java-escape by ANTLR 4.11.1
package org.openrewrite.hcl.internal.grammar;
-
-import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.atn.ATN;
-import org.antlr.v4.runtime.atn.ATNDeserializer;
-import org.antlr.v4.runtime.atn.ParserATNSimulator;
-import org.antlr.v4.runtime.atn.PredictionContextCache;
+import org.antlr.v4.runtime.atn.*;
import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.tree.ParseTreeListener;
-import org.antlr.v4.runtime.tree.ParseTreeVisitor;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.misc.*;
+import org.antlr.v4.runtime.tree.*;
import java.util.List;
+import java.util.Iterator;
+import java.util.ArrayList;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue"})
public class HCLParser extends Parser {
@@ -36,34 +32,35 @@ public class HCLParser extends Parser {
protected static final PredictionContextCache _sharedContextCache =
new PredictionContextCache();
public static final int
- FOR_BRACE=1, FOR_BRACK=2, IF=3, IN=4, LBRACE=5, RBRACE=6, ASSIGN=7, Identifier=8,
- WS=9, COMMENT=10, LINE_COMMENT=11, NEWLINE=12, NumericLiteral=13, BooleanLiteral=14,
- QUOTE=15, NULL=16, HEREDOC_START=17, PLUS=18, AND=19, EQ=20, LT=21, COLON=22,
- LBRACK=23, LPAREN=24, MINUS=25, OR=26, NEQ=27, GT=28, QUESTION=29, RBRACK=30,
- RPAREN=31, MUL=32, NOT=33, LEQ=34, DOT=35, DIV=36, GEQ=37, ARROW=38, COMMA=39,
- MOD=40, ELLIPSIS=41, TILDE=42, TEMPLATE_INTERPOLATION_START=43, TemplateStringLiteral=44,
+ FOR_BRACE=1, FOR_BRACK=2, IF=3, IN=4, LBRACE=5, RBRACE=6, ASSIGN=7, Identifier=8,
+ WS=9, COMMENT=10, LINE_COMMENT=11, NEWLINE=12, NumericLiteral=13, BooleanLiteral=14,
+ QUOTE=15, NULL=16, HEREDOC_START=17, PLUS=18, AND=19, EQ=20, LT=21, COLON=22,
+ LBRACK=23, LPAREN=24, MINUS=25, OR=26, NEQ=27, GT=28, QUESTION=29, RBRACK=30,
+ RPAREN=31, MUL=32, NOT=33, LEQ=34, DOT=35, DIV=36, GEQ=37, ARROW=38, COMMA=39,
+ MOD=40, ELLIPSIS=41, TILDE=42, TEMPLATE_INTERPOLATION_START=43, TemplateStringLiteral=44,
TemplateStringLiteralChar=45, HTemplateLiteral=46, HTemplateLiteralChar=47;
public static final int
- RULE_configFile = 0, RULE_body = 1, RULE_bodyContent = 2, RULE_attribute = 3,
- RULE_block = 4, RULE_blockLabel = 5, RULE_expression = 6, RULE_exprTerm = 7,
- RULE_blockExpr = 8, RULE_literalValue = 9, RULE_collectionValue = 10,
- RULE_tuple = 11, RULE_object = 12, RULE_objectelem = 13, RULE_forExpr = 14,
- RULE_forTupleExpr = 15, RULE_forObjectExpr = 16, RULE_forIntro = 17, RULE_forCond = 18,
- RULE_variableExpr = 19, RULE_functionCall = 20, RULE_arguments = 21, RULE_index = 22,
- RULE_getAttr = 23, RULE_splat = 24, RULE_attrSplat = 25, RULE_fullSplat = 26,
- RULE_operation = 27, RULE_unaryOp = 28, RULE_binaryOp = 29, RULE_binaryOperator = 30,
- RULE_compareOperator = 31, RULE_arithmeticOperator = 32, RULE_logicOperator = 33,
- RULE_templateExpr = 34, RULE_heredocTemplatePart = 35, RULE_heredocLiteral = 36,
- RULE_quotedTemplatePart = 37, RULE_stringLiteral = 38, RULE_templateInterpolation = 39;
+ RULE_configFile = 0, RULE_body = 1, RULE_bodyContent = 2, RULE_attribute = 3,
+ RULE_block = 4, RULE_blockLabel = 5, RULE_expression = 6, RULE_exprTerm = 7,
+ RULE_blockExpr = 8, RULE_literalValue = 9, RULE_collectionValue = 10,
+ RULE_tuple = 11, RULE_object = 12, RULE_objectelem = 13, RULE_forExpr = 14,
+ RULE_forTupleExpr = 15, RULE_forObjectExpr = 16, RULE_forIntro = 17, RULE_forCond = 18,
+ RULE_variableExpr = 19, RULE_functionCall = 20, RULE_arguments = 21, RULE_index = 22,
+ RULE_getAttr = 23, RULE_legacyIndexAttr = 24, RULE_splat = 25, RULE_attrSplat = 26,
+ RULE_fullSplat = 27, RULE_operation = 28, RULE_unaryOp = 29, RULE_binaryOp = 30,
+ RULE_binaryOperator = 31, RULE_compareOperator = 32, RULE_arithmeticOperator = 33,
+ RULE_logicOperator = 34, RULE_templateExpr = 35, RULE_heredocTemplatePart = 36,
+ RULE_heredocLiteral = 37, RULE_quotedTemplatePart = 38, RULE_stringLiteral = 39,
+ RULE_templateInterpolation = 40;
private static String[] makeRuleNames() {
return new String[] {
- "configFile", "body", "bodyContent", "attribute", "block", "blockLabel",
- "expression", "exprTerm", "blockExpr", "literalValue", "collectionValue",
- "tuple", "object", "objectelem", "forExpr", "forTupleExpr", "forObjectExpr",
- "forIntro", "forCond", "variableExpr", "functionCall", "arguments", "index",
- "getAttr", "splat", "attrSplat", "fullSplat", "operation", "unaryOp",
- "binaryOp", "binaryOperator", "compareOperator", "arithmeticOperator",
- "logicOperator", "templateExpr", "heredocTemplatePart", "heredocLiteral",
+ "configFile", "body", "bodyContent", "attribute", "block", "blockLabel",
+ "expression", "exprTerm", "blockExpr", "literalValue", "collectionValue",
+ "tuple", "object", "objectelem", "forExpr", "forTupleExpr", "forObjectExpr",
+ "forIntro", "forCond", "variableExpr", "functionCall", "arguments", "index",
+ "getAttr", "legacyIndexAttr", "splat", "attrSplat", "fullSplat", "operation",
+ "unaryOp", "binaryOp", "binaryOperator", "compareOperator", "arithmeticOperator",
+ "logicOperator", "templateExpr", "heredocTemplatePart", "heredocLiteral",
"quotedTemplatePart", "stringLiteral", "templateInterpolation"
};
}
@@ -71,23 +68,23 @@ private static String[] makeRuleNames() {
private static String[] makeLiteralNames() {
return new String[] {
- null, null, null, "'if'", "'in'", "'{'", "'}'", "'='", null, null, null,
- null, null, null, null, null, "'null'", null, "'+'", "'&&'", "'=='",
- "'<'", "':'", "'['", "'('", "'-'", "'||'", "'!='", "'>'", "'?'", "']'",
- "')'", "'*'", "'!'", "'<='", "'.'", "'/'", "'>='", "'=>'", "','", "'%'",
+ null, null, null, "'if'", "'in'", "'{'", "'}'", "'='", null, null, null,
+ null, null, null, null, null, "'null'", null, "'+'", "'&&'", "'=='",
+ "'<'", "':'", "'['", "'('", "'-'", "'||'", "'!='", "'>'", "'?'", "']'",
+ "')'", "'*'", "'!'", "'<='", "'.'", "'/'", "'>='", "'=>'", "','", "'%'",
"'...'", "'~'"
};
}
private static final String[] _LITERAL_NAMES = makeLiteralNames();
private static String[] makeSymbolicNames() {
return new String[] {
- null, "FOR_BRACE", "FOR_BRACK", "IF", "IN", "LBRACE", "RBRACE", "ASSIGN",
- "Identifier", "WS", "COMMENT", "LINE_COMMENT", "NEWLINE", "NumericLiteral",
- "BooleanLiteral", "QUOTE", "NULL", "HEREDOC_START", "PLUS", "AND", "EQ",
- "LT", "COLON", "LBRACK", "LPAREN", "MINUS", "OR", "NEQ", "GT", "QUESTION",
- "RBRACK", "RPAREN", "MUL", "NOT", "LEQ", "DOT", "DIV", "GEQ", "ARROW",
- "COMMA", "MOD", "ELLIPSIS", "TILDE", "TEMPLATE_INTERPOLATION_START",
- "TemplateStringLiteral", "TemplateStringLiteralChar", "HTemplateLiteral",
+ null, "FOR_BRACE", "FOR_BRACK", "IF", "IN", "LBRACE", "RBRACE", "ASSIGN",
+ "Identifier", "WS", "COMMENT", "LINE_COMMENT", "NEWLINE", "NumericLiteral",
+ "BooleanLiteral", "QUOTE", "NULL", "HEREDOC_START", "PLUS", "AND", "EQ",
+ "LT", "COLON", "LBRACK", "LPAREN", "MINUS", "OR", "NEQ", "GT", "QUESTION",
+ "RBRACK", "RPAREN", "MUL", "NOT", "LEQ", "DOT", "DIV", "GEQ", "ARROW",
+ "COMMA", "MOD", "ELLIPSIS", "TILDE", "TEMPLATE_INTERPOLATION_START",
+ "TemplateStringLiteral", "TemplateStringLiteralChar", "HTemplateLiteral",
"HTemplateLiteralChar"
};
}
@@ -172,7 +169,7 @@ public final ConfigFileContext configFile() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(80);
+ setState(82);
body();
}
}
@@ -221,17 +218,17 @@ public final BodyContext body() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(85);
+ setState(87);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==Identifier) {
{
{
- setState(82);
+ setState(84);
bodyContent();
}
}
- setState(87);
+ setState(89);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -279,20 +276,20 @@ public final BodyContentContext bodyContent() throws RecognitionException {
BodyContentContext _localctx = new BodyContentContext(_ctx, getState());
enterRule(_localctx, 4, RULE_bodyContent);
try {
- setState(90);
+ setState(92);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,1,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(88);
+ setState(90);
attribute();
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(89);
+ setState(91);
block();
}
break;
@@ -341,11 +338,11 @@ public final AttributeContext attribute() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(92);
+ setState(94);
match(Identifier);
- setState(93);
+ setState(95);
match(ASSIGN);
- setState(94);
+ setState(96);
expression(0);
}
}
@@ -398,23 +395,23 @@ public final BlockContext block() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(96);
+ setState(98);
match(Identifier);
- setState(100);
+ setState(102);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==Identifier || _la==QUOTE) {
{
{
- setState(97);
+ setState(99);
blockLabel();
}
}
- setState(102);
+ setState(104);
_errHandler.sync(this);
_la = _input.LA(1);
}
- setState(103);
+ setState(105);
blockExpr();
}
}
@@ -462,24 +459,24 @@ public final BlockLabelContext blockLabel() throws RecognitionException {
BlockLabelContext _localctx = new BlockLabelContext(_ctx, getState());
enterRule(_localctx, 10, RULE_blockLabel);
try {
- setState(110);
+ setState(112);
_errHandler.sync(this);
switch (_input.LA(1)) {
case QUOTE:
enterOuterAlt(_localctx, 1);
{
- setState(105);
+ setState(107);
match(QUOTE);
- setState(106);
+ setState(108);
stringLiteral();
- setState(107);
+ setState(109);
match(QUOTE);
}
break;
case Identifier:
enterOuterAlt(_localctx, 2);
{
- setState(109);
+ setState(111);
match(Identifier);
}
break;
@@ -504,7 +501,7 @@ public ExpressionContext(ParserRuleContext parent, int invokingState) {
super(parent, invokingState);
}
@Override public int getRuleIndex() { return RULE_expression; }
-
+
public ExpressionContext() { }
public void copyFrom(ExpressionContext ctx) {
super.copyFrom(ctx);
@@ -591,7 +588,7 @@ private ExpressionContext expression(int _p) throws RecognitionException {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(115);
+ setState(117);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,4,_ctx) ) {
case 1:
@@ -600,7 +597,7 @@ private ExpressionContext expression(int _p) throws RecognitionException {
_ctx = _localctx;
_prevctx = _localctx;
- setState(113);
+ setState(115);
exprTerm(0);
}
break;
@@ -609,13 +606,13 @@ private ExpressionContext expression(int _p) throws RecognitionException {
_localctx = new OperationExpressionContext(_localctx);
_ctx = _localctx;
_prevctx = _localctx;
- setState(114);
+ setState(116);
operation();
}
break;
}
_ctx.stop = _input.LT(-1);
- setState(125);
+ setState(127);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,5,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
@@ -626,20 +623,20 @@ private ExpressionContext expression(int _p) throws RecognitionException {
{
_localctx = new ConditionalExpressionContext(new ExpressionContext(_parentctx, _parentState));
pushNewRecursionContext(_localctx, _startState, RULE_expression);
- setState(117);
+ setState(119);
if (!(precpred(_ctx, 1))) throw new FailedPredicateException(this, "precpred(_ctx, 1)");
- setState(118);
+ setState(120);
match(QUESTION);
- setState(119);
+ setState(121);
expression(0);
- setState(120);
+ setState(122);
match(COLON);
- setState(121);
+ setState(123);
expression(2);
}
- }
+ }
}
- setState(127);
+ setState(129);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,5,_ctx);
}
@@ -662,7 +659,7 @@ public ExprTermContext(ParserRuleContext parent, int invokingState) {
super(parent, invokingState);
}
@Override public int getRuleIndex() { return RULE_exprTerm; }
-
+
public ExprTermContext() { }
public void copyFrom(ExprTermContext ctx) {
super.copyFrom(ctx);
@@ -820,6 +817,29 @@ public T accept(ParseTreeVisitor visitor) {
}
}
@SuppressWarnings("CheckReturnValue")
+ public static class LegacyIndexAttributeExpressionContext extends ExprTermContext {
+ public ExprTermContext exprTerm() {
+ return getRuleContext(ExprTermContext.class,0);
+ }
+ public LegacyIndexAttrContext legacyIndexAttr() {
+ return getRuleContext(LegacyIndexAttrContext.class,0);
+ }
+ public LegacyIndexAttributeExpressionContext(ExprTermContext ctx) { copyFrom(ctx); }
+ @Override
+ public void enterRule(ParseTreeListener listener) {
+ if ( listener instanceof HCLParserListener ) ((HCLParserListener)listener).enterLegacyIndexAttributeExpression(this);
+ }
+ @Override
+ public void exitRule(ParseTreeListener listener) {
+ if ( listener instanceof HCLParserListener ) ((HCLParserListener)listener).exitLegacyIndexAttributeExpression(this);
+ }
+ @Override
+ public T accept(ParseTreeVisitor visitor) {
+ if ( visitor instanceof HCLParserVisitor ) return ((HCLParserVisitor)visitor).visitLegacyIndexAttributeExpression(this);
+ else return visitor.visitChildren(this);
+ }
+ }
+ @SuppressWarnings("CheckReturnValue")
public static class ForExpressionContext extends ExprTermContext {
public ForExprContext forExpr() {
return getRuleContext(ForExprContext.class,0);
@@ -895,7 +915,7 @@ private ExprTermContext exprTerm(int _p) throws RecognitionException {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(139);
+ setState(141);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,6,_ctx) ) {
case 1:
@@ -904,7 +924,7 @@ private ExprTermContext exprTerm(int _p) throws RecognitionException {
_ctx = _localctx;
_prevctx = _localctx;
- setState(129);
+ setState(131);
templateExpr();
}
break;
@@ -913,7 +933,7 @@ private ExprTermContext exprTerm(int _p) throws RecognitionException {
_localctx = new LiteralExpressionContext(_localctx);
_ctx = _localctx;
_prevctx = _localctx;
- setState(130);
+ setState(132);
literalValue();
}
break;
@@ -922,7 +942,7 @@ private ExprTermContext exprTerm(int _p) throws RecognitionException {
_localctx = new ForExpressionContext(_localctx);
_ctx = _localctx;
_prevctx = _localctx;
- setState(131);
+ setState(133);
forExpr();
}
break;
@@ -931,7 +951,7 @@ private ExprTermContext exprTerm(int _p) throws RecognitionException {
_localctx = new CollectionValueExpressionContext(_localctx);
_ctx = _localctx;
_prevctx = _localctx;
- setState(132);
+ setState(134);
collectionValue();
}
break;
@@ -940,7 +960,7 @@ private ExprTermContext exprTerm(int _p) throws RecognitionException {
_localctx = new VariableExpressionContext(_localctx);
_ctx = _localctx;
_prevctx = _localctx;
- setState(133);
+ setState(135);
variableExpr();
}
break;
@@ -949,7 +969,7 @@ private ExprTermContext exprTerm(int _p) throws RecognitionException {
_localctx = new FunctionCallExpressionContext(_localctx);
_ctx = _localctx;
_prevctx = _localctx;
- setState(134);
+ setState(136);
functionCall();
}
break;
@@ -958,17 +978,17 @@ private ExprTermContext exprTerm(int _p) throws RecognitionException {
_localctx = new ParentheticalExpressionContext(_localctx);
_ctx = _localctx;
_prevctx = _localctx;
- setState(135);
+ setState(137);
match(LPAREN);
- setState(136);
+ setState(138);
expression(0);
- setState(137);
+ setState(139);
match(RPAREN);
}
break;
}
_ctx.stop = _input.LT(-1);
- setState(149);
+ setState(153);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,8,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
@@ -976,16 +996,16 @@ private ExprTermContext exprTerm(int _p) throws RecognitionException {
if ( _parseListeners!=null ) triggerExitRuleEvent();
_prevctx = _localctx;
{
- setState(147);
+ setState(151);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,7,_ctx) ) {
case 1:
{
_localctx = new IndexAccessExpressionContext(new ExprTermContext(_parentctx, _parentState));
pushNewRecursionContext(_localctx, _startState, RULE_exprTerm);
- setState(141);
- if (!(precpred(_ctx, 4))) throw new FailedPredicateException(this, "precpred(_ctx, 4)");
- setState(142);
+ setState(143);
+ if (!(precpred(_ctx, 5))) throw new FailedPredicateException(this, "precpred(_ctx, 5)");
+ setState(144);
index();
}
break;
@@ -993,26 +1013,36 @@ private ExprTermContext exprTerm(int _p) throws RecognitionException {
{
_localctx = new AttributeAccessExpressionContext(new ExprTermContext(_parentctx, _parentState));
pushNewRecursionContext(_localctx, _startState, RULE_exprTerm);
- setState(143);
- if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)");
- setState(144);
+ setState(145);
+ if (!(precpred(_ctx, 4))) throw new FailedPredicateException(this, "precpred(_ctx, 4)");
+ setState(146);
getAttr();
}
break;
case 3:
+ {
+ _localctx = new LegacyIndexAttributeExpressionContext(new ExprTermContext(_parentctx, _parentState));
+ pushNewRecursionContext(_localctx, _startState, RULE_exprTerm);
+ setState(147);
+ if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)");
+ setState(148);
+ legacyIndexAttr();
+ }
+ break;
+ case 4:
{
_localctx = new SplatExpressionContext(new ExprTermContext(_parentctx, _parentState));
pushNewRecursionContext(_localctx, _startState, RULE_exprTerm);
- setState(145);
+ setState(149);
if (!(precpred(_ctx, 2))) throw new FailedPredicateException(this, "precpred(_ctx, 2)");
- setState(146);
+ setState(150);
splat();
}
break;
}
- }
+ }
}
- setState(151);
+ setState(155);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,8,_ctx);
}
@@ -1061,11 +1091,11 @@ public final BlockExprContext blockExpr() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(152);
+ setState(156);
match(LBRACE);
- setState(153);
+ setState(157);
body();
- setState(154);
+ setState(158);
match(RBRACE);
}
}
@@ -1111,7 +1141,7 @@ public final LiteralValueContext literalValue() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(156);
+ setState(160);
_la = _input.LA(1);
if ( !(((_la) & ~0x3f) == 0 && ((1L << _la) & 90112L) != 0) ) {
_errHandler.recoverInline(this);
@@ -1165,20 +1195,20 @@ public final CollectionValueContext collectionValue() throws RecognitionExceptio
CollectionValueContext _localctx = new CollectionValueContext(_ctx, getState());
enterRule(_localctx, 20, RULE_collectionValue);
try {
- setState(160);
+ setState(164);
_errHandler.sync(this);
switch (_input.LA(1)) {
case LBRACK:
enterOuterAlt(_localctx, 1);
{
- setState(158);
+ setState(162);
tuple();
}
break;
case LBRACE:
enterOuterAlt(_localctx, 2);
{
- setState(159);
+ setState(163);
object();
}
break;
@@ -1238,39 +1268,39 @@ public final TupleContext tuple() throws RecognitionException {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(162);
+ setState(166);
match(LBRACK);
- setState(174);
+ setState(178);
_errHandler.sync(this);
_la = _input.LA(1);
if (((_la) & ~0x3f) == 0 && ((1L << _la) & 8648909094L) != 0) {
{
- setState(163);
+ setState(167);
expression(0);
- setState(168);
+ setState(172);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,10,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
if ( _alt==1 ) {
{
{
- setState(164);
+ setState(168);
match(COMMA);
- setState(165);
+ setState(169);
expression(0);
}
- }
+ }
}
- setState(170);
+ setState(174);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,10,_ctx);
}
- setState(172);
+ setState(176);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==COMMA) {
{
- setState(171);
+ setState(175);
match(COMMA);
}
}
@@ -1278,7 +1308,7 @@ public final TupleContext tuple() throws RecognitionException {
}
}
- setState(176);
+ setState(180);
match(RBRACK);
}
}
@@ -1329,23 +1359,23 @@ public final ObjectContext object() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(178);
- match(LBRACE);
setState(182);
+ match(LBRACE);
+ setState(186);
_errHandler.sync(this);
_la = _input.LA(1);
- while (((_la) & ~0x3f) == 0 && ((1L << _la) & 16810240L) != 0) {
+ while (((_la) & ~0x3f) == 0 && ((1L << _la) & 8648909094L) != 0) {
{
{
- setState(179);
+ setState(183);
objectelem();
}
}
- setState(184);
+ setState(188);
_errHandler.sync(this);
_la = _input.LA(1);
}
- setState(185);
+ setState(189);
match(RBRACE);
}
}
@@ -1362,8 +1392,11 @@ public final ObjectContext object() throws RecognitionException {
@SuppressWarnings("CheckReturnValue")
public static class ObjectelemContext extends ParserRuleContext {
- public ExpressionContext expression() {
- return getRuleContext(ExpressionContext.class,0);
+ public List expression() {
+ return getRuleContexts(ExpressionContext.class);
+ }
+ public ExpressionContext expression(int i) {
+ return getRuleContext(ExpressionContext.class,i);
}
public TerminalNode ASSIGN() { return getToken(HCLParser.ASSIGN, 0); }
public TerminalNode COLON() { return getToken(HCLParser.COLON, 0); }
@@ -1407,51 +1440,55 @@ public final ObjectelemContext objectelem() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(199);
+ setState(204);
_errHandler.sync(this);
- switch (_input.LA(1)) {
- case Identifier:
+ switch ( getInterpreter().adaptivePredict(_input,15,_ctx) ) {
+ case 1:
{
- setState(187);
+ setState(191);
match(Identifier);
}
break;
- case LPAREN:
+ case 2:
{
- setState(188);
+ setState(192);
match(LPAREN);
- setState(189);
+ setState(193);
match(Identifier);
- setState(190);
+ setState(194);
match(RPAREN);
}
break;
- case QUOTE:
+ case 3:
{
- setState(191);
- match(QUOTE);
setState(195);
+ match(QUOTE);
+ setState(199);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==TEMPLATE_INTERPOLATION_START || _la==TemplateStringLiteral) {
{
{
- setState(192);
+ setState(196);
quotedTemplatePart();
}
}
- setState(197);
+ setState(201);
_errHandler.sync(this);
_la = _input.LA(1);
}
- setState(198);
+ setState(202);
match(QUOTE);
}
break;
- default:
- throw new NoViableAltException(this);
+ case 4:
+ {
+ setState(203);
+ expression(0);
+ }
+ break;
}
- setState(201);
+ setState(206);
_la = _input.LA(1);
if ( !(_la==ASSIGN || _la==COLON) ) {
_errHandler.recoverInline(this);
@@ -1461,14 +1498,14 @@ public final ObjectelemContext objectelem() throws RecognitionException {
_errHandler.reportMatch(this);
consume();
}
- setState(202);
+ setState(207);
expression(0);
- setState(204);
+ setState(209);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==COMMA) {
{
- setState(203);
+ setState(208);
match(COMMA);
}
}
@@ -1517,20 +1554,20 @@ public final ForExprContext forExpr() throws RecognitionException {
ForExprContext _localctx = new ForExprContext(_ctx, getState());
enterRule(_localctx, 28, RULE_forExpr);
try {
- setState(208);
+ setState(213);
_errHandler.sync(this);
switch (_input.LA(1)) {
case FOR_BRACK:
enterOuterAlt(_localctx, 1);
{
- setState(206);
+ setState(211);
forTupleExpr();
}
break;
case FOR_BRACE:
enterOuterAlt(_localctx, 2);
{
- setState(207);
+ setState(212);
forObjectExpr();
}
break;
@@ -1589,25 +1626,25 @@ public final ForTupleExprContext forTupleExpr() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(210);
+ setState(215);
match(FOR_BRACK);
- setState(211);
+ setState(216);
forIntro();
- setState(212);
+ setState(217);
match(COLON);
- setState(213);
+ setState(218);
expression(0);
- setState(215);
+ setState(220);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==IF) {
{
- setState(214);
+ setState(219);
forCond();
}
}
- setState(217);
+ setState(222);
match(RBRACK);
}
}
@@ -1667,39 +1704,39 @@ public final ForObjectExprContext forObjectExpr() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(219);
+ setState(224);
match(FOR_BRACE);
- setState(220);
+ setState(225);
forIntro();
- setState(221);
+ setState(226);
match(COLON);
- setState(222);
+ setState(227);
expression(0);
- setState(223);
+ setState(228);
match(ARROW);
- setState(224);
+ setState(229);
expression(0);
- setState(226);
+ setState(231);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==ELLIPSIS) {
{
- setState(225);
+ setState(230);
match(ELLIPSIS);
}
}
- setState(229);
+ setState(234);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==IF) {
{
- setState(228);
+ setState(233);
forCond();
}
}
- setState(231);
+ setState(236);
match(RBRACE);
}
}
@@ -1751,23 +1788,23 @@ public final ForIntroContext forIntro() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(233);
+ setState(238);
match(Identifier);
- setState(236);
+ setState(241);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==COMMA) {
{
- setState(234);
+ setState(239);
match(COMMA);
- setState(235);
+ setState(240);
match(Identifier);
}
}
- setState(238);
+ setState(243);
match(IN);
- setState(239);
+ setState(244);
expression(0);
}
}
@@ -1813,9 +1850,9 @@ public final ForCondContext forCond() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(241);
+ setState(246);
match(IF);
- setState(242);
+ setState(247);
expression(0);
}
}
@@ -1858,7 +1895,7 @@ public final VariableExprContext variableExpr() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(244);
+ setState(249);
match(Identifier);
}
}
@@ -1907,21 +1944,21 @@ public final FunctionCallContext functionCall() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(246);
+ setState(251);
match(Identifier);
- setState(247);
+ setState(252);
match(LPAREN);
- setState(249);
+ setState(254);
_errHandler.sync(this);
_la = _input.LA(1);
if (((_la) & ~0x3f) == 0 && ((1L << _la) & 8648909094L) != 0) {
{
- setState(248);
+ setState(253);
arguments();
}
}
- setState(251);
+ setState(256);
match(RPAREN);
}
}
@@ -1976,32 +2013,32 @@ public final ArgumentsContext arguments() throws RecognitionException {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(253);
- expression(0);
setState(258);
+ expression(0);
+ setState(263);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,23,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
if ( _alt==1 ) {
{
{
- setState(254);
+ setState(259);
match(COMMA);
- setState(255);
+ setState(260);
expression(0);
}
- }
+ }
}
- setState(260);
+ setState(265);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,23,_ctx);
}
- setState(262);
+ setState(267);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==COMMA || _la==ELLIPSIS) {
{
- setState(261);
+ setState(266);
_la = _input.LA(1);
if ( !(_la==COMMA || _la==ELLIPSIS) ) {
_errHandler.recoverInline(this);
@@ -2059,11 +2096,11 @@ public final IndexContext index() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(264);
+ setState(269);
match(LBRACK);
- setState(265);
+ setState(270);
expression(0);
- setState(266);
+ setState(271);
match(RBRACK);
}
}
@@ -2107,9 +2144,9 @@ public final GetAttrContext getAttr() throws RecognitionException {
try {
enterOuterAlt(_localctx, 1);
{
- setState(268);
+ setState(273);
match(DOT);
- setState(269);
+ setState(274);
match(Identifier);
}
}
@@ -2124,6 +2161,52 @@ public final GetAttrContext getAttr() throws RecognitionException {
return _localctx;
}
+ @SuppressWarnings("CheckReturnValue")
+ public static class LegacyIndexAttrContext extends ParserRuleContext {
+ public TerminalNode DOT() { return getToken(HCLParser.DOT, 0); }
+ public TerminalNode NumericLiteral() { return getToken(HCLParser.NumericLiteral, 0); }
+ public LegacyIndexAttrContext(ParserRuleContext parent, int invokingState) {
+ super(parent, invokingState);
+ }
+ @Override public int getRuleIndex() { return RULE_legacyIndexAttr; }
+ @Override
+ public void enterRule(ParseTreeListener listener) {
+ if ( listener instanceof HCLParserListener ) ((HCLParserListener)listener).enterLegacyIndexAttr(this);
+ }
+ @Override
+ public void exitRule(ParseTreeListener listener) {
+ if ( listener instanceof HCLParserListener ) ((HCLParserListener)listener).exitLegacyIndexAttr(this);
+ }
+ @Override
+ public T accept(ParseTreeVisitor visitor) {
+ if ( visitor instanceof HCLParserVisitor ) return ((HCLParserVisitor)visitor).visitLegacyIndexAttr(this);
+ else return visitor.visitChildren(this);
+ }
+ }
+
+ public final LegacyIndexAttrContext legacyIndexAttr() throws RecognitionException {
+ LegacyIndexAttrContext _localctx = new LegacyIndexAttrContext(_ctx, getState());
+ enterRule(_localctx, 48, RULE_legacyIndexAttr);
+ try {
+ enterOuterAlt(_localctx, 1);
+ {
+ setState(276);
+ match(DOT);
+ setState(277);
+ match(NumericLiteral);
+ }
+ }
+ catch (RecognitionException re) {
+ _localctx.exception = re;
+ _errHandler.reportError(this, re);
+ _errHandler.recover(this, re);
+ }
+ finally {
+ exitRule();
+ }
+ return _localctx;
+ }
+
@SuppressWarnings("CheckReturnValue")
public static class SplatContext extends ParserRuleContext {
public AttrSplatContext attrSplat() {
@@ -2153,22 +2236,22 @@ public T accept(ParseTreeVisitor visitor) {
public final SplatContext splat() throws RecognitionException {
SplatContext _localctx = new SplatContext(_ctx, getState());
- enterRule(_localctx, 48, RULE_splat);
+ enterRule(_localctx, 50, RULE_splat);
try {
- setState(273);
+ setState(281);
_errHandler.sync(this);
switch (_input.LA(1)) {
case DOT:
enterOuterAlt(_localctx, 1);
{
- setState(271);
+ setState(279);
attrSplat();
}
break;
case LBRACK:
enterOuterAlt(_localctx, 2);
{
- setState(272);
+ setState(280);
fullSplat();
}
break;
@@ -2218,28 +2301,28 @@ public T accept(ParseTreeVisitor visitor) {
public final AttrSplatContext attrSplat() throws RecognitionException {
AttrSplatContext _localctx = new AttrSplatContext(_ctx, getState());
- enterRule(_localctx, 50, RULE_attrSplat);
+ enterRule(_localctx, 52, RULE_attrSplat);
try {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(275);
+ setState(283);
match(DOT);
- setState(276);
+ setState(284);
match(MUL);
- setState(280);
+ setState(288);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,26,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
if ( _alt==1 ) {
{
{
- setState(277);
+ setState(285);
getAttr();
}
- }
+ }
}
- setState(282);
+ setState(290);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,26,_ctx);
}
@@ -2294,44 +2377,44 @@ public T accept(ParseTreeVisitor visitor) {
public final FullSplatContext fullSplat() throws RecognitionException {
FullSplatContext _localctx = new FullSplatContext(_ctx, getState());
- enterRule(_localctx, 52, RULE_fullSplat);
+ enterRule(_localctx, 54, RULE_fullSplat);
try {
int _alt;
enterOuterAlt(_localctx, 1);
{
- setState(283);
+ setState(291);
match(LBRACK);
- setState(284);
+ setState(292);
match(MUL);
- setState(285);
+ setState(293);
match(RBRACK);
- setState(290);
+ setState(298);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,28,_ctx);
while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
if ( _alt==1 ) {
{
- setState(288);
+ setState(296);
_errHandler.sync(this);
switch (_input.LA(1)) {
case DOT:
{
- setState(286);
+ setState(294);
getAttr();
}
break;
case LBRACK:
{
- setState(287);
+ setState(295);
index();
}
break;
default:
throw new NoViableAltException(this);
}
- }
+ }
}
- setState(292);
+ setState(300);
_errHandler.sync(this);
_alt = getInterpreter().adaptivePredict(_input,28,_ctx);
}
@@ -2377,22 +2460,22 @@ public T accept(ParseTreeVisitor visitor) {
public final OperationContext operation() throws RecognitionException {
OperationContext _localctx = new OperationContext(_ctx, getState());
- enterRule(_localctx, 54, RULE_operation);
+ enterRule(_localctx, 56, RULE_operation);
try {
- setState(295);
+ setState(303);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,29,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(293);
+ setState(301);
unaryOp();
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(294);
+ setState(302);
binaryOp();
}
break;
@@ -2437,12 +2520,12 @@ public T accept(ParseTreeVisitor visitor) {
public final UnaryOpContext unaryOp() throws RecognitionException {
UnaryOpContext _localctx = new UnaryOpContext(_ctx, getState());
- enterRule(_localctx, 56, RULE_unaryOp);
+ enterRule(_localctx, 58, RULE_unaryOp);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
- setState(297);
+ setState(305);
_la = _input.LA(1);
if ( !(_la==MINUS || _la==NOT) ) {
_errHandler.recoverInline(this);
@@ -2452,7 +2535,7 @@ public final UnaryOpContext unaryOp() throws RecognitionException {
_errHandler.reportMatch(this);
consume();
}
- setState(298);
+ setState(306);
exprTerm(0);
}
}
@@ -2505,11 +2588,11 @@ public T accept(ParseTreeVisitor visitor) {
public final BinaryOpContext binaryOp() throws RecognitionException {
BinaryOpContext _localctx = new BinaryOpContext(_ctx, getState());
- enterRule(_localctx, 58, RULE_binaryOp);
+ enterRule(_localctx, 60, RULE_binaryOp);
try {
enterOuterAlt(_localctx, 1);
{
- setState(302);
+ setState(310);
_errHandler.sync(this);
switch (_input.LA(1)) {
case FOR_BRACE:
@@ -2524,34 +2607,34 @@ public final BinaryOpContext binaryOp() throws RecognitionException {
case LBRACK:
case LPAREN:
{
- setState(300);
+ setState(308);
exprTerm(0);
}
break;
case MINUS:
case NOT:
{
- setState(301);
+ setState(309);
unaryOp();
}
break;
default:
throw new NoViableAltException(this);
}
- setState(304);
+ setState(312);
binaryOperator();
- setState(307);
+ setState(315);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,31,_ctx) ) {
case 1:
{
- setState(305);
+ setState(313);
exprTerm(0);
}
break;
case 2:
{
- setState(306);
+ setState(314);
operation();
}
break;
@@ -2601,9 +2684,9 @@ public
+
+ 
+