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

Move TextMate scope.terraform to source.terraform #921

Merged
merged 1 commit into from
Feb 7, 2022
Merged

Move TextMate scope.terraform to source.terraform #921

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
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@
"grammars": [
{
"language": "terraform",
"scopeName": "scope.terraform",
"scopeName": "source.terraform",
"path": "./syntaxes/terraform.tmGrammar.json"
},
{
"language": "terraform-vars",
"scopeName": "scope.terraform",
"scopeName": "source.terraform",
"path": "./syntaxes/terraform.tmGrammar.json"
}
],
Expand Down Expand Up @@ -336,8 +336,8 @@
"test": "node ./out/test/runTest.js",
"test:unit": "jest",
"test:syntax": "npm run test:grammar && npm run test:snap",
"test:grammar": "npx vscode-tmgrammar-test -s scope.terraform -g syntaxes/terraform.tmGrammar.json -t 'tests/unit/**/*.tf'",
"test:snap": "npx vscode-tmgrammar-snap -s scope.terraform -g syntaxes/terraform.tmGrammar.json -t 'tests/snapshot/**/*.tf'",
"test:grammar": "npx vscode-tmgrammar-test -s source.terraform -g syntaxes/terraform.tmGrammar.json -t 'tests/unit/**/*.tf'",
"test:snap": "npx vscode-tmgrammar-snap -s source.terraform -g syntaxes/terraform.tmGrammar.json -t 'tests/snapshot/**/*.tf'",
"lint": "eslint src --ext ts",
"prettier": "prettier \"**/*.+(js|json|ts)\"",
"format": "npm run prettier -- --write",
Expand Down
2 changes: 1 addition & 1 deletion syntaxes/terraform.tmGrammar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"scopeName": "scope.terraform",
"scopeName": "source.terraform",
"fileTypes": [
"tf",
"tfvars",
Expand Down
180 changes: 90 additions & 90 deletions tests/snapshot/terraform/basic.tf.snap
View file
Open in desktop

Large diffs are not rendered by default.

100 changes: 50 additions & 50 deletions tests/snapshot/terraform/blocks.tf.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
>resource "aws_instance" "web" {
#^^^^^^^^ scope.terraform meta.block.terraform entity.name.type.terraform
# ^ scope.terraform meta.block.terraform
# ^ scope.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform
# ^^^^^^^^^^^^ scope.terraform meta.block.terraform string.quoted.double.terraform
# ^ scope.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform
# ^ scope.terraform meta.block.terraform
# ^ scope.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform
# ^^^ scope.terraform meta.block.terraform string.quoted.double.terraform
# ^ scope.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform
# ^ scope.terraform meta.block.terraform
# ^ scope.terraform meta.block.terraform punctuation.section.block.begin.terraform
#^^^^^^^^ 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
# ^ 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
# ^ source.terraform meta.block.terraform punctuation.section.block.begin.terraform
> ami = "ami-a1b2c3d4"
#^^ scope.terraform meta.block.terraform
# ^^^ scope.terraform meta.block.terraform variable.declaration.terraform variable.other.readwrite.terraform
# ^^^^^^^^^^^ scope.terraform meta.block.terraform variable.declaration.terraform
# ^ scope.terraform meta.block.terraform variable.declaration.terraform keyword.operator.assignment.terraform
# ^ scope.terraform meta.block.terraform variable.declaration.terraform
# ^ scope.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform
# ^^^^^^^^^^^^ scope.terraform meta.block.terraform string.quoted.double.terraform
# ^ scope.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform
#^^ source.terraform meta.block.terraform
# ^^^ source.terraform meta.block.terraform variable.declaration.terraform variable.other.readwrite.terraform
# ^^^^^^^^^^^ source.terraform meta.block.terraform variable.declaration.terraform
# ^ source.terraform meta.block.terraform variable.declaration.terraform keyword.operator.assignment.terraform
# ^ source.terraform meta.block.terraform variable.declaration.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
> instance_type = "t2.micro"
#^^ scope.terraform meta.block.terraform
# ^^^^^^^^^^^^^ scope.terraform meta.block.terraform variable.declaration.terraform variable.other.readwrite.terraform
# ^ scope.terraform meta.block.terraform variable.declaration.terraform
# ^ scope.terraform meta.block.terraform variable.declaration.terraform keyword.operator.assignment.terraform
# ^ scope.terraform meta.block.terraform variable.declaration.terraform
# ^ scope.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform
# ^^^^^^^^ scope.terraform meta.block.terraform string.quoted.double.terraform
# ^ scope.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform
#^^ source.terraform meta.block.terraform
# ^^^^^^^^^^^^^ source.terraform meta.block.terraform variable.declaration.terraform variable.other.readwrite.terraform
# ^ source.terraform meta.block.terraform variable.declaration.terraform
# ^ source.terraform meta.block.terraform variable.declaration.terraform keyword.operator.assignment.terraform
# ^ source.terraform meta.block.terraform variable.declaration.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
> timeouts {
#^^ scope.terraform meta.block.terraform
# ^^^^^^^^ scope.terraform meta.block.terraform meta.block.terraform entity.name.label.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform punctuation.section.block.begin.terraform
#^^ 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 punctuation.section.block.begin.terraform
> create = "60m"
#^^^^ scope.terraform meta.block.terraform meta.block.terraform
# ^^^^^^ scope.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform variable.other.readwrite.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform keyword.operator.assignment.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform
# ^^^ scope.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform
#^^^^ source.terraform meta.block.terraform meta.block.terraform
# ^^^^^^ source.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform variable.other.readwrite.terraform
# ^ source.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform
# ^ source.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform keyword.operator.assignment.terraform
# ^ source.terraform meta.block.terraform meta.block.terraform variable.declaration.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
> delete = "2h"
#^^^^ scope.terraform meta.block.terraform meta.block.terraform
# ^^^^^^ scope.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform variable.other.readwrite.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform keyword.operator.assignment.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform
# ^^ scope.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform
#^^^^ source.terraform meta.block.terraform meta.block.terraform
# ^^^^^^ source.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform variable.other.readwrite.terraform
# ^ source.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform
# ^ source.terraform meta.block.terraform meta.block.terraform variable.declaration.terraform keyword.operator.assignment.terraform
# ^ source.terraform meta.block.terraform meta.block.terraform variable.declaration.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
> }
#^^ scope.terraform meta.block.terraform meta.block.terraform
# ^ scope.terraform meta.block.terraform meta.block.terraform punctuation.section.block.end.terraform
#^^ source.terraform meta.block.terraform meta.block.terraform
# ^ source.terraform meta.block.terraform meta.block.terraform punctuation.section.block.end.terraform
>}
#^ scope.terraform meta.block.terraform punctuation.section.block.end.terraform
#^ source.terraform meta.block.terraform punctuation.section.block.end.terraform
>
14 changes: 7 additions & 7 deletions tests/snapshot/terraform/comments.tf.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
># line comment
#^ scope.terraform comment.line.terraform punctuation.definition.comment.terraform
# ^^^^^^^^^^^^^ scope.terraform comment.line.terraform
#^ source.terraform comment.line.terraform punctuation.definition.comment.terraform
# ^^^^^^^^^^^^^ source.terraform comment.line.terraform
>
>// line comment
#^^ scope.terraform comment.line.terraform punctuation.definition.comment.terraform
# ^^^^^^^^^^^^^ scope.terraform comment.line.terraform
#^^ source.terraform comment.line.terraform punctuation.definition.comment.terraform
# ^^^^^^^^^^^^^ source.terraform comment.line.terraform
>
>/*
#^^ scope.terraform comment.block.terraform punctuation.definition.comment.terraform
#^^ source.terraform comment.block.terraform punctuation.definition.comment.terraform
> Block comment
#^^^^^^^^^^^^^^^^ scope.terraform comment.block.terraform
#^^^^^^^^^^^^^^^^ source.terraform comment.block.terraform
>*/
#^^ scope.terraform comment.block.terraform punctuation.definition.comment.terraform
#^^ source.terraform comment.block.terraform punctuation.definition.comment.terraform
>
Loading