Block types named 'resource' and update associated diagnostic message

src/Bicep.Core.Samples/Files/InvalidTypeDeclarations_LF/main.bicep

@@ -4,7 +4,9 @@ type noAssignment
 
 type incompleteAssignment =
 
-type string = string
+type string = int
+
+type resource = bool
 
 @sealed()
 type sealedString = string

src/Bicep.Core.Samples/Files/InvalidTypeDeclarations_LF/main.diagnostics.bicep

@@ -10,8 +10,11 @@ type noAssignment
 type incompleteAssignment =
 //@[27:27) [BCP279 (Error)] Expected a type at this location. Please specify a valid type expression or one of the following types: "array", "bool", "int", "object", "string". (CodeDescription: none) ||
 
-type string = string
-//@[05:11) [BCP301 (Error)] A user-defined type may not be named "string" because it would mask the ARM type of the same name. (CodeDescription: none) |string|
+type string = int
+//@[05:11) [BCP301 (Error)] The type name "string" is reserved and may not be attached to a user-defined type. (CodeDescription: none) |string|
+
+type resource = bool
+//@[05:13) [BCP301 (Error)] The type name "resource" is reserved and may not be attached to a user-defined type. (CodeDescription: none) |resource|
 
 @sealed()
 //@[00:09) [BCP124 (Error)] The decorator "sealed" can only be attached to targets of type "object", but the target has type "string". (CodeDescription: none) |@sealed()|

src/Bicep.Core.Samples/Files/InvalidTypeDeclarations_LF/main.formatted.bicep

@@ -4,7 +4,9 @@ type noAssignment
 
 type incompleteAssignment =
 
-type string = string
+type string = int
+
+type resource = bool
 
 @sealed()
 type sealedString = string

src/Bicep.Core.Samples/Files/InvalidTypeDeclarations_LF/main.symbols.bicep

@@ -1,71 +1,74 @@
 type 44
-//@[5:07) Type <error>. Type: any. Declaration start char: 0, length: 7
+//@[5:07) TypeAlias <error>. Type: any. Declaration start char: 0, length: 7
 
 type noAssignment
-//@[5:17) Type noAssignment. Type: any. Declaration start char: 0, length: 17
+//@[5:17) TypeAlias noAssignment. Type: any. Declaration start char: 0, length: 17
 
 type incompleteAssignment =
-//@[5:25) Type incompleteAssignment. Type: any. Declaration start char: 0, length: 27
+//@[5:25) TypeAlias incompleteAssignment. Type: any. Declaration start char: 0, length: 27
 
-type string = string
-//@[5:11) Type string. Type: string. Declaration start char: 0, length: 20
+type string = int
+//@[5:11) TypeAlias string. Type: int. Declaration start char: 0, length: 17
+
+type resource = bool
+//@[5:13) TypeAlias resource. Type: bool. Declaration start char: 0, length: 20
 
 @sealed()
 type sealedString = string
-//@[5:17) Type sealedString. Type: string. Declaration start char: 0, length: 36
+//@[5:17) TypeAlias sealedString. Type: string. Declaration start char: 0, length: 36
 
 type disallowedUnion = 'foo'|21
-//@[5:20) Type disallowedUnion. Type: error. Declaration start char: 0, length: 31
+//@[5:20) TypeAlias disallowedUnion. Type: error. Declaration start char: 0, length: 31
 
 type validStringLiteralUnion = 'foo'|'bar'|'baz'
-//@[5:28) Type validStringLiteralUnion. Type: 'bar' | 'baz' | 'foo'. Declaration start char: 0, length: 48
+//@[5:28) TypeAlias validStringLiteralUnion. Type: 'bar' | 'baz' | 'foo'. Declaration start char: 0, length: 48
 
 type validUnionInvalidAddition = validStringLiteralUnion|10
-//@[5:30) Type validUnionInvalidAddition. Type: error. Declaration start char: 0, length: 59
+//@[5:30) TypeAlias validUnionInvalidAddition. Type: error. Declaration start char: 0, length: 59
 
 type invalidUnionInvalidAddition = disallowedUnion|true
-//@[5:32) Type invalidUnionInvalidAddition. Type: error. Declaration start char: 0, length: 55
+//@[5:32) TypeAlias invalidUnionInvalidAddition. Type: error. Declaration start char: 0, length: 55
 
 type nullLiteral = null
-//@[5:16) Type nullLiteral. Type: error. Declaration start char: 0, length: 23
+//@[5:16) TypeAlias nullLiteral. Type: error. Declaration start char: 0, length: 23
 
 type unionOfNulls = null|null
-//@[5:17) Type unionOfNulls. Type: error. Declaration start char: 0, length: 29
+//@[5:17) TypeAlias unionOfNulls. Type: error. Declaration start char: 0, length: 29
 
 @minLength(3)
 type lengthConstrainedInt = int
-//@[5:25) Type lengthConstrainedInt. Type: int. Declaration start char: 0, length: 45
+//@[5:25) TypeAlias lengthConstrainedInt. Type: int. Declaration start char: 0, length: 45
 
 @minValue(3)
 type valueConstrainedString = string
-//@[5:27) Type valueConstrainedString. Type: string. Declaration start char: 0, length: 49
+//@[5:27) TypeAlias valueConstrainedString. Type: string. Declaration start char: 0, length: 49
 
 type tautology = tautology
-//@[5:14) Type tautology. Type: error. Declaration start char: 0, length: 26
+//@[5:14) TypeAlias tautology. Type: error. Declaration start char: 0, length: 26
 
 type tautologicalUnion = tautologicalUnion|'foo'
-//@[5:22) Type tautologicalUnion. Type: error. Declaration start char: 0, length: 48
+//@[5:22) TypeAlias tautologicalUnion. Type: error. Declaration start char: 0, length: 48
 
 type tautologicalArray = tautologicalArray[]
-//@[5:22) Type tautologicalArray. Type: error. Declaration start char: 0, length: 44
+//@[5:22) TypeAlias tautologicalArray. Type: error. Declaration start char: 0, length: 44
 
 type directCycleStart = directCycleReturn
-//@[5:21) Type directCycleStart. Type: error. Declaration start char: 0, length: 41
+//@[5:21) TypeAlias directCycleStart. Type: error. Declaration start char: 0, length: 41
 
 type directCycleReturn = directCycleStart
-//@[5:22) Type directCycleReturn. Type: error. Declaration start char: 0, length: 41
+//@[5:22) TypeAlias directCycleReturn. Type: error. Declaration start char: 0, length: 41
 
 type cycleRoot = connector
-//@[5:14) Type cycleRoot. Type: error. Declaration start char: 0, length: 26
+//@[5:14) TypeAlias cycleRoot. Type: error. Declaration start char: 0, length: 26
 
 type connector = cycleBack
-//@[5:14) Type connector. Type: error. Declaration start char: 0, length: 26
+//@[5:14) TypeAlias connector. Type: error. Declaration start char: 0, length: 26
 
 type cycleBack = cycleRoot
-//@[5:14) Type cycleBack. Type: error. Declaration start char: 0, length: 26
+//@[5:14) TypeAlias cycleBack. Type: error. Declaration start char: 0, length: 26
 
 type objectWithInvalidPropertyDecorators = {
-//@[5:40) Type objectWithInvalidPropertyDecorators. Type: { fooProp: string, barProp: string, krispyProp: string }. Declaration start char: 0, length: 168
+//@[5:40) TypeAlias objectWithInvalidPropertyDecorators. Type: { fooProp: string, barProp: string, krispyProp: string }. Declaration start char: 0, length: 168
  @sealed()
  fooProp: string
 
@@ -77,10 +80,13 @@ type objectWithInvalidPropertyDecorators = {
 }
 
 type objectWithInvalidRecursion = {
-//@[5:31) Type objectWithInvalidRecursion. Type: error. Declaration start char: 0, length: 92
+//@[5:31) TypeAlias objectWithInvalidRecursion. Type: error. Declaration start char: 0, length: 92
  requiredAndRecursiveProp: objectWithInvalidRecursion
 }
 
+type arrayWithInvalidMember = objectWithInvalidRecursion[]
+//@[5:27) TypeAlias arrayWithInvalidMember. Type: error[]. Declaration start char: 0, length: 58
+
 @sealed()
 param sealedStringParam string
 //@[6:23) Parameter sealedStringParam. Type: string. Declaration start char: 0, length: 40

src/Bicep.Core.Samples/Files/InvalidTypeDeclarations_LF/main.syntax.bicep

@@ -1,5 +1,5 @@
 type 44
-//@[00:1109) ProgramSyntax
+//@[00:1128) ProgramSyntax
 //@[00:0007) ├─TypeDeclarationSyntax
 //@[00:0004) | ├─Token(Identifier) |type|
 //@[05:0007) | ├─IdentifierSyntax
@@ -27,14 +27,24 @@ type incompleteAssignment =
 //@[27:0027) | └─SkippedTriviaSyntax
 //@[27:0029) ├─Token(NewLine) |\n\n|
 
-type string = string
-//@[00:0020) ├─TypeDeclarationSyntax
+type string = int
+//@[00:0017) ├─TypeDeclarationSyntax
 //@[00:0004) | ├─Token(Identifier) |type|
 //@[05:0011) | ├─IdentifierSyntax
 //@[05:0011) | | └─Token(Identifier) |string|
 //@[12:0013) | ├─Token(Assignment) |=|
-//@[14:0020) | └─SimpleTypeSyntax
-//@[14:0020) | └─Token(Identifier) |string|
+//@[14:0017) | └─SimpleTypeSyntax
+//@[14:0017) | └─Token(Identifier) |int|
+//@[17:0019) ├─Token(NewLine) |\n\n|
+
+type resource = bool
+//@[00:0020) ├─TypeDeclarationSyntax
+//@[00:0004) | ├─Token(Identifier) |type|
+//@[05:0013) | ├─IdentifierSyntax
+//@[05:0013) | | └─Token(Identifier) |resource|
+//@[14:0015) | ├─Token(Assignment) |=|
+//@[16:0020) | └─SimpleTypeSyntax
+//@[16:0020) | └─Token(Identifier) |bool|
 //@[20:0022) ├─Token(NewLine) |\n\n|
 
 @sealed()

src/Bicep.Core.Samples/Files/InvalidTypeDeclarations_LF/main.tokens.bicep

@@ -14,11 +14,18 @@ type incompleteAssignment =
 //@[26:27) Assignment |=|
 //@[27:29) NewLine |\n\n|
 
-type string = string
+type string = int
 //@[00:04) Identifier |type|
 //@[05:11) Identifier |string|
 //@[12:13) Assignment |=|
-//@[14:20) Identifier |string|
+//@[14:17) Identifier |int|
+//@[17:19) NewLine |\n\n|
+
+type resource = bool
+//@[00:04) Identifier |type|
+//@[05:13) Identifier |resource|
+//@[14:15) Assignment |=|
+//@[16:20) Identifier |bool|
 //@[20:22) NewLine |\n\n|
 
 @sealed()

src/Bicep.Core.Samples/Files/TypeDeclarations_LF/main.symbols.bicep

@@ -1,7 +1,7 @@
 // @description('The foo type')
 // @sealed()
 type foo = {
-//@[5:08) Type foo. Type: { stringProp: string, objectProp: { intProp: int, intArrayArrayProp?: int[][] }, typeRefProp: bar, literalProp: 'literal', recursion?: foo }. Declaration start char: 0, length: 262
+//@[5:08) TypeAlias foo. Type: { stringProp: string, objectProp: { intProp: int, intArrayArrayProp?: int[][] }, typeRefProp: bar, literalProp: 'literal', recursion?: foo }. Declaration start char: 0, length: 262
  @minLength(3)
  @maxLength(10)
  // @description('A string property')
@@ -29,19 +29,19 @@ type foo = {
 // ]
 // })
 type bar = int[][][][]
-//@[5:08) Type bar. Type: int[][][][]. Declaration start char: 0, length: 181
+//@[5:08) TypeAlias bar. Type: int[][][][]. Declaration start char: 0, length: 181
 
 type aUnion = 'snap'|'crackle'|'pop'
-//@[5:11) Type aUnion. Type: 'crackle' | 'pop' | 'snap'. Declaration start char: 0, length: 36
+//@[5:11) TypeAlias aUnion. Type: 'crackle' | 'pop' | 'snap'. Declaration start char: 0, length: 36
 
 type expandedUnion = aUnion|'fizz'|'buzz'|'pop'
-//@[5:18) Type expandedUnion. Type: 'buzz' | 'crackle' | 'fizz' | 'pop' | 'snap'. Declaration start char: 0, length: 47
+//@[5:18) TypeAlias expandedUnion. Type: 'buzz' | 'crackle' | 'fizz' | 'pop' | 'snap'. Declaration start char: 0, length: 47
 
 type mixedArray = ('heffalump'|'woozle'|{ shape: '*', size: '*'}|10|-10|true|!true|null)[]
-//@[5:15) Type mixedArray. Type: ('heffalump' | 'woozle' | -10 | 10 | false | null | true | { shape: '*', size: '*' })[]. Declaration start char: 0, length: 90
+//@[5:15) TypeAlias mixedArray. Type: ('heffalump' | 'woozle' | -10 | 10 | false | null | true | { shape: '*', size: '*' })[]. Declaration start char: 0, length: 90
 
 type String = string
-//@[5:11) Type String. Type: string. Declaration start char: 0, length: 20
+//@[5:11) TypeAlias String. Type: string. Declaration start char: 0, length: 20
 
 param inlineObjectParam {
 //@[6:23) Parameter inlineObjectParam. Type: { foo: string, bar: 100 | 200 | 300 | 400 | 500, baz: bool }. Declaration start char: 0, length: 123

src/Bicep.Core/Diagnostics/DiagnosticBuilder.cs

@@ -1710,10 +1710,10 @@ public ErrorDiagnostic UnknownModuleReferenceScheme(string badScheme, ImmutableA
  "BCP300",
  $"Expected a type literal at this location. Please specify a concrete value or a reference to a literal type.");
 
- public ErrorDiagnostic TypeNameMasksAmbientType(string conflictingName) => new(
+ public ErrorDiagnostic ReservedTypeName(string reservedName) => new(
  TextSpan,
  "BCP301",
- $@"A user-defined type may not be named ""{conflictingName}"" because it would mask the ARM type of the same name.");
+ $@"The type name ""{reservedName}"" is reserved and may not be attached to a user-defined type.");
 
  public ErrorDiagnostic SymbolicNameIsNotAType(string name, IEnumerable<string> validTypes) => new(
  TextSpan,

src/Bicep.Core/LanguageConstants.cs

@@ -197,6 +197,8 @@ public static class LanguageConstants
  // types allowed to use in output and parameter declarations
  public static readonly ImmutableSortedDictionary<string, TypeSymbol> DeclarationTypes = new[] { String, Object, Int, Bool, Array }.ToImmutableSortedDictionary(type => type.Name, type => type, StringComparer.Ordinal);
 
+ public static readonly ImmutableHashSet<string> ReservedTypeNames = ImmutableHashSet.CreateRange<string>(IdentifierComparer, DeclarationTypes.Keys.Append(ResourceKeyword));
+
  public static TypeSymbol? TryGetDeclarationType(string? typeName)
  {
  if (typeName != null && DeclarationTypes.TryGetValue(typeName, out var primitiveType))

src/Bicep.Core/TypeSystem/TypeAssignmentVisitor.cs

@@ -433,9 +433,9 @@ public override void VisitTypeDeclarationSyntax(TypeDeclarationSyntax syntax)
  {
  var declaredType = GetDeclaredTypeAndValidateDecorators(syntax, syntax.Value, diagnostics);
 
- if (LanguageConstants.DeclarationTypes.Keys.Any(s => LanguageConstants.IdentifierComparer.Equals(s, syntax.Name.IdentifierName)))
+ if (LanguageConstants.ReservedTypeNames.Contains(syntax.Name.IdentifierName))
  {
- diagnostics.Write(DiagnosticBuilder.ForPosition(syntax.Name).TypeNameMasksAmbientType(syntax.Name.IdentifierName));
+ diagnostics.Write(DiagnosticBuilder.ForPosition(syntax.Name).ReservedTypeName(syntax.Name.IdentifierName));
  }
 
  base.VisitTypeDeclarationSyntax(syntax);