Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make templates adjust with scala version #25293

Merged
merged 1 commit into from
May 3, 2022
Merged

Make templates adjust with scala version #25293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...e-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/scala/pom.tpl.qute.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@
<arg>-deprecation</arg>
<arg>-feature</arg>
<arg>-explaintypes</arg>
{#if scala.version.startsWith("2.12.")}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that really the exact version to use ? What if we upgrade to 2.13 ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We upgraded to 2.13, that's the issue. Old versions need a different path.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I get that but can't we make the template more open ended so it works with 2.13 and higher so we avoid having to keep updating ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maxandersen we could make it configurable I guess and check if the variable exists, maybe that's the best backward/forward compatible fix.

<arg>-target:jvm-1.8</arg>
<arg>-Ypartial-unification</arg>
{#else}
<arg>-target:jvm-11</arg>
{/if}
</args>
</configuration>
</plugin>
Expand Down
39 changes: 39 additions & 0 deletions ...rts/src/main/java/io/quarkus/devtools/codestarts/core/reader/QuteCodestartFileReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,23 @@
import io.quarkus.devtools.codestarts.CodestartException;
import io.quarkus.devtools.codestarts.CodestartResource;
import io.quarkus.devtools.codestarts.CodestartResource.Source;
import io.quarkus.qute.CompletedStage;
import io.quarkus.qute.Engine;
import io.quarkus.qute.EvalContext;
import io.quarkus.qute.Expression;
import io.quarkus.qute.ResultMapper;
import io.quarkus.qute.Results;
import io.quarkus.qute.TemplateException;
import io.quarkus.qute.TemplateLocator;
import io.quarkus.qute.TemplateNode;
import io.quarkus.qute.ValueResolver;
import io.quarkus.qute.Variant;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletionStage;
import org.apache.commons.io.FilenameUtils;

final class QuteCodestartFileReader implements CodestartFileReader {
Expand Down Expand Up @@ -49,6 +53,7 @@ public static String readQuteFile(CodestartResource projectResource, Source sour
final String content = source.read();
final String templateId = source.absolutePath();
final Engine engine = Engine.builder().addDefaults()
.addValueResolver(new StringValueResolver())
.addResultMapper(new MissingValueMapper())
.removeStandaloneLines(true)
// For now we need to disable strict rendering for codestarts
Expand Down Expand Up @@ -142,4 +147,38 @@ public String map(Object result, Expression expression) {
* }
* }
**/

private static class StringValueResolver implements ValueResolver {
@Override
public boolean appliesTo(EvalContext context) {
return ValueResolver.matchClass(context, String.class);
}

@Override
public CompletionStage<Object> resolve(EvalContext context) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't we call methods on string anyway ?

String value = (String) context.getBase();
switch (context.getName()) {
case "startsWith":
if (context.getParams().size() == 1) {
return context.evaluate(context.getParams().get(0)).thenCompose(e -> {
return CompletedStage.of(value.startsWith((String) e));
});
}
case "contains":
if (context.getParams().size() == 1) {
return context.evaluate(context.getParams().get(0)).thenCompose(e -> {
return CompletedStage.of(value.contains((CharSequence) e));
});
}
case "endsWith":
if (context.getParams().size() == 1) {
return context.evaluate(context.getParams().get(0)).thenCompose(e -> {
return CompletedStage.of(value.endsWith((String) e));
});
}
default:
return Results.notFound(context);
}
}
}
}