MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[json schema] properly handle nested completions with exotic value separators

Browse Source 
GitOrigin-RevId: 485035750a904024fa915c080efaa0fba5e5aa3a
This commit is contained in:
Anton Lobov
2024-03-28 19:53:28 +00:00
committed by intellij-monorepo-bot
parent c59d63efac
commit 53ca65dbf0
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/impl/nestedCompletions/NestedCompletions.kt
+4 -7
View File
@@ -4,11 +4,7 @@ package com.jetbrains.jsonSchema.impl.nestedCompletions
import com.intellij.codeInsight.completion.InsertionContext
import com.intellij.codeInsight.lookup.LookupElementBuilder
import com.intellij.json.pointer.JsonPointerPosition
import com.intellij.openapi.editor.CaretModel
import com.intellij.openapi.editor.CaretState
import com.intellij.openapi.editor.Document
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.editor.LogicalPosition
import com.intellij.openapi.editor.*
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
@@ -20,6 +16,7 @@ import com.jetbrains.jsonSchema.extension.adapters.JsonObjectValueAdapter
import com.jetbrains.jsonSchema.extension.adapters.JsonValueAdapter
import com.jetbrains.jsonSchema.impl.JsonSchemaObject
import com.jetbrains.jsonSchema.impl.JsonSchemaResolver
import com.jetbrains.jsonSchema.impl.JsonSchemaType
/**
* Collects nested completions for a JSON schema object.
@@ -222,8 +219,8 @@ private inline fun Int.movedToFirstOrNull(text: CharSequence, predicate: (Char)
private fun Int.movedToEndOfLine(text: CharSequence) = movedToFirstOrNull(text) { it == '\n' } ?: text.length
private fun createTextWrapper(treeWalker: JsonLikePsiWalker, accessor: List<String>): WrappedText? {
val objectCloser = treeWalker.defaultObjectValue.getOrNull(1)?.toString() ?: ""
val objectOpener = (": " + (treeWalker.defaultObjectValue.getOrNull(0)?.toString() ?: "")).trimEnd()
val objectCloser = treeWalker.defaultObjectValue.getOrNull(1)?.toString()?.let {"\n$it"} ?: ""
val objectOpener = (treeWalker.getPropertyValueSeparator(JsonSchemaType._object) + " " + (treeWalker.defaultObjectValue.getOrNull(0)?.toString() ?: "")).trimEnd()
return accessor.asReversed().fold(null as WrappedText?) { acc, nextName ->
WrappedText(prefix = treeWalker.quoted(nextName) + objectOpener, acc, suffix = objectCloser)
}