From 32166b848c46213f7bfe4faef0e68ed0538178bf Mon Sep 17 00:00:00 2001 From: emilianoascona <39959392+emilianoascona@users.noreply.github.com> Date: Thu, 19 Oct 2023 11:25:18 -0300 Subject: [PATCH] Bump to AMF RC [W-14234458] (#980) * Bump to AMF RC [W-14234458] * Fixing deltas [W-14234458] * Fixing deltas [W-14234458] --- .../profile8/expected/negative.yaml | 4 +- .../profile-serialized-edited-golden.jsonld | 4 +- .../profile-serialized-golden.jsonld | 4 +- .../DisjointCompletionPlugins.scala | 4 +- .../plugins/aml/UnionSuggestions.scala | 18 ++- .../expected/root.yaml.json | 36 ++++++ .../validations/and/expected/and.yaml.json | 108 ++++++++++++++++++ .../expected/conditional.yaml.json | 108 ++++++++++++++++++ .../expected/conditional-validation.yaml.json | 108 ++++++++++++++++++ .../expected/not-validation.yaml.json | 108 ++++++++++++++++++ .../expected/rego-validation.yaml.json | 108 ++++++++++++++++++ ...undefined-union-range-validation.yaml.json | 108 ++++++++++++++++++ .../validations/expected/validation.yaml.json | 108 ++++++++++++++++++ .../expected/xone-validation.yaml.json | 108 ++++++++++++++++++ .../validations/not/expected/not.yaml.json | 108 ++++++++++++++++++ .../shape/expected/class.yaml.json | 108 ++++++++++++++++++ .../shape/expected/property.yaml.json | 108 ++++++++++++++++++ .../validations/xone/expected/xone.yaml.json | 108 ++++++++++++++++++ dependencies.properties | 4 +- 19 files changed, 1358 insertions(+), 12 deletions(-) diff --git a/als-node-client/src/test/resources/custom-validation/byDirectory/profile8/expected/negative.yaml b/als-node-client/src/test/resources/custom-validation/byDirectory/profile8/expected/negative.yaml index 2ae5811673..435a6c87b2 100644 --- a/als-node-client/src/test/resources/custom-validation/byDirectory/profile8/expected/negative.yaml +++ b/als-node-client/src/test/resources/custom-validation/byDirectory/profile8/expected/negative.yaml @@ -10,7 +10,7 @@ diagnostics: message: GET operations must have 2xx, 4xx and 5xx status codes but no 201 range: Range(common.Position[L:2,C:0],common.Position[L:5,C:10]) severity: Error - code: file://als-node-client/src/test/resources/custom-validation/byDirectory/profile8/profile.yaml#/encodes/validations/simple-rego2 + code: file://als-node-client/src/test/resources/custom-validation/byDirectory/profile8/profile.yaml#/encodes/validations/simple-rego relatedInformation: - message: "Error at " @@ -19,7 +19,7 @@ diagnostics: message: GET operations must have 2xx, 4xx and 5xx status codes but no 201 range: Range(common.Position[L:2,C:0],common.Position[L:5,C:10]) severity: Error - code: file://als-node-client/src/test/resources/custom-validation/byDirectory/profile8/profile.yaml#/encodes/validations/simple-rego + code: file://als-node-client/src/test/resources/custom-validation/byDirectory/profile8/profile.yaml#/encodes/validations/simple-rego2 relatedInformation: - message: "Error at " diff --git a/als-server/shared/src/test/resources/serialization/custom-validation/profile-serialized-edited-golden.jsonld b/als-server/shared/src/test/resources/serialization/custom-validation/profile-serialized-edited-golden.jsonld index a79c5dda37..dd3fa7efd1 100644 --- a/als-server/shared/src/test/resources/serialization/custom-validation/profile-serialized-edited-golden.jsonld +++ b/als-server/shared/src/test/resources/serialization/custom-validation/profile-serialized-edited-golden.jsonld @@ -62,7 +62,6 @@ "meta:DialectDomainElement", "doc:DomainElement" ], -"sh:message": "Ensure API can only be accessed by the specified HTTP verbs. All other HTTP verbs should be disabled (e.g. HEAD).\n", "amf-core:name": "ab", "validation:ramlClassId": "apiContract.Operation", "validation:then": { @@ -70,7 +69,8 @@ }, "validation:if": { "@id": "#/encodes/validations/ab/if" -} +}, +"sh:message": "Ensure API can only be accessed by the specified HTTP verbs. All other HTTP verbs should be disabled (e.g. HEAD).\n" }, { "@id": "#/encodes/validations/scalar-parameters/propertyConstraints/shapes.schema%20%252F%20shacl.minLength", diff --git a/als-server/shared/src/test/resources/serialization/custom-validation/profile-serialized-golden.jsonld b/als-server/shared/src/test/resources/serialization/custom-validation/profile-serialized-golden.jsonld index a79c5dda37..dd3fa7efd1 100644 --- a/als-server/shared/src/test/resources/serialization/custom-validation/profile-serialized-golden.jsonld +++ b/als-server/shared/src/test/resources/serialization/custom-validation/profile-serialized-golden.jsonld @@ -62,7 +62,6 @@ "meta:DialectDomainElement", "doc:DomainElement" ], -"sh:message": "Ensure API can only be accessed by the specified HTTP verbs. All other HTTP verbs should be disabled (e.g. HEAD).\n", "amf-core:name": "ab", "validation:ramlClassId": "apiContract.Operation", "validation:then": { @@ -70,7 +69,8 @@ }, "validation:if": { "@id": "#/encodes/validations/ab/if" -} +}, +"sh:message": "Ensure API can only be accessed by the specified HTTP verbs. All other HTTP verbs should be disabled (e.g. HEAD).\n" }, { "@id": "#/encodes/validations/scalar-parameters/propertyConstraints/shapes.schema%20%252F%20shacl.minLength", diff --git a/als-suggestions/shared/src/main/scala/org/mulesoft/als/suggestions/interfaces/DisjointCompletionPlugins.scala b/als-suggestions/shared/src/main/scala/org/mulesoft/als/suggestions/interfaces/DisjointCompletionPlugins.scala index 87c2f6ce69..406d946cbd 100644 --- a/als-suggestions/shared/src/main/scala/org/mulesoft/als/suggestions/interfaces/DisjointCompletionPlugins.scala +++ b/als-suggestions/shared/src/main/scala/org/mulesoft/als/suggestions/interfaces/DisjointCompletionPlugins.scala @@ -4,7 +4,6 @@ import org.mulesoft.als.suggestions.RawSuggestion import org.mulesoft.als.suggestions.aml.AmlCompletionRequest import scala.concurrent.Future -import scala.concurrent.ExecutionContext.Implicits.global trait DisjointCompletionPlugins extends AMLCompletionPlugin { protected val resolvers: List[ResolveIfApplies] @@ -18,7 +17,8 @@ trait DisjointCompletionPlugins extends AMLCompletionPlugin { head.resolve(request) match { case Some(rs) => rs - case _ => lookForResolver(tail, request) + case _ => + lookForResolver(tail, request) } case Nil => emptySuggestion diff --git a/als-suggestions/shared/src/main/scala/org/mulesoft/als/suggestions/plugins/aml/UnionSuggestions.scala b/als-suggestions/shared/src/main/scala/org/mulesoft/als/suggestions/plugins/aml/UnionSuggestions.scala index 03caad03db..32461940f5 100644 --- a/als-suggestions/shared/src/main/scala/org/mulesoft/als/suggestions/plugins/aml/UnionSuggestions.scala +++ b/als-suggestions/shared/src/main/scala/org/mulesoft/als/suggestions/plugins/aml/UnionSuggestions.scala @@ -1,8 +1,9 @@ package org.mulesoft.als.suggestions.plugins.aml import amf.aml.client.scala.model.document.Dialect -import amf.aml.client.scala.model.domain.{NodeMapping, PropertyMapping, UnionNodeMapping} +import amf.aml.client.scala.model.domain._ import amf.aml.internal.annotations.FromUnionNodeMapping +import amf.core.client.scala.model.StrField import amf.core.client.scala.model.domain.{AmfObject, DomainElement} import org.mulesoft.als.common.YPartBranch import org.mulesoft.amfintegration.AmfImplicits.AmfObjectImp @@ -66,6 +67,19 @@ trait UnionSuggestions { private def isDuplicateOf(p: PropertyMapping, that: PropertyMapping): Boolean = p.name().value() == that.name().value() && - p.objectRange().headOption == that.objectRange().headOption && + comparesObjectRange(p, that) && p.allowMultiple().value() == that.allowMultiple().value() + + private def comparesObjectRange(p: PropertyMapping, t: PropertyMapping): Boolean = t.classification() match { + case ObjectPairProperty => + comparesObjectProperty(p.objectRange().headOption, t.objectRange().headOption) + case _ => p.objectRange().headOption == t.objectRange().headOption + } + + private def comparesObjectProperty(p: Option[StrField], t: Option[StrField]): Boolean = (p, t) match { + case (Some(p), Some(t)) => + p.annotations() == t.annotations() && + p.value() == t.value() + case _ => false + } } diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/expected/root.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/expected/root.yaml.json index 6a3ae4a98c..debcc6686e 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/expected/root.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/expected/root.yaml.json @@ -287,6 +287,42 @@ "commitCharacters": null, "command": null }, + { + "label": "rego_extensions", + "kind": [ + + ], + "detail": "unknown", + "documentation": "rego_extensions", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11rego_extensions", + "filterText": "rego_extensions: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 1, + "character": 0 + }, + "end": { + "line": 1, + "character": 0 + } + }, + "newText": "rego_extensions: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "tags", "kind": [ diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/and/expected/and.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/and/expected/and.yaml.json index 85d7d48f7c..9940d225ed 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/and/expected/and.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/and/expected/and.yaml.json @@ -35,6 +35,42 @@ "commitCharacters": null, "command": null }, + { + "label": "aspect", + "kind": [ + + ], + "detail": "unknown", + "documentation": "aspect", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11aspect", + "filterText": "aspect:\n - ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "aspect:\n - " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "classConstraints", "kind": [ @@ -107,6 +143,42 @@ "commitCharacters": null, "command": null }, + { + "label": "documentation", + "kind": [ + + ], + "detail": "unknown", + "documentation": "documentation", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11documentation", + "filterText": "documentation: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "documentation: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "else", "kind": [ @@ -143,6 +215,42 @@ "commitCharacters": null, "command": null }, + { + "label": "examples", + "kind": [ + + ], + "detail": "unknown", + "documentation": "examples", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11examples", + "filterText": "examples:\n ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "examples:\n " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "if", "kind": [ diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/conditional/expected/conditional.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/conditional/expected/conditional.yaml.json index 60696bb3d2..e364c5e3ce 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/conditional/expected/conditional.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/conditional/expected/conditional.yaml.json @@ -35,6 +35,42 @@ "commitCharacters": null, "command": null }, + { + "label": "aspect", + "kind": [ + + ], + "detail": "unknown", + "documentation": "aspect", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11aspect", + "filterText": "aspect:\n - ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "aspect:\n - " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "classConstraints", "kind": [ @@ -71,6 +107,42 @@ "commitCharacters": null, "command": null }, + { + "label": "documentation", + "kind": [ + + ], + "detail": "unknown", + "documentation": "documentation", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11documentation", + "filterText": "documentation: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "documentation: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "else", "kind": [ @@ -107,6 +179,42 @@ "commitCharacters": null, "command": null }, + { + "label": "examples", + "kind": [ + + ], + "detail": "unknown", + "documentation": "examples", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11examples", + "filterText": "examples:\n ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "examples:\n " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "if", "kind": [ diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/conditional-validation.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/conditional-validation.yaml.json index 164019c808..f904d3a51d 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/conditional-validation.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/conditional-validation.yaml.json @@ -1,4 +1,76 @@ [ + { + "label": "aspect", + "kind": [ + + ], + "detail": "unknown", + "documentation": "aspect", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11aspect", + "filterText": "aspect:\n - ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "aspect:\n - " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, + { + "label": "documentation", + "kind": [ + + ], + "detail": "unknown", + "documentation": "documentation", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11documentation", + "filterText": "documentation: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "documentation: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "else", "kind": [ @@ -35,6 +107,42 @@ "commitCharacters": null, "command": null }, + { + "label": "examples", + "kind": [ + + ], + "detail": "unknown", + "documentation": "examples", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11examples", + "filterText": "examples:\n ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "examples:\n " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "message", "kind": [ diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/not-validation.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/not-validation.yaml.json index 268debc3af..7f712f3844 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/not-validation.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/not-validation.yaml.json @@ -1,4 +1,112 @@ [ + { + "label": "aspect", + "kind": [ + + ], + "detail": "unknown", + "documentation": "aspect", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11aspect", + "filterText": "aspect:\n - ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "aspect:\n - " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, + { + "label": "documentation", + "kind": [ + + ], + "detail": "unknown", + "documentation": "documentation", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11documentation", + "filterText": "documentation: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "documentation: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, + { + "label": "examples", + "kind": [ + + ], + "detail": "docs", + "documentation": "examples", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11examples", + "filterText": "examples:\n ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "examples:\n " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "message", "kind": [ diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/rego-validation.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/rego-validation.yaml.json index 37295babef..9bc00c32a3 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/rego-validation.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/rego-validation.yaml.json @@ -1,4 +1,112 @@ [ + { + "label": "aspect", + "kind": [ + + ], + "detail": "unknown", + "documentation": "aspect", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11aspect", + "filterText": "aspect:\n - ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "aspect:\n - " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, + { + "label": "documentation", + "kind": [ + + ], + "detail": "unknown", + "documentation": "documentation", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11documentation", + "filterText": "documentation: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "documentation: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, + { + "label": "examples", + "kind": [ + + ], + "detail": "docs", + "documentation": "examples", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11examples", + "filterText": "examples:\n ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "examples:\n " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "libraries", "kind": [ diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/undefined-union-range-validation.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/undefined-union-range-validation.yaml.json index dc1167c51c..3fdc8e355d 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/undefined-union-range-validation.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/undefined-union-range-validation.yaml.json @@ -35,6 +35,42 @@ "commitCharacters": null, "command": null }, + { + "label": "aspect", + "kind": [ + + ], + "detail": "unknown", + "documentation": "aspect", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11aspect", + "filterText": "aspect:\n - ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "aspect:\n - " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "classConstraints", "kind": [ @@ -71,6 +107,42 @@ "commitCharacters": null, "command": null }, + { + "label": "documentation", + "kind": [ + + ], + "detail": "unknown", + "documentation": "documentation", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11documentation", + "filterText": "documentation: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "documentation: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "else", "kind": [ @@ -107,6 +179,42 @@ "commitCharacters": null, "command": null }, + { + "label": "examples", + "kind": [ + + ], + "detail": "unknown", + "documentation": "examples", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11examples", + "filterText": "examples:\n ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "examples:\n " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "if", "kind": [ diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/validation.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/validation.yaml.json index d9ff5eaccc..5db27562c0 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/validation.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/validation.yaml.json @@ -35,6 +35,42 @@ "commitCharacters": null, "command": null }, + { + "label": "aspect", + "kind": [ + + ], + "detail": "unknown", + "documentation": "aspect", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11aspect", + "filterText": "aspect:\n - ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 3, + "character": 4 + }, + "end": { + "line": 3, + "character": 4 + } + }, + "newText": "aspect:\n - " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "classConstraints", "kind": [ @@ -71,6 +107,42 @@ "commitCharacters": null, "command": null }, + { + "label": "documentation", + "kind": [ + + ], + "detail": "unknown", + "documentation": "documentation", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11documentation", + "filterText": "documentation: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 3, + "character": 4 + }, + "end": { + "line": 3, + "character": 4 + } + }, + "newText": "documentation: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "else", "kind": [ @@ -107,6 +179,42 @@ "commitCharacters": null, "command": null }, + { + "label": "examples", + "kind": [ + + ], + "detail": "unknown", + "documentation": "examples", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11examples", + "filterText": "examples:\n ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 3, + "character": 4 + }, + "end": { + "line": 3, + "character": 4 + } + }, + "newText": "examples:\n " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "if", "kind": [ diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/xone-validation.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/xone-validation.yaml.json index 268debc3af..7f712f3844 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/xone-validation.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/expected/xone-validation.yaml.json @@ -1,4 +1,112 @@ [ + { + "label": "aspect", + "kind": [ + + ], + "detail": "unknown", + "documentation": "aspect", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11aspect", + "filterText": "aspect:\n - ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "aspect:\n - " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, + { + "label": "documentation", + "kind": [ + + ], + "detail": "unknown", + "documentation": "documentation", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11documentation", + "filterText": "documentation: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "documentation: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, + { + "label": "examples", + "kind": [ + + ], + "detail": "docs", + "documentation": "examples", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11examples", + "filterText": "examples:\n ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 4 + }, + "end": { + "line": 4, + "character": 4 + } + }, + "newText": "examples:\n " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "message", "kind": [ diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/not/expected/not.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/not/expected/not.yaml.json index 85d7d48f7c..9940d225ed 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/not/expected/not.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/not/expected/not.yaml.json @@ -35,6 +35,42 @@ "commitCharacters": null, "command": null }, + { + "label": "aspect", + "kind": [ + + ], + "detail": "unknown", + "documentation": "aspect", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11aspect", + "filterText": "aspect:\n - ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "aspect:\n - " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "classConstraints", "kind": [ @@ -107,6 +143,42 @@ "commitCharacters": null, "command": null }, + { + "label": "documentation", + "kind": [ + + ], + "detail": "unknown", + "documentation": "documentation", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11documentation", + "filterText": "documentation: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "documentation: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "else", "kind": [ @@ -143,6 +215,42 @@ "commitCharacters": null, "command": null }, + { + "label": "examples", + "kind": [ + + ], + "detail": "unknown", + "documentation": "examples", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11examples", + "filterText": "examples:\n ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "examples:\n " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "if", "kind": [ diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/shape/expected/class.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/shape/expected/class.yaml.json index 60696bb3d2..e364c5e3ce 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/shape/expected/class.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/shape/expected/class.yaml.json @@ -35,6 +35,42 @@ "commitCharacters": null, "command": null }, + { + "label": "aspect", + "kind": [ + + ], + "detail": "unknown", + "documentation": "aspect", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11aspect", + "filterText": "aspect:\n - ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "aspect:\n - " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "classConstraints", "kind": [ @@ -71,6 +107,42 @@ "commitCharacters": null, "command": null }, + { + "label": "documentation", + "kind": [ + + ], + "detail": "unknown", + "documentation": "documentation", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11documentation", + "filterText": "documentation: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "documentation: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "else", "kind": [ @@ -107,6 +179,42 @@ "commitCharacters": null, "command": null }, + { + "label": "examples", + "kind": [ + + ], + "detail": "unknown", + "documentation": "examples", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11examples", + "filterText": "examples:\n ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "examples:\n " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "if", "kind": [ diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/shape/expected/property.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/shape/expected/property.yaml.json index 60696bb3d2..e364c5e3ce 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/shape/expected/property.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/shape/expected/property.yaml.json @@ -35,6 +35,42 @@ "commitCharacters": null, "command": null }, + { + "label": "aspect", + "kind": [ + + ], + "detail": "unknown", + "documentation": "aspect", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11aspect", + "filterText": "aspect:\n - ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "aspect:\n - " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "classConstraints", "kind": [ @@ -71,6 +107,42 @@ "commitCharacters": null, "command": null }, + { + "label": "documentation", + "kind": [ + + ], + "detail": "unknown", + "documentation": "documentation", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11documentation", + "filterText": "documentation: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "documentation: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "else", "kind": [ @@ -107,6 +179,42 @@ "commitCharacters": null, "command": null }, + { + "label": "examples", + "kind": [ + + ], + "detail": "unknown", + "documentation": "examples", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11examples", + "filterText": "examples:\n ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "examples:\n " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "if", "kind": [ diff --git a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/xone/expected/xone.yaml.json b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/xone/expected/xone.yaml.json index 85d7d48f7c..9940d225ed 100644 --- a/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/xone/expected/xone.yaml.json +++ b/als-suggestions/shared/src/test/resources/test/AML/validation-profile/validations/xone/expected/xone.yaml.json @@ -35,6 +35,42 @@ "commitCharacters": null, "command": null }, + { + "label": "aspect", + "kind": [ + + ], + "detail": "unknown", + "documentation": "aspect", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11aspect", + "filterText": "aspect:\n - ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "aspect:\n - " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "classConstraints", "kind": [ @@ -107,6 +143,42 @@ "commitCharacters": null, "command": null }, + { + "label": "documentation", + "kind": [ + + ], + "detail": "unknown", + "documentation": "documentation", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11documentation", + "filterText": "documentation: ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "documentation: " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "else", "kind": [ @@ -143,6 +215,42 @@ "commitCharacters": null, "command": null }, + { + "label": "examples", + "kind": [ + + ], + "detail": "unknown", + "documentation": "examples", + "deprecated": [ + + ], + "preselect": [ + + ], + "sortText": "11examples", + "filterText": "examples:\n ", + "insertText": null, + "insertTextFormat": [ + 1 + ], + "textEdit": { + "range": { + "start": { + "line": 4, + "character": 6 + }, + "end": { + "line": 4, + "character": 6 + } + }, + "newText": "examples:\n " + }, + "additionalTextEdits": null, + "commitCharacters": null, + "command": null + }, { "label": "if", "kind": [ diff --git a/dependencies.properties b/dependencies.properties index 7d457ad8df..688025ed11 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -1,5 +1,5 @@ version=6.1.0-SNAPSHOT -amf=5.4.3-0 +amf=5.4.4-RC.0 amf.custom-validator.js=1.4.0 -amf.custom-validator-scalajs=0.5.3 +amf.custom-validator-scalajs=0.5.4-RC.0 amf-antlr-parsers=0.7.25