MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 23:31:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-42637 Fix quotes for TypedDict keys completion in dict literals

Browse Source 
- when there are other keys present in the literal, use quotes from there
- when the literal is empty, use double quotes by default
- when there already are quotes, suggest just the key names

GitOrigin-RevId: 5f37cd25c0e47521e78a01ab84053571369b24a8
This commit is contained in:
lada.gagina
2022-12-29 16:12:30 +01:00
committed by intellij-monorepo-bot
parent 621851e81e
commit ef2f607f5f
4 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
python/python-psi-impl/src/com/jetbrains/python/codeInsight/completion/PyDictLiteralCompletionContributor.kt
View File

@@ -25,19 +25,22 @@ class PyDictLiteralCompletionContributor : CompletionContributor() {
}
private class DictLiteralCompletionProvider : CompletionProvider<CompletionParameters?>() {
private val DEFAULT_QUOTE = "\""
override fun addCompletions(parameters: CompletionParameters, context: ProcessingContext, result: CompletionResultSet) {
val originalElement = parameters.originalPosition?.parent ?: return
val possibleSequenceExpr = if (originalElement is PyStringLiteralExpression) originalElement.parent else originalElement
if (possibleSequenceExpr is PyDictLiteralExpression || possibleSequenceExpr is PySetLiteralExpression) { // it's set literal when user is typing the first key
addCompletionToCallExpression(originalElement, possibleSequenceExpr as PyTypedElement, result)
addCompletionToCallExpression(originalElement, possibleSequenceExpr as PySequenceExpression, result)
addCompletionToAssignment(originalElement, possibleSequenceExpr, result)
addCompletionToReturnStatement(originalElement, possibleSequenceExpr, result)
}
}
private fun addCompletionToCallExpression(originalElement: PsiElement,
possibleSequenceExpr: PyTypedElement,
possibleSequenceExpr: PySequenceExpression,
result: CompletionResultSet) {
val callExpression = PsiTreeUtil.getParentOfType(originalElement, PyCallExpression::class.java)
if (callExpression != null) {
@@ -51,12 +54,25 @@ private class DictLiteralCompletionProvider : CompletionProvider<CompletionParam
if (params.size < argumentIndex) return
val expectedType = params[argumentIndex].getType(typeEvalContext)
val actualType = typeEvalContext.getType(possibleSequenceExpr)
addCompletionForTypedDictKeys(expectedType, actualType, result, originalElement !is PyStringLiteralExpression)
addCompletionForTypedDictKeys(expectedType, actualType, result, getForcedQuote(possibleSequenceExpr, originalElement))
}
}
private fun getForcedQuote(possibleSequenceExpr: PySequenceExpression, originalElement: PsiElement): String {
if (originalElement !is PyStringLiteralExpression) {
val usedQuotes = possibleSequenceExpr.elements.mapNotNull { if (it is PyKeyValueExpression) it.key else it }
.filterIsInstance<PyStringLiteralExpression>()
.flatMap { it.stringElements }
.map { it.quote }
.toSet()
return usedQuotes.singleOrNull() ?: DEFAULT_QUOTE
}
return ""
}
private fun addCompletionToAssignment(originalElement: PsiElement,
possibleSequenceExpr: PyTypedElement,
possibleSequenceExpr: PySequenceExpression,
result: CompletionResultSet) {
val assignment = PsiTreeUtil.getParentOfType(originalElement, PyAssignmentStatement::class.java)
if (assignment != null) {
@@ -67,7 +83,7 @@ private class DictLiteralCompletionProvider : CompletionProvider<CompletionParam
if (targetToValue?.first != null && targetToValue.second != null) {
val expectedType = typeEvalContext.getType(targetToValue.first as PyTypedElement)
val actualType = typeEvalContext.getType(targetToValue.second as PyTypedElement)
addCompletionForTypedDictKeys(expectedType, actualType, result, originalElement !is PyStringLiteralExpression)
addCompletionForTypedDictKeys(expectedType, actualType, result, getForcedQuote(possibleSequenceExpr, originalElement))
}
else { //multiple target expressions and there is a PsiErrorElement
val targetExpr = assignment.assignedValue
@@ -80,7 +96,7 @@ private class DictLiteralCompletionProvider : CompletionProvider<CompletionParam
if (index < assignment.targets.size) {
val expectedType = typeEvalContext.getType(assignment.targets[index])
val actualType = typeEvalContext.getType(element)
addCompletionForTypedDictKeys(expectedType, actualType, result, originalElement !is PyStringLiteralExpression)
addCompletionForTypedDictKeys(expectedType, actualType, result, getForcedQuote(possibleSequenceExpr, originalElement))
}
}
}
@@ -88,7 +104,7 @@ private class DictLiteralCompletionProvider : CompletionProvider<CompletionParam
}
private fun addCompletionToReturnStatement(originalElement: PsiElement,
possibleSequenceExpr: PyTypedElement,
possibleSequenceExpr: PySequenceExpression,
result: CompletionResultSet) {
val returnStatement = PsiTreeUtil.getParentOfType(originalElement, PyReturnStatement::class.java)
if (returnStatement != null) {
@@ -100,7 +116,7 @@ private class DictLiteralCompletionProvider : CompletionProvider<CompletionParam
if (annotation != null || typeCommentAnnotation != null) { // to ensure that we have return type specified, not inferred
val expectedType = typeEvalContext.getReturnType(owner)
val actualType = typeEvalContext.getType(possibleSequenceExpr)
addCompletionForTypedDictKeys(expectedType, actualType, result, originalElement !is PyStringLiteralExpression)
addCompletionForTypedDictKeys(expectedType, actualType, result, getForcedQuote(possibleSequenceExpr, originalElement))
}
}
}
@@ -109,7 +125,7 @@ private class DictLiteralCompletionProvider : CompletionProvider<CompletionParam
private fun addCompletionForTypedDictKeys(expectedType: PyType?,
actualType: PyType?,
dictCompletion: CompletionResultSet,
addQuotes: Boolean) {
quote: String) {
if (expectedType is PyTypedDictType) {
val keys =
when {
@@ -121,7 +137,7 @@ private class DictLiteralCompletionProvider : CompletionProvider<CompletionParam
for (key in keys) {
dictCompletion.addElement(
LookupElementBuilder
.create(if (addQuotes) "'$key'" else key)
.create("$quote$key$quote")
.withTypeText("dict key")
.withIcon(IconManager.getInstance().getPlatformIcon(com.intellij.ui.PlatformIcons.Parameter))
)