Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion rewrite-hcl/src/main/antlr/HCLParser.g4
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,11 @@ object
;

objectelem
: (Identifier | NULL | LPAREN Identifier RPAREN | QUOTE quotedTemplatePart* QUOTE | expression) (ASSIGN | COLON) expression COMMA?
: (qualifiedIdentifier | NULL | LPAREN qualifiedIdentifier RPAREN | QUOTE quotedTemplatePart* QUOTE | expression) (ASSIGN | COLON) expression COMMA?
;

qualifiedIdentifier
: Identifier (DOT Identifier)*
;

// For Expressions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,8 @@ public Hcl visitObjectelem(HCLParser.ObjectelemContext ctx) {
if (ctx.LPAREN() != null) {
parenthesesPrefix = sourceBefore("(");
}
if (ctx.Identifier() != null) {
name = visitIdentifier(ctx.Identifier());
if (ctx.qualifiedIdentifier() != null) {
name = visitQualifiedIdentifier(ctx.qualifiedIdentifier());
} else if (ctx.NULL() != null) {
name = visitIdentifier(ctx.NULL());
} else if (ctx.expression(0) != null) {
Expand Down Expand Up @@ -700,6 +700,32 @@ public Hcl visitVariableExpr(HCLParser.VariableExprContext ctx) {
return ident;
}

@Override
public @Nullable Expression visitQualifiedIdentifier(HCLParser.QualifiedIdentifierContext ctx) {
if (ctx == null) {
return null;
}
List<TerminalNode> identifiers = ctx.Identifier();
if (identifiers.size() == 1) {
return visitIdentifier(identifiers.get(0));
}
Expression expr = visitIdentifier(identifiers.get(0));
for (int i = 1; i < identifiers.size(); i++) {
expr = new Hcl.AttributeAccess(
randomId(),
expr.getPrefix(),
Markers.EMPTY,
expr.withPrefix(Space.EMPTY),
new HclLeftPadded<>(
sourceBefore("."),
visitIdentifier(identifiers.get(i)),
Markers.EMPTY
)
);
}
return expr;
}

private String prefix(ParserRuleContext ctx) {
return prefix(ctx.getStart());
}
Expand Down

Large diffs are not rendered by default.

Loading