Skip to content

Commit 52ac067

Browse files
committed
upper case
1 parent a194b12 commit 52ac067

File tree

5 files changed

+33
-33
lines changed

5 files changed

+33
-33
lines changed

platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ private void doComplete(final int invocationCount, CompletionInitializationConte
267267

268268
final LookupImpl lookup = obtainLookup(editor);
269269

270-
CompletionServiceImpl.setCompletionPhase(CompletionPhase.synchronous);
270+
CompletionServiceImpl.setCompletionPhase(CompletionPhase.Synchronous);
271271

272272
final Semaphore freezeSemaphore = new Semaphore();
273273
freezeSemaphore.down();
@@ -476,7 +476,7 @@ protected void completionFinished(final int offset1,
476476

477477
final AutoCompletionDecision decision = shouldAutoComplete(indicator, items);
478478
if (decision == AutoCompletionDecision.SHOW_LOOKUP) {
479-
CompletionServiceImpl.setCompletionPhase(CompletionPhase.itemsCalculated);
479+
CompletionServiceImpl.setCompletionPhase(CompletionPhase.ItemsCalculated);
480480
indicator.getLookup().setCalculating(false);
481481
indicator.showLookup();
482482
if (isAutocompleteCommonPrefixOnInvocation() && items.length > 1) {
@@ -494,7 +494,7 @@ else if (decision instanceof AutoCompletionDecision.InsertItem) {
494494
// the insert handler may have started a live template with completion
495495
if (CompletionService.getCompletionService().getCurrentCompletion() == null) {
496496
indicator.liveAfterDeath(null);
497-
CompletionServiceImpl.setCompletionPhase(CompletionPhase.insertedSingleItem);
497+
CompletionServiceImpl.setCompletionPhase(CompletionPhase.InsertedSingleItem);
498498
} else {
499499
LOG.assertTrue(!indicator.isZombie(), indicator);
500500
}
@@ -597,12 +597,12 @@ private boolean isAutocompleteCommonPrefixOnInvocation() {
597597
}
598598

599599
protected CompletionPhase handleEmptyLookup(Project project, Editor editor, final CompletionParameters parameters, final CompletionProgressIndicator indicator) {
600-
if (ApplicationManager.getApplication().isUnitTestMode()) return CompletionPhase.noCompletion;
600+
if (ApplicationManager.getApplication().isUnitTestMode()) return CompletionPhase.NoCompletion;
601601
if (!invokedExplicitly) {
602-
return CompletionPhase.noCompletion;
602+
return CompletionPhase.NoCompletion;
603603
}
604604

605-
CompletionPhase result = CompletionPhase.noCompletion;
605+
CompletionPhase result = CompletionPhase.NoCompletion;
606606
for (final CompletionContributor contributor : CompletionContributor.forParameters(parameters)) {
607607
final String text = contributor.handleEmptyLookup(parameters, editor);
608608
if (StringUtil.isNotEmpty(text)) {
@@ -615,7 +615,7 @@ public void hintShown(final Project project, final LightweightHint hint, final i
615615
connection.subscribe(EditorHintListener.TOPIC, listener);
616616
HintManager.getInstance().showErrorHint(editor, text);
617617
connection.disconnect();
618-
result = CompletionPhase.noSuggestionsHint;
618+
result = CompletionPhase.NoSuggestionsHint;
619619
break;
620620
}
621621
}

platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionPhase.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
* @author peter
2020
*/
2121
public enum CompletionPhase {
22-
noCompletion,
23-
autoPopupAlarm,
24-
synchronous,
25-
bgCalculation,
26-
itemsCalculated,
27-
restarted,
28-
insertedSingleItem,
29-
noSuggestionsHint,
30-
possiblyDisturbingAutoPopup,
31-
emptyAutoPopup,
22+
NoCompletion,
23+
AutoPopupAlarm,
24+
Synchronous,
25+
BgCalculation,
26+
ItemsCalculated,
27+
Restarted,
28+
InsertedSingleItem,
29+
NoSuggestionsHint,
30+
PossiblyDisturbingAutoPopup,
31+
EmptyAutoPopup,
3232

3333
}

platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public int getSelectionEndOffset() {
146146
}
147147

148148
void notifyBackgrounded() {
149-
CompletionServiceImpl.setCompletionPhase(CompletionPhase.bgCalculation);
149+
CompletionServiceImpl.setCompletionPhase(CompletionPhase.BgCalculation);
150150
myState.setBackgrounded();
151151
}
152152

@@ -482,7 +482,7 @@ private void finishCompletionProcess() {
482482
Disposer.dispose(myQueue);
483483
unregisterItself(false);
484484

485-
CompletionServiceImpl.setCompletionPhase(CompletionPhase.noCompletion);
485+
CompletionServiceImpl.setCompletionPhase(CompletionPhase.NoCompletion);
486486
}
487487

488488
@TestOnly
@@ -495,9 +495,9 @@ public static void cleanupForNextTest() {
495495

496496
private void unregisterItself(boolean afterDeath) {
497497
if (afterDeath) {
498-
CompletionServiceImpl.assertPhase(CompletionPhase.noSuggestionsHint, CompletionPhase.insertedSingleItem);
498+
CompletionServiceImpl.assertPhase(CompletionPhase.NoSuggestionsHint, CompletionPhase.InsertedSingleItem);
499499
} else {
500-
CompletionServiceImpl.assertPhase(CompletionPhase.bgCalculation, CompletionPhase.itemsCalculated, CompletionPhase.synchronous, CompletionPhase.restarted);
500+
CompletionServiceImpl.assertPhase(CompletionPhase.BgCalculation, CompletionPhase.ItemsCalculated, CompletionPhase.Synchronous, CompletionPhase.Restarted);
501501
}
502502

503503
myState.handleDeath(afterDeath);
@@ -533,15 +533,15 @@ public void run() {
533533
if (!isAutopopupCompletion()) {
534534
CompletionServiceImpl.setCompletionPhase(myHandler.handleEmptyLookup(getProject(), myEditor, myParameters, CompletionProgressIndicator.this));
535535
} else {
536-
CompletionServiceImpl.setCompletionPhase(CompletionPhase.noCompletion);
536+
CompletionServiceImpl.setCompletionPhase(CompletionPhase.NoCompletion);
537537
}
538538
}
539539
else {
540540
if (myState.isFocusLookupWhenDone()) {
541541
myLookup.setFocused(true);
542542
}
543543
updateLookup();
544-
CompletionServiceImpl.setCompletionPhase(CompletionPhase.itemsCalculated);
544+
CompletionServiceImpl.setCompletionPhase(CompletionPhase.ItemsCalculated);
545545
}
546546
}
547547
}, myQueue.getModalityState());
@@ -554,15 +554,15 @@ public boolean hideAutopopupIfMeaningless() {
554554
if (items.isEmpty() && !myLookup.isCalculating()) {
555555
myLookup.hideLookup(false);
556556
LOG.assertTrue(CompletionServiceImpl.getCompletionService().getCurrentCompletion() == null);
557-
CompletionServiceImpl.setCompletionPhase(CompletionPhase.emptyAutoPopup);
557+
CompletionServiceImpl.setCompletionPhase(CompletionPhase.EmptyAutoPopup);
558558
return true;
559559
}
560560

561561
for (LookupElement item : items) {
562562
if ((item.getPrefixMatcher().getPrefix() + myLookup.getAdditionalPrefix()).equals(item.getLookupString())) {
563563
myLookup.hideLookup(true); // so that the autopopup attempts to restart after the next typed character
564564
LOG.assertTrue(CompletionServiceImpl.getCompletionService().getCurrentCompletion() == null);
565-
CompletionServiceImpl.setCompletionPhase(CompletionPhase.possiblyDisturbingAutoPopup);
565+
CompletionServiceImpl.setCompletionPhase(CompletionPhase.PossiblyDisturbingAutoPopup);
566566
return true;
567567
}
568568
}
@@ -690,7 +690,7 @@ public void prefixUpdated() {
690690
public void scheduleRestart() {
691691
ApplicationManager.getApplication().assertIsDispatchThread();
692692
myState.scheduleRestart();
693-
CompletionServiceImpl.setCompletionPhase(CompletionPhase.restarted);
693+
CompletionServiceImpl.setCompletionPhase(CompletionPhase.Restarted);
694694

695695
final Project project = getProject();
696696
ApplicationManager.getApplication().invokeLater(new Runnable() {
@@ -699,7 +699,7 @@ public void run() {
699699
if (isOutdated()) {
700700
return;
701701
}
702-
if (CompletionServiceImpl.getCompletionPhase() != CompletionPhase.restarted) {
702+
if (CompletionServiceImpl.getCompletionPhase() != CompletionPhase.Restarted) {
703703
return;
704704
}
705705

platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class CompletionServiceImpl extends CompletionService{
3737
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.completion.impl.CompletionServiceImpl");
3838
private Throwable myTrace = null;
3939
private CompletionProgressIndicator myCurrentCompletion;
40-
private static CompletionPhase ourPhase = CompletionPhase.noCompletion;
40+
private static CompletionPhase ourPhase = CompletionPhase.NoCompletion;
4141
private static String ourPhaseTrace;
4242

4343
public static CompletionServiceImpl getCompletionService() {

platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ public Result checkAutoPopup(char charTyped, final Project project, final Editor
9494

9595
final boolean isMainEditor = FileEditorManager.getInstance(project).getSelectedTextEditor() == editor;
9696

97-
CompletionServiceImpl.setCompletionPhase(CompletionPhase.autoPopupAlarm);
97+
CompletionServiceImpl.setCompletionPhase(CompletionPhase.AutoPopupAlarm);
9898

9999
final Runnable request = new Runnable() {
100100
@Override
101101
public void run() {
102-
if (CompletionServiceImpl.getCompletionPhase() != CompletionPhase.autoPopupAlarm) return;
102+
if (CompletionServiceImpl.getCompletionPhase() != CompletionPhase.AutoPopupAlarm) return;
103103

104104
if (project.isDisposed() || !file.isValid()) return;
105105
if (editor.isDisposed() || isMainEditor && FileEditorManager.getInstance(project).getSelectedTextEditor() != editor) return;
@@ -157,14 +157,14 @@ private static void finishAutopopupCompletion(Editor editor, boolean neglectLook
157157
}
158158

159159
final CompletionProgressIndicator currentCompletion = CompletionServiceImpl.getCompletionService().getCurrentCompletion();
160-
if (CompletionServiceImpl.isPhase(CompletionPhase.autoPopupAlarm, CompletionPhase.emptyAutoPopup, CompletionPhase.possiblyDisturbingAutoPopup)) {
161-
CompletionServiceImpl.setCompletionPhase(CompletionPhase.noCompletion);
160+
if (CompletionServiceImpl.isPhase(CompletionPhase.AutoPopupAlarm, CompletionPhase.EmptyAutoPopup, CompletionPhase.PossiblyDisturbingAutoPopup)) {
161+
CompletionServiceImpl.setCompletionPhase(CompletionPhase.NoCompletion);
162162
assert currentCompletion == null;
163163
} else {
164164
if (currentCompletion != null) {
165165
currentCompletion.closeAndFinish(true);
166166
}
167-
CompletionServiceImpl.assertPhase(CompletionPhase.noCompletion);
167+
CompletionServiceImpl.assertPhase(CompletionPhase.NoCompletion);
168168
}
169169

170170
state.stopAutoPopup();

0 commit comments

Comments
 (0)