diff --git a/syntaxes/terraform.tmGrammar.json b/syntaxes/terraform.tmGrammar.json index b30bc0c50d..a2c5a7b2c1 100644 --- a/syntaxes/terraform.tmGrammar.json +++ b/syntaxes/terraform.tmGrammar.json @@ -112,6 +112,7 @@ }, "block": { "name": "meta.block.terraform", + "comment": "This will match Terraform blocks like `resource \"aws_instance\" \"web\" {` or `module {`", "begin": "(\\w+)(?:([\\s\\\"\\-[:word:]]*)(\\{))", "beginCaptures": { "1": { @@ -130,7 +131,19 @@ "2": { "patterns": [ { - "include": "#string_literals" + "name":"entity.name.tag.terraform", + "begin": "\"", + "beginCaptures": { + "0": { + "name": "entity.name.tag.begin.terraform" + } + }, + "end": "\"", + "endCaptures": { + "0": { + "name": "entity.name.tag.end.terraform" + } + } } ] }, diff --git a/tests/snapshot/terraform/basic.tf.snap b/tests/snapshot/terraform/basic.tf.snap index e85ada373d..82b60c6fa2 100644 --- a/tests/snapshot/terraform/basic.tf.snap +++ b/tests/snapshot/terraform/basic.tf.snap @@ -69,9 +69,9 @@ >provider "azurerm" { #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > features {} @@ -86,13 +86,13 @@ >resource "azurerm_resource_group" "rg" { #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^^^^^^^^^^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^^^^^^^^^^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > name = "myTFResourceGroup" diff --git a/tests/snapshot/terraform/blocks.tf.snap b/tests/snapshot/terraform/blocks.tf.snap index 2fa2965a12..683777447b 100644 --- a/tests/snapshot/terraform/blocks.tf.snap +++ b/tests/snapshot/terraform/blocks.tf.snap @@ -1,13 +1,13 @@ >resource "aws_instance" "web" { #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > ami = "ami-a1b2c3d4" diff --git a/tests/snapshot/terraform/data_sources.tf.snap b/tests/snapshot/terraform/data_sources.tf.snap index 90768e50d7..d90849d42d 100644 --- a/tests/snapshot/terraform/data_sources.tf.snap +++ b/tests/snapshot/terraform/data_sources.tf.snap @@ -1,13 +1,13 @@ >data "aws_ami" "example" { #^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > most_recent = true diff --git a/tests/snapshot/terraform/expressions_dynamic.tf.snap b/tests/snapshot/terraform/expressions_dynamic.tf.snap index 01e7d791a0..af74639c02 100644 --- a/tests/snapshot/terraform/expressions_dynamic.tf.snap +++ b/tests/snapshot/terraform/expressions_dynamic.tf.snap @@ -1,13 +1,13 @@ >resource "thing" "name" { #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > name = "tf-test-name" @@ -24,9 +24,9 @@ #^^ source.terraform meta.block.terraform # ^^^^^^^ source.terraform meta.block.terraform meta.block.terraform entity.name.label.terraform # ^ source.terraform meta.block.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^ source.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^ source.terraform meta.block.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform meta.block.terraform # ^ source.terraform meta.block.terraform meta.block.terraform punctuation.section.block.begin.terraform > for_each = var.settings @@ -96,9 +96,9 @@ #^^ source.terraform meta.block.terraform # ^^^^^^^ source.terraform meta.block.terraform meta.block.terraform entity.name.label.terraform # ^ source.terraform meta.block.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^^^^^^ source.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^^^^^^ source.terraform meta.block.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform meta.block.terraform # ^ source.terraform meta.block.terraform meta.block.terraform punctuation.section.block.begin.terraform > for_each = var.load_balancer_origin_groups @@ -129,9 +129,9 @@ #^^^^^^ source.terraform meta.block.terraform meta.block.terraform meta.block.terraform # ^^^^^^^ source.terraform meta.block.terraform meta.block.terraform meta.block.terraform meta.block.terraform entity.name.label.terraform # ^ source.terraform meta.block.terraform meta.block.terraform meta.block.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform meta.block.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^ source.terraform meta.block.terraform meta.block.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform meta.block.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform meta.block.terraform meta.block.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^ source.terraform meta.block.terraform meta.block.terraform meta.block.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform meta.block.terraform meta.block.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform meta.block.terraform meta.block.terraform meta.block.terraform # ^ source.terraform meta.block.terraform meta.block.terraform meta.block.terraform meta.block.terraform punctuation.section.block.begin.terraform > for_each = origin_group.value.origins diff --git a/tests/snapshot/terraform/issue927.tf.snap b/tests/snapshot/terraform/issue927.tf.snap index 564d1e86ef..00e0cfca9b 100644 --- a/tests/snapshot/terraform/issue927.tf.snap +++ b/tests/snapshot/terraform/issue927.tf.snap @@ -1,18 +1,18 @@ >variable "foo" {} #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.end.terraform >output "result-val" { value = var.foo } #^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform # ^ source.terraform meta.block.terraform @@ -29,9 +29,9 @@ >variable "some-var" { #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > default = "value" @@ -49,9 +49,9 @@ >module "foo-mod" { #^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > source = "./foo" @@ -78,9 +78,9 @@ >module "bar" { #^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > source = "./foo" diff --git a/tests/snapshot/terraform/modules.tf.snap b/tests/snapshot/terraform/modules.tf.snap index 7187a9780c..60eebf27b6 100644 --- a/tests/snapshot/terraform/modules.tf.snap +++ b/tests/snapshot/terraform/modules.tf.snap @@ -1,9 +1,9 @@ >module "servers" { #^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > source = "./app-cluster" @@ -29,13 +29,13 @@ >resource "aws_elb" "example" { #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > # ... diff --git a/tests/snapshot/terraform/providers.tf.snap b/tests/snapshot/terraform/providers.tf.snap index 31604fdf75..41bc75fd52 100644 --- a/tests/snapshot/terraform/providers.tf.snap +++ b/tests/snapshot/terraform/providers.tf.snap @@ -1,9 +1,9 @@ >provider "google" { #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > project = "acme-app" diff --git a/tests/snapshot/terraform/variables_input.tf.snap b/tests/snapshot/terraform/variables_input.tf.snap index 8565e2e09a..49cb07709a 100644 --- a/tests/snapshot/terraform/variables_input.tf.snap +++ b/tests/snapshot/terraform/variables_input.tf.snap @@ -5,9 +5,9 @@ >variable "image_id" { #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > type = string @@ -23,9 +23,9 @@ >variable "availability_zone_names" { #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^^^^^^^^^^^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^^^^^^^^^^^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > type = list(string) @@ -55,9 +55,9 @@ >variable "docker_ports" { #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > type = list(object({ @@ -142,9 +142,9 @@ >variable "image_id" { #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > type = string diff --git a/tests/snapshot/terraform/variables_local.tf.snap b/tests/snapshot/terraform/variables_local.tf.snap index 4d56c961e4..f64fcfef38 100644 --- a/tests/snapshot/terraform/variables_local.tf.snap +++ b/tests/snapshot/terraform/variables_local.tf.snap @@ -96,13 +96,13 @@ >resource "aws_instance" "example" { #^^^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > # ... diff --git a/tests/snapshot/terraform/variables_output.tf.snap b/tests/snapshot/terraform/variables_output.tf.snap index f966820356..dbb98228a2 100644 --- a/tests/snapshot/terraform/variables_output.tf.snap +++ b/tests/snapshot/terraform/variables_output.tf.snap @@ -1,9 +1,9 @@ >output "instance_ip_addr" { #^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^^^^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^^^^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > value = aws_instance.server.private_ip @@ -23,9 +23,9 @@ >output "instance_ip_addr" { #^^^^^^ source.terraform meta.block.terraform entity.name.type.terraform # ^ source.terraform meta.block.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -# ^^^^^^^^^^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -# ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +# ^^^^^^^^^^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +# ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform # ^ source.terraform meta.block.terraform # ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform > value = aws_instance.server.private_ip diff --git a/tests/unit/terraform/basic.tf b/tests/unit/terraform/basic.tf index 6cb8bc43c6..8b3700d3db 100644 --- a/tests/unit/terraform/basic.tf +++ b/tests/unit/terraform/basic.tf @@ -71,9 +71,9 @@ terraform { provider "azurerm" { ; <-------- source.terraform meta.block.terraform entity.name.type.terraform ; ^ source.terraform meta.block.terraform -; ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -; ^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -; ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +; ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +; ^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +; ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform ; ^ source.terraform meta.block.terraform ; ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform features {} @@ -88,13 +88,13 @@ provider "azurerm" { resource "azurerm_resource_group" "rg" { ; <-------- source.terraform meta.block.terraform entity.name.type.terraform ; ^ source.terraform meta.block.terraform -; ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -; ^^^^^^^^^^^^^^^^^^^^^^ source.terraform meta.block.terraform string.quoted.double.terraform -; ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +; ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +; ^^^^^^^^^^^^^^^^^^^^^^ source.terraform meta.block.terraform entity.name.tag.terraform +; ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform ; ^ source.terraform meta.block.terraform -; ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform -; ^^ source.terraform meta.block.terraform string.quoted.double.terraform -; ^ source.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform +; ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.begin.terraform +; ^^ source.terraform meta.block.terraform entity.name.tag.terraform +; ^ source.terraform meta.block.terraform entity.name.tag.terraform entity.name.tag.end.terraform ; ^ source.terraform meta.block.terraform ; ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform name = "myTFResourceGroup" diff --git a/tests/unit/terraform/resource.tf b/tests/unit/terraform/resource.tf new file mode 100644 index 0000000000..c590f23c13 --- /dev/null +++ b/tests/unit/terraform/resource.tf @@ -0,0 +1,7 @@ +; SYNTAX TEST "source.terraform" "basic sample" + +resource "foo" "bar"{ +; ^ source.terraform meta.block.terraform entity.name.tag.begin.terraform +; ^^^ source.terraform meta.block.terraform entity.name.tag.terraform +; ^ source.terraform meta.block.terraform entity.name.tag.end.terraform +}