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

JetPsiFactory: refactored method for creating argument + introduced ability to create arbitrary constructs by pattern

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-05-22 16:22:51 +03:00
parent 161630a449
commit 6b66e3b0e6
6 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.java
+1 -1
View File
@@ -147,7 +147,7 @@ public class AddNameToArgumentFix extends JetIntentionAction<JetValueArgument> {
private static JetValueArgument getParsedArgumentWithName(@NotNull String name, @NotNull JetValueArgument argument) {
JetExpression argumentExpression = argument.getArgumentExpression();
assert argumentExpression != null : "Argument should be already parsed.";
return JetPsiFactory(argument).createArgumentWithName(name, argumentExpression);
return JetPsiFactory(argument).createArgument(argumentExpression, name, false);
}
@NotNull
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java
+1 -1
View File
@@ -369,7 +369,7 @@ public class JetFunctionCallUsage extends JetUsageInfo<JetCallElement> {
changeArgumentName(argumentNameExpression, parameterInfo);
//noinspection ConstantConditions
newArgument.replace(oldArgument instanceof JetFunctionLiteralArgument
? psiFactory.createArgument(oldArgument.getArgumentExpression())
? psiFactory.createArgument(oldArgument.getArgumentExpression(), null, false)
: oldArgument.asElement());
}
// TODO: process default arguments in the middle
idea/src/org/jetbrains/kotlin/idea/util/psiModificationUtil.kt
+1 -1
View File
@@ -48,7 +48,7 @@ fun JetFunctionLiteralArgument.moveInsideParenthesesAndReplaceWith(
val psiFactory = JetPsiFactory(getProject())
val argument = if (newCallExpression.getValueArgumentsInParentheses().any { it.getArgumentName() != null }) {
psiFactory.createArgumentWithName(functionLiteralArgumentName, replacement)
psiFactory.createArgument(replacement, functionLiteralArgumentName)
}
else {
psiFactory.createArgument(replacement)