Merge pull request #59650 from CyrusNajmabadi/jsonErrorMessage

Improve json error message in particular case

src/EditorFeatures/CSharpTest2/EmbeddedLanguages/Json/CSharpJsonParserTests_BasicTests.cs

@@ -1168,7 +1168,7 @@ public void TestMissingColon()
   </CompilationUnit>
 </Tree>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""20"" Length=""3"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""20"" Length=""3"" />
 </Diagnostics>",
         @"<Diagnostics>
   <Diagnostic Message=""Strings must start with &quot; not '"" Start=""12"" Length=""1"" />
@@ -1328,10 +1328,10 @@ public void TestNestedPropertyMissingColon()
   </CompilationUnit>
 </Tree>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""102"" Length=""8"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""102"" Length=""8"" />
 </Diagnostics>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""102"" Length=""8"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""102"" Length=""8"" />
 </Diagnostics>");
         }
 
@@ -1367,10 +1367,10 @@ public void TestMissingColon2()
   </CompilationUnit>
 </Tree>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""22"" Length=""5"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""22"" Length=""5"" />
 </Diagnostics>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""22"" Length=""5"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""22"" Length=""5"" />
 </Diagnostics>");
         }
 

src/EditorFeatures/CSharpTest2/EmbeddedLanguages/Json/CSharpJsonParserTests_NstTests.cs

@@ -3028,10 +3028,10 @@ public void n_object_comma_instead_of_colon_json()
   </CompilationUnit>
 </Tree>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""11"" Length=""5"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""11"" Length=""5"" />
 </Diagnostics>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""11"" Length=""5"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""11"" Length=""5"" />
 </Diagnostics>");
         }
 
@@ -3188,10 +3188,10 @@ public void n_object_missing_colon_json()
   </CompilationUnit>
 </Tree>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""11"" Length=""5"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""11"" Length=""5"" />
 </Diagnostics>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""11"" Length=""5"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""11"" Length=""5"" />
 </Diagnostics>");
         }
 
@@ -3250,10 +3250,10 @@ public void n_object_missing_semicolon_json()
   </CompilationUnit>
 </Tree>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""11"" Length=""5"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""11"" Length=""5"" />
 </Diagnostics>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""11"" Length=""5"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""11"" Length=""5"" />
 </Diagnostics>");
         }
 
@@ -3308,10 +3308,10 @@ public void n_object_no_colon_json()
   </CompilationUnit>
 </Tree>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""11"" Length=""5"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""11"" Length=""5"" />
 </Diagnostics>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""11"" Length=""5"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""11"" Length=""5"" />
 </Diagnostics>");
         }
 
@@ -3762,10 +3762,10 @@ public void n_object_with_single_string_json()
   </CompilationUnit>
 </Tree>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""31"" Length=""5"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""31"" Length=""5"" />
 </Diagnostics>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""31"" Length=""5"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""31"" Length=""5"" />
 </Diagnostics>");
         }
 
@@ -5299,10 +5299,10 @@ public void n_structure_open_object_string_with_apostrophes_json()
   </CompilationUnit>
 </Tree>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""11"" Length=""3"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""11"" Length=""3"" />
 </Diagnostics>",
         @"<Diagnostics>
-  <Diagnostic Message=""Only properties allowed in an object"" Start=""11"" Length=""3"" />
+  <Diagnostic Message=""Property name must be followed by a ':'"" Start=""11"" Length=""3"" />
 </Diagnostics>");
         }
 

src/Features/Core/Portable/EmbeddedLanguages/Json/JsonParser.cs

@@ -213,6 +213,7 @@ private JsonTree ParseTree(JsonOptions options)
                 var diagnostic = node.Kind switch
                 {
                     JsonKind.Array => CheckArray((JsonArrayNode)node),
+                    JsonKind.Object => CheckObject((JsonObjectNode)node),
                     _ => null,
                 };
 
@@ -246,7 +247,22 @@ private JsonTree ParseTree(JsonOptions options)
                     }
                 }
 
-                return CheckChildren(node);
+                return null;
+            }
+
+            static EmbeddedDiagnostic? CheckObject(JsonObjectNode node)
+            {
+                foreach (var child in node.Sequence)
+                {
+                    if (child is JsonLiteralNode { LiteralToken.Kind: JsonKind.StringToken })
+                    {
+                        return new EmbeddedDiagnostic(
+                            FeaturesResources.Property_name_must_be_followed_by_a_colon,
+                            child.GetSpan());
+                    }
+                }
+
+                return null;
             }
         }
 

src/Features/Core/Portable/FeaturesResources.resx

@@ -3082,6 +3082,9 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
   <data name="Property_name_must_be_a_string" xml:space="preserve">
     <value>Property name must be a string</value>
   </data>
+  <data name="Property_name_must_be_followed_by_a_colon" xml:space="preserve">
+    <value>Property name must be followed by a ':'</value>
+  </data>
   <data name="Strings_must_start_with_double_quote_not_single_quote" xml:space="preserve">
     <value>Strings must start with " not '</value>
   </data>