diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java index d96b05aaf471..b4abb4ee4e7d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java @@ -105,11 +105,10 @@ public class ConstructorInsertHandler implements InsertHandler() { diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java index 15829dfdb671..9979d222bba3 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java @@ -488,15 +488,6 @@ public class JavaCompletionContributor extends CompletionContributor { } } - if (parameters.getCompletionType() != CompletionType.CLASS_NAME && shouldSuggestClassNameCompletion(parameters.getPosition())) { - if (CompletionUtil.shouldShowFeature(parameters, CodeCompletionFeatures.EDITING_COMPLETION_CLASSNAME)) { - final String shortcut = getActionShortcut(IdeActions.ACTION_CODE_COMPLETION); - if (shortcut != null) { - return CompletionBundle.message("completion.class.name.hint", shortcut); - } - } - } - if (parameters.getCompletionType() == CompletionType.SMART && parameters.getInvocationCount() == 1) { final PsiType[] psiTypes = ExpectedTypesGetter.getExpectedTypes(parameters.getPosition(), true); if (psiTypes.length > 0) { diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionFeatures.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionFeatures.java index c775281e16ed..ac5cfe25fe3a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionFeatures.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionFeatures.java @@ -27,5 +27,4 @@ public interface JavaCompletionFeatures { @NonNls String SECOND_SMART_COMPLETION_ARRAY_MEMBER = "editing.completion.second.smarttype.array.member"; @NonNls String GLOBAL_MEMBER_NAME = "editing.completion.global.member.name"; @NonNls String AFTER_NEW = "editing.completion.smarttype.afternew"; - @NonNls String AFTER_NEW_ANONYMOUS = "editing.completion.smarttype.afternew"; } diff --git a/platform/funcTests/config/options/feature.usage.statistics.xml b/platform/funcTests/config/options/feature.usage.statistics.xml index 9636da089d21..e047526ca94f 100644 --- a/platform/funcTests/config/options/feature.usage.statistics.xml +++ b/platform/funcTests/config/options/feature.usage.statistics.xml @@ -14,7 +14,6 @@ - @@ -57,7 +56,6 @@ - @@ -65,7 +63,6 @@ - diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionFeatures.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionFeatures.java index e2eb6b67dc44..c9bed0d1aea9 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionFeatures.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionFeatures.java @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NonNls; */ public interface CodeCompletionFeatures { @NonNls String EXCLAMATION_FINISH = "editing.completion.finishByExclamation"; - @NonNls String SECOND_CLASS_NAME_COMPLETION = "editing.completion.second.classname"; @NonNls String SECOND_BASIC_COMPLETION = "editing.completion.second.basic"; @NonNls String EDITING_COMPLETION_SMARTTYPE_GENERAL = "editing.completion.smarttype.general"; @NonNls String EDITING_COMPLETION_BASIC = "editing.completion.basic"; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java index fa9bd7867ad6..f6124cc309ee 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java @@ -151,10 +151,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler { CompletionServiceImpl.assertPhase(CompletionPhase.NoCompletion.getClass(), CompletionPhase.CommittingDocuments.class); if (time > 1) { - if (myCompletionType == CompletionType.CLASS_NAME) { - FeatureUsageTracker.getInstance().triggerFeatureUsed(CodeCompletionFeatures.SECOND_CLASS_NAME_COMPLETION); - } - else if (myCompletionType == CompletionType.BASIC) { + if (myCompletionType == CompletionType.BASIC) { FeatureUsageTracker.getInstance().triggerFeatureUsed(CodeCompletionFeatures.SECOND_BASIC_COMPLETION); } } diff --git a/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties b/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties index 883ebe769e70..14f3326d6b9d 100644 --- a/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties +++ b/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties @@ -38,12 +38,9 @@ navigation.select.in=Select In popup navigation.goto.declaration=Go to declaration navigation.goto.implementation=Go to implementation editing.completion.basic=Basic code completion -editing.completion.classname=Class name completion editing.completion.smarttype.general=Smart type completion -editing.completion.smarttype.anonymous=Smart anonymous class instantiation editing.completion.smarttype.afternew=Smart type completion after new editing.completion.smarttype.casting=Smart type casting -editing.completion.second.classname=Second class name completion editing.completion.second.basic=Second basic completion editing.completion.second.smarttype.chain=Second smart type completion: chained method calls editing.completion.second.smarttype.toar=Second smart type completion: toArray() conversion diff --git a/platform/platform-resources-en/src/tips/TagNameCompletion.html b/platform/platform-resources-en/src/tips/TagNameCompletion.html index 69668ea3624d..cdce27443c63 100644 --- a/platform/platform-resources-en/src/tips/TagNameCompletion.html +++ b/platform/platform-resources-en/src/tips/TagNameCompletion.html @@ -3,7 +3,8 @@ -

A special variant of the CodeCompletion feature invoked by &shortcut:ClassNameCompletion; allows you to +

+ A special variant of the Code Completion feature invoked by pressing &shortcut:CodeCompletion; twice allows you to complete XML tag names from namespaces not declared in the current file. If the namespace is not declared yet the declaration is generated automatically. diff --git a/resources-en/src/tips/ClassNameCompletion.html b/resources-en/src/tips/ClassNameCompletion.html deleted file mode 100644 index d31a84054ed6..000000000000 --- a/resources-en/src/tips/ClassNameCompletion.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - -

A special variant of the CodeCompletion feature invoked by &shortcut:ClassNameCompletion; allows you to complete the name of any - class no matter if it was imported in the current file or not. If the class is not imported yet the import statement is generated automatically.

-

- - - - - diff --git a/resources-en/src/tips/CompletionImportStatic.html b/resources-en/src/tips/CompletionImportStatic.html index 87a7e4f05a63..8141021f87d9 100644 --- a/resources-en/src/tips/CompletionImportStatic.html +++ b/resources-en/src/tips/CompletionImportStatic.html @@ -7,8 +7,8 @@ To quickly complete a method call of a static method located anywhere in your project, libraries or JDK, enter a prefix - and press &shortcut:ClassNameCompletion;. You'll see all the matching methods. If you want the method you chose to be imported statically, - press &shortcut:EditorRight; and see what happens: + and press &shortcut:CodeCompletion; twice. You'll see all the matching methods. If you want the method you chose to be imported statically, + press &shortcut:ShowIntentionActions; and see what happens:

diff --git a/resources-en/src/tips/SecondClassNameCompletion.html b/resources-en/src/tips/SecondClassNameCompletion.html deleted file mode 100644 index dc08487907fd..000000000000 --- a/resources-en/src/tips/SecondClassNameCompletion.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - -

- Pressing the same shortcut after you have invoked Class Name Completion will search for - classes in whole project and its libraries ignoring module dependencies.

-

-

-

-

- - diff --git a/resources-en/src/tips/SmartTypeAnonymous.html b/resources-en/src/tips/SmartTypeAnonymous.html deleted file mode 100644 index 3a52ea323c9a..000000000000 --- a/resources-en/src/tips/SmartTypeAnonymous.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - -

It's very easy to generate the whole anonymous implementation of some interface, for example, of some listener, - by using the SmartType code completion. For example, type

-
-Component component;
-component.addMouseListener(
-    new <caret is here> );
-
-

and press &shortcut:SmartTypeCompletion; to see what happens.

- - - diff --git a/resources-en/src/tips/images/class_name_completion.gif b/resources-en/src/tips/images/class_name_completion.gif deleted file mode 100644 index 673943b0729a..000000000000 Binary files a/resources-en/src/tips/images/class_name_completion.gif and /dev/null differ diff --git a/resources-en/src/tips/images/second_class_name_completion.png b/resources-en/src/tips/images/second_class_name_completion.png deleted file mode 100644 index d01936157d35..000000000000 Binary files a/resources-en/src/tips/images/second_class_name_completion.png and /dev/null differ diff --git a/resources/src/ProductivityFeaturesRegistry.xml b/resources/src/ProductivityFeaturesRegistry.xml index e82c1b6dfd47..0f5e00769906 100644 --- a/resources/src/ProductivityFeaturesRegistry.xml +++ b/resources/src/ProductivityFeaturesRegistry.xml @@ -93,24 +93,12 @@ min-usage-count="15" first-show="1" successive-show="3"/> - - - - - - - -