azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JetPsiFactory: create by pattern allows Name's as arguments + changed placeholder text specification format

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-25 14:45:21 +03:00
parent 77d097b957
commit 2eaf767521
8 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt
+1 -1
View File
@@ -372,7 +372,7 @@ public class JetPsiFactory(private val project: Project) {
appendFixedText("(")
if (name != null) {
appendFixedText(Name.identifier(name).renderName())
appendName(Name.identifier(name))
appendFixedText("=")
}
compiler/frontend/src/org/jetbrains/kotlin/psi/createByPattern.kt
+15 -5
View File
@@ -22,11 +22,12 @@ import com.intellij.psi.SmartPointerManager
import com.intellij.psi.SmartPsiElementPointer
import com.intellij.psi.codeStyle.CodeStyleManager
import com.intellij.psi.impl.source.codeStyle.CodeEditUtil
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.name.renderName
import org.jetbrains.kotlin.psi.psiUtil.endOffset
import org.jetbrains.kotlin.psi.psiUtil.parents
import org.jetbrains.kotlin.psi.psiUtil.replaced
import org.jetbrains.kotlin.psi.psiUtil.startOffset
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
import java.util.ArrayList
import java.util.HashMap
import java.util.LinkedHashMap
@@ -38,6 +39,9 @@ public fun <TDeclaration : JetDeclaration> JetPsiFactory.createDeclarationByPatt
= createByPattern(pattern, *args) { createDeclaration<TDeclaration>(it) }
public fun <TElement : JetElement> createByPattern(pattern: String, vararg args: Any, factory: (String) -> TElement): TElement {
@suppress("NAME_SHADOWING")
val args = args.map { if (it is Name) it.renderName() else it }
val (processedText, allPlaceholders) = processPattern(pattern, args)
var resultElement = factory(processedText.trim())
@@ -125,7 +129,7 @@ private data class Placeholder(val range: TextRange, val text: String)
private data class PatternData(val processedText: String, val placeholders: Map<Int, List<Placeholder>>)
private fun processPattern(pattern: String, args: Array<out Any>): PatternData {
private fun processPattern(pattern: String, args: List<Any>): PatternData {
val ranges = LinkedHashMap<Int, MutableList<Placeholder>>()
fun charOrNull(i: Int) = if (0 <= i && i < pattern.length()) pattern[i] else null
@@ -155,13 +159,13 @@ private fun processPattern(pattern: String, args: Array<out Any>): PatternData {
i = lastIndex
val arg: Any? = if (n < args.size()) args[n] else null /* report wrong number of arguments later */
val placeholderText = if (charOrNull(i) != '=') {
val placeholderText = if (charOrNull(i) != ':' || charOrNull(i + 1) != '\'') {
if (arg is String) arg else "xyz"
}
else {
check(arg !is String, "do not specify placeholder text for $$n - String argument passed")
i++
val endIndex = pattern.indexOf('$', i)
i += 2 // skip ':' and '\''
val endIndex = pattern.indexOf('\'', i)
check(endIndex >= 0, "unclosed placeholder text")
check(endIndex > i, "empty placeholder text")
val text = pattern.substring(i, endIndex)
@@ -227,6 +231,12 @@ public class BuilderByPattern<TElement> {
return this
}
public fun appendName(name: Name): BuilderByPattern<TElement> {
patternBuilder.append("$" + arguments.size())
arguments.add(name)
return this
}
public fun create(factory: (String, Array<out Any>) -> TElement): TElement {
return factory(patternBuilder.toString(), arguments.toArray())
}