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

HCL added Scoped Function name support (Terraform 1.8) #7270

Merged
merged 1 commit into from
Apr 16, 2024
Merged

HCL added Scoped Function name support (Terraform 1.8) #7270

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
1 change: 1 addition & 0 deletions ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLTokenId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public enum HCLTokenId implements TokenId {
INTERPOLATION_START("${", "separator"),
INTERPOLATION_END("}", "separator"),
RARROW("=>", "separator"),
SCOPE("::", "separator"),
TEMPLATE_START("%{", "separator"),
TEMPLATE_END("}", "separator"),

Expand Down
8 changes: 8 additions & 0 deletions ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLElementFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.tree.TerminalNode;
import org.netbeans.modules.languages.hcl.grammar.HCLLexer;
import org.netbeans.modules.languages.hcl.grammar.HCLParser;

/**
*
Expand All @@ -41,6 +42,13 @@ protected final HCLIdentifier id(TerminalNode tn) {
return tn != null ? id(tn.getSymbol()) : null;
}

protected final HCLIdentifier id(HCLParser.ScopedIdContext ctx) {
HCLIdentifier parent = ctx.target != null
? id(ctx.target)
: id(ctx.scopedId());
return created(new HCLIdentifier.ScopedId(parent, ctx.ref.getText()), ctx);
}

protected final HCLIdentifier id(Token t) {
return (t != null) && (t.getType() == HCLLexer.IDENTIFIER) ? created(new HCLIdentifier.SimpleId(t.getText()), t) : null;
}
Expand Down
19 changes: 13 additions & 6 deletions ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLExpressionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.antlr.v4.runtime.NoViableAltException;
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.tree.ParseTree;
import org.antlr.v4.runtime.tree.TerminalNode;
import org.netbeans.modules.languages.hcl.grammar.HCLLexer;
import static org.netbeans.modules.languages.hcl.grammar.HCLLexer.*;
import org.netbeans.modules.languages.hcl.grammar.HCLParser;
Expand Down Expand Up @@ -175,16 +176,22 @@ protected HCLExpression expr(HCLParser.FunctionCallContext ctx) {
if (ctx == null) {
return null;
}
List<HCLExpression> args = Collections.emptyList();
if (ctx.exception != null) {
return null;
}
List<HCLExpression> args = List.of();
boolean expand = false;
if (ctx.arguments() != null) {
args = new ArrayList<>(ctx.arguments().expression().size());
for (HCLParser.ExpressionContext ectx : ctx.arguments().expression()) {
args.add(expr(ectx));
}
args = ctx.arguments().expression().stream()
.map(this::expr)
.toList();
expand = ctx.arguments().ELLIPSIS() != null;
}
return created(new HCLFunction(id(ctx.IDENTIFIER()), args, expand), ctx);
HCLIdentifier name = ctx.IDENTIFIER() != null
? id(ctx.IDENTIFIER())
: id(ctx.scopedId());

return created(new HCLFunction(name, args, expand), ctx);
}

private static HCLArithmeticOperation.Operator binOp(int tokenType) {
Expand Down
2 changes: 2 additions & 0 deletions ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLIdentifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ default List<? extends HCLElement> elements() {
public record SimpleId(String id) implements HCLIdentifier {}

public record StringId(String id) implements HCLIdentifier {}

public record ScopedId(HCLIdentifier parent, String id) implements HCLIdentifier {}
}
10 changes: 8 additions & 2 deletions ide/languages.hcl/src/org/netbeans/modules/languages/hcl/grammar/g4/HCLExpressionParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,19 @@ heredoc
: HEREDOC_START heredocTemplate HEREDOC_END
;

// This is not part of the HCL spec, though used in Terraform 1.8 for function calls
scopedId
: target=IDENTIFIER SCOPE ref=IDENTIFIER
| scopedId SCOPE ref=IDENTIFIER
;

variableExpr
: IDENTIFIER
;

functionCall
: IDENTIFIER LPAREN arguments RPAREN
| IDENTIFIER LPAREN RPAREN
: (IDENTIFIER|scopedId) LPAREN arguments RPAREN
| (IDENTIFIER|scopedId) LPAREN RPAREN
;

arguments
Expand Down
9 changes: 7 additions & 2 deletions ide/languages.hcl/src/org/netbeans/modules/languages/hcl/grammar/g4/HCLLexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ QUESTION
: Question
;

// Used from Terraform 1.8 in provider exported function names
SCOPE
: Colon Colon
;

COLON
: Colon
;
Expand Down Expand Up @@ -123,8 +128,8 @@ ELLIPSIS
;

LEGACY_INDEX
: Dot DecDigit+
;
: Dot DecDigit+
;

DOT
: Dot
Expand Down
Loading