Skip to content

Commit

Permalink
Merge pull request #204 from kieler/mka/update-json-schema
Browse files Browse the repository at this point in the history
update json schema
  • Loading branch information
Eddykasp authored Nov 14, 2024
2 parents 93ca838 + 701c40d commit b91c16d
Show file tree
Hide file tree
Showing 31 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion schema/klighd/actions/checkImages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "checkImages",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/action.json"}],
"allOf": [{"$ref": "../../sprotty/actions/action.json"}],
"required": ["kind", "images"],
"properties": {
"kind": {
Expand Down
2 changes: 1 addition & 1 deletion schema/klighd/actions/checkedImages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "checkedImages",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/action.json"}],
"allOf": [{"$ref": "../../sprotty/actions/action.json"}],
"required": ["kind", "notCached", "responseId"],
"properties": {
"kind": {
Expand Down
2 changes: 1 addition & 1 deletion schema/klighd/actions/performAction.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "performAction",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/actions/action.json"}],
"allOf": [{"$ref": "../../sprotty/actions/action.json"}],
"required": ["kind", "actionId", "kGraphElementId", "kRenderingId", "revision"],
"properties": {
"kind": {
Expand Down
2 changes: 1 addition & 1 deletion schema/klighd/actions/refreshDiagram.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "refreshDiagram",
"type": "object",
"allOf": [{ "$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/action.json" }],
"allOf": [{ "$ref": "../../sprotty/actions/action.json" }],
"required": ["kind"],
"properties": {
"kind": {
Expand Down
2 changes: 1 addition & 1 deletion schema/klighd/actions/refreshLayout.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "refreshLayout",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/action.json"}],
"allOf": [{"$ref": "../../sprotty/actions/action.json"}],
"required": ["kind"],
"properties": {
"kind": {
Expand Down
2 changes: 1 addition & 1 deletion schema/klighd/actions/requestDiagramPiece.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "requestDiagramPiece",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/action.json"}],
"allOf": [{"$ref": "../../sprotty/actions/action.json"}],
"required": ["kind", "modelElementId"],
"properties": {
"kind": {
Expand Down
4 changes: 2 additions & 2 deletions schema/klighd/actions/setDiagramPiece.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "setDiagramPiece",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/action.json"}],
"allOf": [{"$ref": "../../sprotty/actions/action.json"}],
"required": ["kind", "diagramPiece"],
"properties": {
"kind": {
"type": "string",
"enum": ["setDiagramPiece"]
},
"diagramPiece": {
"$ref": "/kieler/klighd-vscode/tree/main/schema/klighd/SKGraphSchema.json#/definitions/SKNode"
"$ref": "../SKGraphSchema.json#/definitions/SKNode"
}
}
}
2 changes: 1 addition & 1 deletion schema/klighd/actions/setSyntheses.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "setSyntheses",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/action.json"}],
"allOf": [{"$ref": "../../sprotty/actions/action.json"}],
"required": ["kind", "syntheses"],
"properties": {
"kind": {
Expand Down
2 changes: 1 addition & 1 deletion schema/klighd/actions/setSynthesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "setSynthesis",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/action.json"}],
"allOf": [{"$ref": "../../sprotty/actions/action.json"}],
"required": ["kind", "id"],
"properties": {
"kind": {
Expand Down
4 changes: 2 additions & 2 deletions schema/klighd/actions/storeImages.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "storeImages",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/action.json"}],
"allOf": [{"$ref": "../../sprotty/actions/action.json"}],
"required": ["kind", "images"],
"properties": {
"kind": {
Expand All @@ -16,7 +16,7 @@
"required": ["k", "v"],
"properties": {
"k": {
"$ref": "/kieler/klighd-vscode/tree/main/schema/klighd/actions/checkedImages.json#/definitions/notCachedImage"
"$ref": "checkedImages.json#/definitions/notCachedImage"
},
"v": {
"type": "string"
Expand Down
4 changes: 2 additions & 2 deletions schema/klighd/actions/updateOptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "updateOptions",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/action.json"}],
"allOf": [{"$ref": "../../sprotty/actions/action.json"}],
"required": ["kind", "valuedSynthesisOptions", "layoutOptions", "actions", "modelUri"],
"properties": {
"kind": {
Expand All @@ -13,7 +13,7 @@
"valuedSynthesisOptions": {
"type": "array",
"items": {
"$ref": "/kieler/klighd-vscode/tree/main/schema/klighd/valuedSynthesisOption.json"
"$ref": "../ValuedSynthesisOption.json"
}
},
"layoutOptions": {
Expand Down
2 changes: 1 addition & 1 deletion schema/klighd/messages/diagramOptionsPerformAction.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$id": "https://github.com/kieler/klighd-vscode/tree/main/schema/klighd/messages/diagramOptionsPerformAction.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "keith/diagramOptions/performAction",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/requestMessage.json"}],
"allOf": [{"$ref": "../../lsp/requestMessage.json"}],
"required": ["method", "params"],
"properties": {
"method": {
Expand Down
2 changes: 1 addition & 1 deletion schema/klighd/messages/diagramOptionsSetLayoutOptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$id": "https://github.com/kieler/klighd-vscode/tree/main/schema/klighd/messages/diagramOptionsSetLayoutOptions.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "keith/diagramOptions/setLayoutOptions",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/requestMessage.json"}],
"allOf": [{"$ref": "../../lsp/requestMessage.json"}],
"required": ["method", "params"],
"properties": {
"method": {
Expand Down
4 changes: 2 additions & 2 deletions schema/klighd/messages/diagramOptionsSetSynthesisOptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$id": "https://github.com/kieler/klighd-vscode/tree/main/schema/klighd/messages/diagramOptionsSetSynthesisOptions.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "keith/diagramOptions/setSynthesisOptions",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/requestMessage.json"}],
"allOf": [{"$ref": "../../lsp/requestMessage.json"}],
"required": ["method", "params"],
"properties": {
"method": {
Expand All @@ -16,7 +16,7 @@
"synthesisOptions": {
"type": "array",
"items": {
"$ref": "/kieler/klighd-vscode/tree/main/schema/klighd/valuedSynthesisOption.json"
"$ref": "../ValuedSynthesisOption.json"
}
},
"uri": {
Expand Down
2 changes: 1 addition & 1 deletion schema/klighd/messages/preferencesSetPreferences.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$id": "https://github.com/kieler/klighd-vscode/tree/main/schema/klighd/messages/preferencesSetPreferences.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "keith/preferences/setPreferences",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/requestMessage.json"}],
"allOf": [{"$ref": "../../lsp/requestMessage.json"}],
"required": ["method", "params"],
"properties": {
"method": {
Expand Down
2 changes: 1 addition & 1 deletion schema/lsp/generalSendMessage.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$id": "https://github.com/kieler/klighd-vscode/tree/main/schema/lsp/generalSendMessage.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "general/sendMessage",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/lsp/requestMessage.json"}],
"allOf": [{"$ref": "requestMessage.json"}],
"required": ["method", "params"],
"properties": {
"method": {
Expand Down
2 changes: 1 addition & 1 deletion schema/lsp/initialize.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$id": "https://github.com/kieler/klighd-vscode/tree/main/schema/lsp/initialize.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "initialize",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/lsp/requestMessage.json"}],
"allOf": [{"$ref": "requestMessage.json"}],
"required": ["method", "params"],
"properties": {
"method": {
Expand Down
6 changes: 3 additions & 3 deletions schema/lsp/range.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
"required": ["start", "end"],
"properties": {
"start": {
"$ref": "#/definitions/editorPosition.json"
"$ref": "#/definitions/editorPosition"
},
"end": {
"$ref": "#/definitions/editorPosition.json"
"$ref": "#/definitions/editorPosition"
}
},
"definitions": {
"editorPosition.json": {
"editorPosition": {
"type": "object",
"required": ["line", "character"],
"properties": {
Expand Down
4 changes: 2 additions & 2 deletions schema/lsp/requestMessage.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$id": "https://github.com/kieler/klighd-vscode/tree/main/schema/lsp/requestmessage.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "message",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/lsp/message.json"}],
"title": "requestMessage",
"allOf": [{"$ref": "message.json"}],
"required": ["method"],
"properties": {
"id": {
Expand Down
4 changes: 2 additions & 2 deletions schema/lsp/responseMessage.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$id": "https://github.com/kieler/klighd-vscode/tree/main/schema/lsp/requestmessage.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "message",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/lsp/message.json"}],
"title": "responseMessage",
"allOf": [{"$ref": "message.json"}],
"required": ["id"],
"oneOf": [{"required": ["result"]}, {"required": ["error"]}],
"properties": {
Expand Down
4 changes: 2 additions & 2 deletions schema/lsp/textDocumentDocumentHighlight.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$id": "https://github.com/kieler/klighd-vscode/tree/main/schema/lsp/textDocumentDocumentHighlight.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "textDocument/documentHighlight",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/lsp/requestMessage.json"}],
"allOf": [{"$ref": "requestMessage.json"}],
"required": ["method", "params"],
"properties": {
"method": {
Expand All @@ -21,7 +21,7 @@
}
},
"position": {
"$ref": "/kieler/klighd-vscode/tree/main/schema/lsp/position.json"
"$ref": "range.json#/editorPosition"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion schema/sprotty/actions/action.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://github.com/kieler/klighd-vscode/tree/main/schema/sprotty/actions/action.json",
"$id": "https://github.com../../sprotty/actions/action.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "action",
"type": "object",
Expand Down
2 changes: 1 addition & 1 deletion schema/sprotty/actions/allSelected.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "allSelected",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/actions/action.json"}],
"allOf": [{"$ref": "action.json"}],
"required": ["kind", "select"],
"properties": {
"kind": {
Expand Down
2 changes: 1 addition & 1 deletion schema/sprotty/actions/elementSelected.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "elementSelected",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/actions/action.json"}],
"allOf": [{"$ref": "action.json"}],
"required": ["kind", "selectedElementsIDs", "deselectedElementsIDs", "preventOpenSelection"],
"properties": {
"kind": {
Expand Down
2 changes: 1 addition & 1 deletion schema/sprotty/actions/fit.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "fit",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/actions/action.json"}],
"allOf": [{"$ref": "action.json"}],
"required": ["kind", "elementIds", "maxZoom", "animate"],
"properties": {
"kind": {
Expand Down
4 changes: 2 additions & 2 deletions schema/sprotty/actions/requestBounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "requestBounds",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/actions/action.json"}],
"allOf": [{"$ref": "action.json"}],
"required": ["kind", "newRoot"],
"properties": {
"kind": {
"type": "string",
"enum": ["requestBounds"]
},
"newRoot": {
"$ref": "/kieler/klighd-vscode/tree/main/schema/klighd/SKGraphSchema#/definitions/SKGraph"
"$ref": "../../klighd/SKGraphSchema.json#/definitions/SKGraph"
}
}
}
2 changes: 1 addition & 1 deletion schema/sprotty/actions/requestModel.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "requestModel",
"type": "object",
"allOf": [{ "$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/actions/action.json" }],
"allOf": [{ "$ref": "action.json" }],
"required": ["kind", "options", "requestId"],
"properties": {
"kind": {
Expand Down
4 changes: 2 additions & 2 deletions schema/sprotty/actions/setModel.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "setModel",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/actions/action.json"}],
"allOf": [{"$ref": "action.json"}],
"required": ["kind", "newRoot"],
"properties": {
"kind": {
"type": "string",
"enum": ["setModel"]
},
"newRoot": {
"$ref": "/kieler/klighd-vscode/tree/main/schema/klighd/SKGraphSchema#/definitions/SKGraph"
"$ref": "../../klighd/SKGraphSchema.json#/definitions/SKGraph"
}
}
}
4 changes: 2 additions & 2 deletions schema/sprotty/actions/updateModel.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "updateModel",
"type": "object",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/actions/action.json"}],
"allOf": [{"$ref": "action.json"}],
"required": ["kind", "newRoot"],
"properties": {
"kind": {
"type": "string",
"enum": ["updateModel"]
},
"newRoot": {
"$ref": "/kieler/klighd-vscode/tree/main/schema/klighd/SKGraphSchema#/definitions/SKGraph"
"$ref": "../../klighd/SKGraphSchema.json#/definitions/SKGraph"
}
}
}
4 changes: 2 additions & 2 deletions schema/sprotty/diagramAccept.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$id": "https://github.com/kieler/klighd-vscode/tree/main/schema/sprotty/messages/diagramAccept.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "diagram/accept",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/requestMessage.json"}],
"allOf": [{"$ref": "../lsp/requestMessage.json"}],
"required": ["method", "params"],
"properties": {
"method": {
Expand All @@ -18,7 +18,7 @@
"enum": ["sprotty"]
},
"action": {
"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/actions/action.json"
"$ref": "actions/action.json"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions schema/sprotty/diagramOpenInTextEditor.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$id": "https://github.com/kieler/klighd-vscode/tree/main/schema/sprotty/messages/diagramOpenInTextEditor.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "diagram/openInTextEditor",
"allOf": [{"$ref": "/kieler/klighd-vscode/tree/main/schema/sprotty/requestMessage.json"}],
"allOf": [{"$ref": "../lsp/requestMessage.json"}],
"required": ["method", "params"],
"properties": {
"method": {
Expand Down Expand Up @@ -31,7 +31,7 @@
"type": "string"
},
"range": {
"$ref": "/kieler/klighd-vscode/tree/main/schema/lsp/range.json"
"$ref": "../lsp/range.json"
}
}
}
Expand Down

0 comments on commit b91c16d

Please sign in to comment.