Skip to content

Commit

Permalink
Merge branch 'topic/fix_json_gen' into 'master'
Browse files Browse the repository at this point in the history
JSON Schema tool: Fix generation enum in properties

See merge request eng/ide/VSS!314
  • Loading branch information
reznikmm committed Jan 25, 2024
2 parents fc24a67 + 02d9b06 commit fea0f80
Show file tree
Hide file tree
Showing 11 changed files with 17,823 additions and 7 deletions.
2 changes: 1 addition & 1 deletion testsuite/json_schema/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DIRECTORIES := dap lsp
DIRECTORIES := dap lsp sarif
JSON_GEN := $(abspath ../../.objs/tools/gen_json)
GOT_FILE := $(shell mktemp -t got-XXXXXX.txt)

Expand Down
14 changes: 14 additions & 0 deletions testsuite/json_schema/dap/expected.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-- DEALINGS IN THE SOFTWARE.
--
-- DON'T EDIT THIS FILE! It was generated from JSON Schema.

pragma Style_Checks ("M99"); -- suppress style warning unitl gnatpp is fixed
with Ada.Containers.Doubly_Linked_Lists;
with Ada.Finalization;
with VSS.JSON.Streams;
Expand Down Expand Up @@ -4653,7 +4656,10 @@ end DAP.Tools;
-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-- DEALINGS IN THE SOFTWARE.
--
-- DON'T EDIT THIS FILE! It was generated from JSON Schema.

pragma Style_Checks ("M99"); -- suppress style warning unitl gnatpp is fixed
with Ada.Unchecked_Deallocation;

package body DAP.Tools is
Expand Down Expand Up @@ -6218,6 +6224,8 @@ end DAP.Tools;
-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-- DEALINGS IN THE SOFTWARE.
--
-- DON'T EDIT THIS FILE! It was generated from JSON Schema.

with VSS.JSON.Content_Handlers;

Expand Down Expand Up @@ -7083,6 +7091,8 @@ end DAP.Tools.Outputs;
-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-- DEALINGS IN THE SOFTWARE.
--
-- DON'T EDIT THIS FILE! It was generated from JSON Schema.

with Interfaces;
package body DAP.Tools.Outputs is
Expand Down Expand Up @@ -12222,6 +12232,8 @@ end DAP.Tools.Outputs;
-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-- DEALINGS IN THE SOFTWARE.
--
-- DON'T EDIT THIS FILE! It was generated from JSON Schema.

with VSS.JSON.Pull_Readers;

Expand Down Expand Up @@ -13297,6 +13309,8 @@ end DAP.Tools.Inputs;
-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-- DEALINGS IN THE SOFTWARE.
--
-- DON'T EDIT THIS FILE! It was generated from JSON Schema.

pragma Ada_2022;
with Minimal_Perfect_Hash;
Expand Down
2 changes: 2 additions & 0 deletions testsuite/json_schema/dap/header.adt
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@
-- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-- DEALINGS IN THE SOFTWARE.
--
-- DON'T EDIT THIS FILE! It was generated from JSON Schema.
2 changes: 2 additions & 0 deletions testsuite/json_schema/lsp/expected.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
--
-- DON'T EDIT THIS FILE! It was generated from metaModel.schema.json.

pragma Style_Checks ("M99"); -- suppress style warning unitl gnatpp is fixed
with Ada.Containers.Doubly_Linked_Lists;
with Ada.Finalization;
with VSS.JSON.Streams;
Expand Down Expand Up @@ -745,6 +746,7 @@ end LSP_Gen.Entities;
--
-- DON'T EDIT THIS FILE! It was generated from metaModel.schema.json.

pragma Style_Checks ("M99"); -- suppress style warning unitl gnatpp is fixed
with Ada.Unchecked_Deallocation;

package body LSP_Gen.Entities is
Expand Down
5 changes: 5 additions & 0 deletions testsuite/json_schema/sarif/cmd.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
--root-package SARIF.Types
--enum-package Enum
--header-file header.adt
--root-type Root
sarif-schema-2.1.0.json
Loading

0 comments on commit fea0f80

Please sign in to comment.