From 7d46e146668e4bd1e9fa531bbae8488d902a87d0 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 4 Jun 2018 12:02:00 +0300 Subject: [PATCH] more context to preserve psi consistency diamonds in var initializer would be parsed as lt/gt otherwise --- .../codeInsight/intention/impl/SplitDeclarationAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java index ed033188be71..f475f609dca7 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java @@ -145,7 +145,7 @@ public class SplitDeclarationAction extends PsiElementBaseIntentionAction { PsiLocalVariable var = (PsiLocalVariable)decl.getDeclaredElements()[0]; var.normalizeDeclaration(); PsiExpressionStatement statement = (PsiExpressionStatement)JavaPsiFacade.getInstance(psiManager.getProject()).getElementFactory() - .createStatementFromText(var.getName() + "=xxx;", null); + .createStatementFromText(var.getName() + "=xxx;", decl); statement = (PsiExpressionStatement)CodeStyleManager.getInstance(project).reformat(statement); PsiAssignmentExpression assignment = (PsiAssignmentExpression)statement.getExpression(); CommentTracker commentTracker = new CommentTracker(); @@ -172,7 +172,7 @@ public class SplitDeclarationAction extends PsiElementBaseIntentionAction { PsiExpressionStatement replaced = (PsiExpressionStatement)decl.replace(statement); if (!(parent instanceof PsiCodeBlock)) { final PsiBlockStatement blockStatement = - (PsiBlockStatement)JavaPsiFacade.getElementFactory(project).createStatementFromText("{}", null); + (PsiBlockStatement)JavaPsiFacade.getElementFactory(project).createStatementFromText("{}", block); final PsiCodeBlock codeBlock = blockStatement.getCodeBlock(); codeBlock.add(varDeclStatement); codeBlock.add(block);