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

Java: Cleanup after review - don't directly use UserDataHolderBase (IDEA-179924, IDEA-180107)

Browse Source
This commit is contained in:
Pavel Dolgov
2017-10-12 21:29:02 +03:00
parent f1619e0926
commit e5c4f4f92c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethod/ParametrizedDuplicates.java
+4 -3
View File
@@ -18,7 +18,6 @@ package com.intellij.refactoring.extractMethod;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.UserDataHolderBase;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
import com.intellij.psi.codeStyle.SuggestedNameInfo;
@@ -26,6 +25,7 @@ import com.intellij.psi.codeStyle.VariableKind;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.introduceField.ElementToWorkOn;
import com.intellij.refactoring.introduceParameter.IntroduceParameterHandler;
import com.intellij.refactoring.util.VariableData;
import com.intellij.refactoring.util.duplicates.DuplicatesFinder;
@@ -350,8 +350,9 @@ public class ParametrizedDuplicates {
else {
LOG.error("Unexpected statement in expression code block " + bodyStatement);
}
if (expression instanceof UserDataHolderBase && wrapped instanceof UserDataHolderBase) {
((UserDataHolderBase)expression).copyUserDataTo((UserDataHolderBase)wrapped);
if (wrapped != null) {
// this key is not copyable so replace() doesn't preserve it - have to do it here
wrapped.putUserData(ElementToWorkOn.REPLACE_NON_PHYSICAL, expression.getUserData(ElementToWorkOn.REPLACE_NON_PHYSICAL));
}
return wrapped;
}