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

Add new scope for block type and name #934

Merged
merged 1 commit into from
Feb 18, 2022
Merged

Add new scope for block type and name #934

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
15 changes: 14 additions & 1 deletion syntaxes/terraform.tmGrammar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
}
}
]
},
Expand Down
18 changes: 9 additions & 9 deletions tests/snapshot/terraform/basic.tf.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand All @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions tests/snapshot/terraform/blocks.tf.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
12 changes: 6 additions & 6 deletions tests/snapshot/terraform/data_sources.tf.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
30 changes: 15 additions & 15 deletions tests/snapshot/terraform/expressions_dynamic.tf.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions tests/snapshot/terraform/issue927.tf.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
Loading