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

Jump to bottom

Distinguish between type syntax vs expression syntax in the parser #13671

Merged
merged 2 commits into from Mar 27, 2024
Merged

Distinguish between type syntax vs expression syntax in the parser #13671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcf1b36
Distinguish between type syntax and expression syntax in the parser, …
jeskew Mar 21, 2024
d9083ef
Update baselines
jeskew Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/Bicep.Core.Samples/Files/baselines/AKS_LF/main.syntax.bicep
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ param dnsPrefix string
//@[000:0005) | ├─Token(Identifier) |param|
//@[006:0015) | ├─IdentifierSyntax
//@[006:0015) | | └─Token(Identifier) |dnsPrefix|
//@[016:0022) | └─VariableAccessSyntax
//@[016:0022) | └─TypeVariableAccessSyntax
//@[016:0022) | └─IdentifierSyntax
//@[016:0022) | └─Token(Identifier) |string|
//@[022:0023) ├─Token(NewLine) |\n|
Expand All @@ -15,7 +15,7 @@ param linuxAdminUsername string
//@[000:0005) | ├─Token(Identifier) |param|
//@[006:0024) | ├─IdentifierSyntax
//@[006:0024) | | └─Token(Identifier) |linuxAdminUsername|
//@[025:0031) | └─VariableAccessSyntax
//@[025:0031) | └─TypeVariableAccessSyntax
//@[025:0031) | └─IdentifierSyntax
//@[025:0031) | └─Token(Identifier) |string|
//@[031:0032) ├─Token(NewLine) |\n|
Expand All @@ -24,7 +24,7 @@ param sshRSAPublicKey string
//@[000:0005) | ├─Token(Identifier) |param|
//@[006:0021) | ├─IdentifierSyntax
//@[006:0021) | | └─Token(Identifier) |sshRSAPublicKey|
//@[022:0028) | └─VariableAccessSyntax
//@[022:0028) | └─TypeVariableAccessSyntax
//@[022:0028) | └─IdentifierSyntax
//@[022:0028) | └─Token(Identifier) |string|
//@[028:0030) ├─Token(NewLine) |\n\n|
Expand All @@ -43,7 +43,7 @@ param servcePrincipalClientId string
//@[000:0005) | ├─Token(Identifier) |param|
//@[006:0029) | ├─IdentifierSyntax
//@[006:0029) | | └─Token(Identifier) |servcePrincipalClientId|
//@[030:0036) | └─VariableAccessSyntax
//@[030:0036) | └─TypeVariableAccessSyntax
//@[030:0036) | └─IdentifierSyntax
//@[030:0036) | └─Token(Identifier) |string|
//@[036:0038) ├─Token(NewLine) |\n\n|
Expand All @@ -62,7 +62,7 @@ param servicePrincipalClientSecret string
//@[000:0005) | ├─Token(Identifier) |param|
//@[006:0034) | ├─IdentifierSyntax
//@[006:0034) | | └─Token(Identifier) |servicePrincipalClientSecret|
//@[035:0041) | └─VariableAccessSyntax
//@[035:0041) | └─TypeVariableAccessSyntax
//@[035:0041) | └─IdentifierSyntax
//@[035:0041) | └─Token(Identifier) |string|
//@[041:0043) ├─Token(NewLine) |\n\n|
Expand All @@ -74,7 +74,7 @@ param clusterName string = 'aks101cluster'
//@[000:0005) | ├─Token(Identifier) |param|
//@[006:0017) | ├─IdentifierSyntax
//@[006:0017) | | └─Token(Identifier) |clusterName|
//@[018:0024) | ├─VariableAccessSyntax
//@[018:0024) | ├─TypeVariableAccessSyntax
//@[018:0024) | | └─IdentifierSyntax
//@[018:0024) | | └─Token(Identifier) |string|
//@[025:0042) | └─ParameterDefaultValueSyntax
Expand All @@ -87,7 +87,7 @@ param location string = resourceGroup().location
//@[000:0005) | ├─Token(Identifier) |param|
//@[006:0014) | ├─IdentifierSyntax
//@[006:0014) | | └─Token(Identifier) |location|
//@[015:0021) | ├─VariableAccessSyntax
//@[015:0021) | ├─TypeVariableAccessSyntax
//@[015:0021) | | └─IdentifierSyntax
//@[015:0021) | | └─Token(Identifier) |string|
//@[022:0048) | └─ParameterDefaultValueSyntax
Expand Down Expand Up @@ -132,7 +132,7 @@ param osDiskSizeGB int = 0
//@[000:0005) | ├─Token(Identifier) |param|
//@[006:0018) | ├─IdentifierSyntax
//@[006:0018) | | └─Token(Identifier) |osDiskSizeGB|
//@[019:0022) | ├─VariableAccessSyntax
//@[019:0022) | ├─TypeVariableAccessSyntax
//@[019:0022) | | └─IdentifierSyntax
//@[019:0022) | | └─Token(Identifier) |int|
//@[023:0026) | └─ParameterDefaultValueSyntax
Expand Down Expand Up @@ -170,7 +170,7 @@ param agentCount int = 3
//@[000:0005) | ├─Token(Identifier) |param|
//@[006:0016) | ├─IdentifierSyntax
//@[006:0016) | | └─Token(Identifier) |agentCount|
//@[017:0020) | ├─VariableAccessSyntax
//@[017:0020) | ├─TypeVariableAccessSyntax
//@[017:0020) | | └─IdentifierSyntax
//@[017:0020) | | └─Token(Identifier) |int|
//@[021:0024) | └─ParameterDefaultValueSyntax
Expand All @@ -184,7 +184,7 @@ param agentVMSize string = 'Standard_DS2_v2'
//@[000:0005) | ├─Token(Identifier) |param|
//@[006:0017) | ├─IdentifierSyntax
//@[006:0017) | | └─Token(Identifier) |agentVMSize|
//@[018:0024) | ├─VariableAccessSyntax
//@[018:0024) | ├─TypeVariableAccessSyntax
//@[018:0024) | | └─IdentifierSyntax
//@[018:0024) | | └─Token(Identifier) |string|
//@[025:0044) | └─ParameterDefaultValueSyntax
Expand Down
8 changes: 4 additions & 4 deletions src/Bicep.Core.Samples/Files/baselines/Dependencies_LF/main.syntax.bicep
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ param deployTimeParam string = 'steve'
//@[00:0005) | ├─Token(Identifier) |param|
//@[06:0021) | ├─IdentifierSyntax
//@[06:0021) | | └─Token(Identifier) |deployTimeParam|
//@[22:0028) | ├─VariableAccessSyntax
//@[22:0028) | ├─TypeVariableAccessSyntax
//@[22:0028) | | └─IdentifierSyntax
//@[22:0028) | | └─Token(Identifier) |string|
//@[29:0038) | └─ParameterDefaultValueSyntax
Expand Down Expand Up @@ -144,7 +144,7 @@ output resourceAType string = resA.type
//@[00:0006) | ├─Token(Identifier) |output|
//@[07:0020) | ├─IdentifierSyntax
//@[07:0020) | | └─Token(Identifier) |resourceAType|
//@[21:0027) | ├─VariableAccessSyntax
//@[21:0027) | ├─TypeVariableAccessSyntax
//@[21:0027) | | └─IdentifierSyntax
//@[21:0027) | | └─Token(Identifier) |string|
//@[28:0029) | ├─Token(Assignment) |=|
Expand Down Expand Up @@ -212,7 +212,7 @@ output resourceBId string = resB.id
//@[00:0006) | ├─Token(Identifier) |output|
//@[07:0018) | ├─IdentifierSyntax
//@[07:0018) | | └─Token(Identifier) |resourceBId|
//@[19:0025) | ├─VariableAccessSyntax
//@[19:0025) | ├─TypeVariableAccessSyntax
//@[19:0025) | | └─IdentifierSyntax
//@[19:0025) | | └─Token(Identifier) |string|
//@[26:0027) | ├─Token(Assignment) |=|
Expand Down Expand Up @@ -443,7 +443,7 @@ output resourceCProperties object = resC.properties
//@[00:0006) | ├─Token(Identifier) |output|
//@[07:0026) | ├─IdentifierSyntax
//@[07:0026) | | └─Token(Identifier) |resourceCProperties|
//@[27:0033) | ├─VariableAccessSyntax
//@[27:0033) | ├─TypeVariableAccessSyntax
//@[27:0033) | | └─IdentifierSyntax
//@[27:0033) | | └─Token(Identifier) |object|
//@[34:0035) | ├─Token(Assignment) |=|
Expand Down
8 changes: 4 additions & 4 deletions ...p.Core.Samples/Files/baselines/DisableNextLineDiagnosticsDirective_CRLF/main.syntax.bicep
View file
Open in desktop
Expand Up @@ -113,7 +113,7 @@ param storageAccount1 string = 'testStorageAccount'
//@[00:005) | ├─Token(Identifier) |param|
//@[06:021) | ├─IdentifierSyntax
//@[06:021) | | └─Token(Identifier) |storageAccount1|
//@[22:028) | ├─VariableAccessSyntax
//@[22:028) | ├─TypeVariableAccessSyntax
//@[22:028) | | └─IdentifierSyntax
//@[22:028) | | └─Token(Identifier) |string|
//@[29:051) | └─ParameterDefaultValueSyntax
Expand All @@ -128,7 +128,7 @@ param storageAccount2 string = 'testStorageAccount'
//@[00:005) | ├─Token(Identifier) |param|
//@[06:021) | ├─IdentifierSyntax
//@[06:021) | | └─Token(Identifier) |storageAccount2|
//@[22:028) | ├─VariableAccessSyntax
//@[22:028) | ├─TypeVariableAccessSyntax
//@[22:028) | | └─IdentifierSyntax
//@[22:028) | | └─Token(Identifier) |string|
//@[29:051) | └─ParameterDefaultValueSyntax
Expand All @@ -143,7 +143,7 @@ param storageAccount3 string = 'testStorageAccount'
//@[00:005) | ├─Token(Identifier) |param|
//@[06:021) | ├─IdentifierSyntax
//@[06:021) | | └─Token(Identifier) |storageAccount3|
//@[22:028) | ├─VariableAccessSyntax
//@[22:028) | ├─TypeVariableAccessSyntax
//@[22:028) | | └─IdentifierSyntax
//@[22:028) | | └─Token(Identifier) |string|
//@[29:051) | └─ParameterDefaultValueSyntax
Expand All @@ -158,7 +158,7 @@ param storageAccount5 string = 'testStorageAccount'
//@[00:005) | ├─Token(Identifier) |param|
//@[06:021) | ├─IdentifierSyntax
//@[06:021) | | └─Token(Identifier) |storageAccount5|
//@[22:028) | ├─VariableAccessSyntax
//@[22:028) | ├─TypeVariableAccessSyntax
//@[22:028) | | └─IdentifierSyntax
//@[22:028) | | └─Token(Identifier) |string|
//@[29:051) | └─ParameterDefaultValueSyntax
Expand Down