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

AutoPopupAlarm -> CommittingDocuments

Browse Source
This commit is contained in:
peter
2011-08-12 18:57:11 +02:00
parent 88355cb432
commit 9a8ec75115
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java
+1 -1
View File
@@ -107,7 +107,7 @@ public class AutoPopupController implements Disposable {
currentCompletion.closeAndFinish(!shouldBeFast);
}
final CompletionPhase.AutoPopupAlarm phase = new CompletionPhase.AutoPopupAlarm(false, editor);
final CompletionPhase.CommittingDocuments phase = new CompletionPhase.CommittingDocuments(false, editor);
CompletionServiceImpl.setCompletionPhase(phase);
Runnable request = new Runnable() {
platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+1 -1
View File
@@ -504,7 +504,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
final Project project = hostFile.getProject();
if (!invokedExplicitly) {
final CompletionPhase.AutoPopupAlarm phase = new CompletionPhase.AutoPopupAlarm(true, hostEditor);
final CompletionPhase.CommittingDocuments phase = new CompletionPhase.CommittingDocuments(true, hostEditor);
CompletionServiceImpl.setCompletionPhase(phase);
ApplicationManager.getApplication().addApplicationListener(new ApplicationAdapter() {
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionPhase.java
+3 -3
View File
@@ -72,14 +72,14 @@ public abstract class CompletionPhase implements Disposable {
return false;
}
public static class AutoPopupAlarm extends CompletionPhase {
public static class CommittingDocuments extends CompletionPhase {
final boolean copyCommit;
private boolean actionsHappened;
private final Editor myEditor;
private final Expirable focusStamp;
private final Project myProject;
public AutoPopupAlarm(boolean copyCommit, Editor editor) {
public CommittingDocuments(boolean copyCommit, Editor editor) {
super(null);
this.copyCommit = copyCommit;
myEditor = editor;
@@ -107,7 +107,7 @@ public abstract class CompletionPhase implements Disposable {
@Override
public String toString() {
return "AutoPopupAlarm{copyCommit=" + copyCommit + '}';
return "CommittingDocuments{copyCommit=" + copyCommit + '}';
}
}
public static class Synchronous extends CompletionPhase {
platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
+2 -2
View File
@@ -73,13 +73,13 @@ public class CompletionAutoPopupHandler extends TypedHandlerDelegate {
}
if (!Character.isLetter(charTyped) && charTyped != '_') {
if (CompletionServiceImpl.isPhase(CompletionPhase.EmptyAutoPopup.class, CompletionPhase.AutoPopupAlarm.class)) {
if (CompletionServiceImpl.isPhase(CompletionPhase.EmptyAutoPopup.class, CompletionPhase.CommittingDocuments.class)) {
CompletionServiceImpl.setCompletionPhase(CompletionPhase.NoCompletion);
}
return Result.CONTINUE;
}
if (!CompletionServiceImpl.isPhase(CompletionPhase.AutoPopupAlarm.class, CompletionPhase.NoCompletion.getClass())) {
if (!CompletionServiceImpl.isPhase(CompletionPhase.CommittingDocuments.class, CompletionPhase.NoCompletion.getClass())) {
return Result.CONTINUE;
}