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

simplify inplace refactoring disposing: restart daemon on disposing of template (IDEA-224673)

Browse Source 
GitOrigin-RevId: 2db24c6bbc48392636f42e7ee6095c3e2f7ed73b
This commit is contained in:
Anna.Kozlova
2019-10-17 06:31:25 +00:00
committed by intellij-monorepo-bot
parent 6f8149876a
commit 10a378dcc0
1 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
+21 -37
View File
@@ -386,15 +386,7 @@ public abstract class InplaceRefactoring {
}
private void startTemplate(final TemplateBuilderImpl builder) {
final Disposable disposable = Disposer.newDisposable();
DaemonCodeAnalyzer.getInstance(myProject).disableUpdateByTimer(disposable);
final MyTemplateListener templateListener = new MyTemplateListener() {
@Override
protected void restoreDaemonUpdateState() {
Disposer.dispose(disposable);
}
};
final MyTemplateListener templateListener = new MyTemplateListener();
final int offset = myEditor.getCaretModel().getOffset();
@@ -412,6 +404,11 @@ public abstract class InplaceRefactoring {
TemplateManager.getInstance(myProject).startTemplate(topLevelEditor, template, templateListener);
restoreOldCaretPositionAndSelection(offset);
highlightTemplateVariables(template, topLevelEditor);
final TemplateState templateState = TemplateManagerImpl.getTemplateState(topLevelEditor);
if (templateState != null) {
DaemonCodeAnalyzer.getInstance(myProject).disableUpdateByTimer(templateState);
}
}
private void highlightTemplateVariables(Template template, Editor topLevelEditor) {
@@ -916,33 +913,25 @@ public abstract class InplaceRefactoring {
ourShowBalloonInHeadlessMode = showBalloonInHeadlessMode;
}
private abstract class MyTemplateListener extends TemplateEditingAdapter {
protected abstract void restoreDaemonUpdateState();
private class MyTemplateListener extends TemplateEditingAdapter {
@Override
public void beforeTemplateFinished(@NotNull final TemplateState templateState, Template template) {
try {
final TextResult value = templateState.getVariableValue(PRIMARY_VARIABLE_NAME);
myInsertedName = value != null ? value.toString().trim() : null;
final TextResult value = templateState.getVariableValue(PRIMARY_VARIABLE_NAME);
myInsertedName = value != null ? value.toString().trim() : null;
TextRange range = templateState.getCurrentVariableRange();
final int currentOffset = myEditor.getCaretModel().getOffset();
if (range == null && myRenameOffset != null) {
range = new TextRange(myRenameOffset.getStartOffset(), myRenameOffset.getEndOffset());
}
myBeforeRevert =
range != null && range.getEndOffset() >= currentOffset && range.getStartOffset() <= currentOffset
? myEditor.getDocument().createRangeMarker(range.getStartOffset(), currentOffset)
: null;
if (myBeforeRevert != null) {
myBeforeRevert.setGreedyToRight(true);
}
finish(true);
TextRange range = templateState.getCurrentVariableRange();
final int currentOffset = myEditor.getCaretModel().getOffset();
if (range == null && myRenameOffset != null) {
range = new TextRange(myRenameOffset.getStartOffset(), myRenameOffset.getEndOffset());
}
finally {
restoreDaemonUpdateState();
myBeforeRevert =
range != null && range.getEndOffset() >= currentOffset && range.getStartOffset() <= currentOffset
? myEditor.getDocument().createRangeMarker(range.getStartOffset(), currentOffset)
: null;
if (myBeforeRevert != null) {
myBeforeRevert.setGreedyToRight(true);
}
finish(true);
}
@Override
@@ -980,12 +969,7 @@ public abstract class InplaceRefactoring {
moveOffsetAfter(false);
}
finally {
try {
restoreDaemonUpdateState();
}
finally {
FinishMarkAction.finish(myProject, myEditor, myMarkAction);
}
FinishMarkAction.finish(myProject, myEditor, myMarkAction);
}
}
}