diff --git a/src/dmd/json.d b/src/dmd/json.d index a1dd19c0d299..020f7114447f 100644 --- a/src/dmd/json.d +++ b/src/dmd/json.d @@ -905,7 +905,12 @@ public: } arrayEnd(); - propertyBool("supportsIncludeImports", true); + propertyStart("supportedFeatures"); + { + objectStart(); + scope(exit) objectEnd(); + propertyBool("includeImports", true); + } objectEnd(); } diff --git a/test/compilable/extra-files/json2.out b/test/compilable/extra-files/json2.out index e639f665d240..749a04f1e4ba 100644 --- a/test/compilable/extra-files/json2.out +++ b/test/compilable/extra-files/json2.out @@ -33,7 +33,9 @@ "VALUES_REMOVED_FOR_TEST" ], "size_t": 0, - "supportsIncludeImports": true, + "supportedFeatures": { + "includeImports": true + }, "vendor": "VALUE_REMOVED_FOR_TEST", "version": "VALUE_REMOVED_FOR_TEST" }, diff --git a/test/compilable/extra-files/jsonCompilerInfo.out b/test/compilable/extra-files/jsonCompilerInfo.out index a6349e5d3ac4..23b3ca9f944c 100644 --- a/test/compilable/extra-files/jsonCompilerInfo.out +++ b/test/compilable/extra-files/jsonCompilerInfo.out @@ -12,7 +12,9 @@ "VALUES_REMOVED_FOR_TEST" ], "size_t": 0, - "supportsIncludeImports": true, + "supportedFeatures": { + "includeImports": true + }, "vendor": "VALUE_REMOVED_FOR_TEST", "version": "VALUE_REMOVED_FOR_TEST" } diff --git a/test/compilable/extra-files/jsonNoOutFile.out b/test/compilable/extra-files/jsonNoOutFile.out index c841853fa0d0..05d21e627abd 100644 --- a/test/compilable/extra-files/jsonNoOutFile.out +++ b/test/compilable/extra-files/jsonNoOutFile.out @@ -1,7 +1,9 @@ { "compilerInfo": { "binary": "VALUE_REMOVED_FOR_TEST", - "supportsIncludeImports": true, + "supportedFeatures": { + "includeImports": true + }, "version": "VALUE_REMOVED_FOR_TEST" } } \ No newline at end of file diff --git a/test/compilable/extra-files/json_nosource.out b/test/compilable/extra-files/json_nosource.out index a6349e5d3ac4..23b3ca9f944c 100644 --- a/test/compilable/extra-files/json_nosource.out +++ b/test/compilable/extra-files/json_nosource.out @@ -12,7 +12,9 @@ "VALUES_REMOVED_FOR_TEST" ], "size_t": 0, - "supportsIncludeImports": true, + "supportedFeatures": { + "includeImports": true + }, "vendor": "VALUE_REMOVED_FOR_TEST", "version": "VALUE_REMOVED_FOR_TEST" }