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

don't commit documents in TargetElementUtil called during action update via getData

Browse Source
This commit is contained in:
peter
2016-05-25 11:34:16 +02:00
parent 60c0c509bc
commit c8944c9cc4
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureGestureTest.java
+1
View File
@@ -112,6 +112,7 @@ public class ChangeSignatureGestureTest extends LightCodeInsightFixtureTestCase
public void testAddParamChangeReturnType() {
doTest(() -> {
myFixture.type("int param");
PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
CaretModel model = myFixture.getEditor().getCaretModel();
PsiElement element = myFixture.getElementAtCaret();
PsiMethod method = PsiTreeUtil.getParentOfType(element, PsiMethod.class, false);
platform/lang-impl/src/com/intellij/codeInsight/TargetElementUtil.java
+1 -12
View File
@@ -140,18 +140,7 @@ public class TargetElementUtil extends TargetElementUtilBase {
private static PsiFile getFile(Project project, Document document) {
PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(document);
if (file != null) {
if (ApplicationManager.getApplication().isDispatchThread()) {
PsiDocumentManager.getInstance(project).commitAllDocuments();
}
if (file instanceof PsiCompiledFile) {
file = ((PsiCompiledFile)file).getDecompiledPsiFile();
}
}
return file;
return file instanceof PsiCompiledFile ? ((PsiCompiledFile)file).getDecompiledPsiFile() : file;
}
/**