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

Do not return disposed template state

Browse Source
This commit is contained in:
Alexander Zolotov
2016-08-01 15:23:56 +03:00
parent 92a60b087d
commit 83a0365a14
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/refactoring/InplaceReassignVariableTest.java
+3 -9
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,14 +16,12 @@
package com.intellij.refactoring;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.codeInsight.template.impl.TemplateState;
import com.intellij.openapi.command.undo.UndoManager;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
import com.intellij.refactoring.introduceVariable.ReassignVariableUtil;
public class InplaceReassignVariableTest extends AbstractJavaInplaceIntroduceTest {
@Override
protected void runTest() throws Throwable {
doRunTest();
@@ -55,10 +53,8 @@ public class InplaceReassignVariableTest extends AbstractJavaInplaceIntroduceTes
invokeRefactoring();
ReassignVariableUtil.reassign(getEditor());
assertNull(TemplateManagerImpl.getTemplateState(getEditor()));
TemplateState state = TemplateManagerImpl.getTemplateState(getEditor());
assert state != null;
state.gotoEnd(false);
checkResultByFile(getBasePath() + name + "_after" + getExtension());
}
finally {
@@ -77,9 +73,7 @@ public class InplaceReassignVariableTest extends AbstractJavaInplaceIntroduceTes
invokeRefactoring();
ReassignVariableUtil.reassign(getEditor());
TemplateState state = TemplateManagerImpl.getTemplateState(getEditor());
assert state != null;
state.gotoEnd(false);
assertNull(TemplateManagerImpl.getTemplateState(getEditor()));
TextEditor textEditor = TextEditorProvider.getInstance().getTextEditor(getEditor());
assertNotNull(textEditor);
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java
+7 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -112,7 +112,12 @@ public class TemplateManagerImpl extends TemplateManager implements Disposable {
@Nullable
public static TemplateState getTemplateState(@NotNull Editor editor) {
return editor.getUserData(TEMPLATE_STATE_KEY);
TemplateState templateState = editor.getUserData(TEMPLATE_STATE_KEY);
if (templateState != null && templateState.isDisposed()) {
editor.putUserData(TEMPLATE_STATE_KEY, null);
return null;
}
return templateState;
}
static void clearTemplateState(@NotNull Editor editor) {