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

more context to preserve psi consistency

Browse Source 
diamonds in var initializer would be parsed as lt/gt otherwise
This commit is contained in:
Anna Kozlova
2018-06-04 12:36:29 +03:00
parent 84976a2511
commit 7d46e14666
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java
+2 -2
View File
@@ -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);