Skip to content

upd(Command Schema): support both "additionalData" and "values" in command arguments #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Joelant05 wants to merge 1 commit into
base: dev
Choose a base branch
from
+15 −28
Draft

upd(Command Schema): support both "additionalData" and "values" in command arguments #649

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 15 additions & 28 deletions src/components/Languages/Mcfunction/Data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,24 +523,8 @@ export class CommandData extends Signal<void> {
): Promise<ICompletionItem[]> {
const { languages } = await useMonaco()

// Test whether argument type is defined
if (!commandArgument.type) {
// If additionalData is defined, return its values
if (commandArgument.additionalData?.values)
return this.toCompletionItem(
commandArgument.additionalData?.values
)
else if (commandArgument.additionalData?.schemaReference)
return this.toCompletionItem(
<string[]>(
this.resolveDynamicReference(
commandArgument.additionalData.schemaReference
).map(({ value }) => value)
)
)

return []
}
// If argument type isn't defined, set it to "string" to use "additonalData" property
commandArgument.type ??= 'string'

switch (commandArgument.type) {
case 'command':
Expand Down Expand Up @@ -573,23 +557,26 @@ export class CommandData extends Signal<void> {
languages.CompletionItemKind.Operator
)
case 'string': {
let values: string[] = []
if (commandArgument.additionalData?.values)
return this.toCompletionItem(
commandArgument.additionalData.values,
commandArgument.description,
languages.CompletionItemKind.Constant
values = values.concat(
commandArgument.additionalData.values
)
else if (commandArgument.additionalData?.schemaReference)
return this.toCompletionItem(
if (commandArgument.additionalData?.schemaReference)
values = values.concat(
<string[]>(
this.resolveDynamicReference(
commandArgument.additionalData.schemaReference
).map(({ value }) => value)
),
commandArgument.description,
languages.CompletionItemKind.Constant
)
)
else return []

if (values.length === 0) return []
return this.toCompletionItem(
values,
commandArgument.description,
languages.CompletionItemKind.Constant
)
}
case 'jsonData':
return this.toCompletionItem(
Expand Down