From a75baa1bc6e0e645b101eaaec501536719aaae9a Mon Sep 17 00:00:00 2001 From: Anton Lobov Date: Mon, 1 Jul 2024 17:16:04 +0200 Subject: [PATCH] [amper] fix context computation for code completion GitOrigin-RevId: 22ea2d183f02a70c09c616b361205d889e9f6844 --- .../jsonSchema/extension/JsonSchemaCompletionCustomizer.java | 2 +- .../jsonSchema/impl/JsonSchemaCompletionContributor.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaCompletionCustomizer.java b/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaCompletionCustomizer.java index 46d32c1909cc..58087659ecec 100644 --- a/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaCompletionCustomizer.java +++ b/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaCompletionCustomizer.java @@ -34,5 +34,5 @@ public interface JsonSchemaCompletionCustomizer { */ default boolean acceptsPropertyCompletionItem(JsonSchemaObject parentSchema, String propertyName, @Nullable List nestedPath, - @NotNull PsiElement originalPosition) { return true; } + @NotNull PsiElement completionElement) { return true; } } diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.kt b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.kt index ad73a6a8a31e..77f89fea0739 100644 --- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.kt +++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.kt @@ -184,7 +184,7 @@ class JsonSchemaCompletionContributor : CompletionContributor() { .filter { name -> !forbiddenNames.contains(name) && !knownNames.contains(name) || adapter != null && name == adapter.name } .forEach { name -> knownNames.add(name) - if (customHandlers.size == 1 && !customHandlers[0].acceptsPropertyCompletionItem(schema, name, completionPath?.accessor(), originalPosition)) return@forEach + if (customHandlers.size == 1 && !customHandlers[0].acceptsPropertyCompletionItem(schema, name, completionPath?.accessor(), completionPsiElement)) return@forEach val propertySchema = checkNotNull(schema.getPropertyByName(name)) addPropertyVariant(name, propertySchema, completionPath, adapter?.nameValueAdapter) }