diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form b/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
index e401e911e9a1..1b05ef09f3bb 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
@@ -18,7 +18,7 @@
-
+
@@ -56,18 +56,9 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -76,7 +67,7 @@
-
+
@@ -85,7 +76,7 @@
-
+
@@ -108,7 +99,7 @@
-
+
@@ -117,7 +108,7 @@
-
+
@@ -130,7 +121,7 @@
-
+
@@ -140,13 +131,13 @@
-
+
-
+
@@ -156,7 +147,7 @@
-
+
diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java
index 2a4a7f5b4a28..41bac0945a4f 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java
@@ -40,7 +40,6 @@ public class CodeCompletionPanel {
private JCheckBox myCbOnCodeCompletion;
private JCheckBox myCbOnSmartTypeCompletion;
- private JCheckBox myCbOnClassNameCompletion;
private JCheckBox myCbParameterInfoPopup;
private JTextField myParameterInfoDelayField;
@@ -49,9 +48,9 @@ public class CodeCompletionPanel {
private JComboBox myCaseSensitiveCombo;
private JComboBox myFocusLookup;
private JCheckBox myCbSorting;
- private static final String CASE_SENSITIVE_ALL = ApplicationBundle.message("combobox.autocomplete.casesensitive.all");
- private static final String CASE_SENSITIVE_NONE = ApplicationBundle.message("combobox.autocomplete.casesensitive.none");
- private static final String CASE_SENSITIVE_FIRST_LETTER = ApplicationBundle.message("combobox.autocomplete.casesensitive.first.letter");
+ private static final String CASE_SENSITIVE_ALL = ApplicationBundle.message("combobox.autocomplete.case.sensitive.all");
+ private static final String CASE_SENSITIVE_NONE = ApplicationBundle.message("combobox.autocomplete.case.sensitive.none");
+ private static final String CASE_SENSITIVE_FIRST_LETTER = ApplicationBundle.message("combobox.autocomplete.case.sensitive.first.letter");
private static final String[] CASE_VARIANTS = {CASE_SENSITIVE_ALL, CASE_SENSITIVE_NONE, CASE_SENSITIVE_FIRST_LETTER};
private static final String[] FOCUS_VARIANTS = {"Never", "'Smart'", "Always"};
@@ -89,7 +88,6 @@ public class CodeCompletionPanel {
hideOption(myCbShowStaticAfterInstance, OptionId.COMPLETION_SHOW_STATIC_AFTER_IMPORT);
hideOption(myCbOnSmartTypeCompletion, OptionId.COMPLETION_SMART_TYPE);
- hideOption(myCbOnClassNameCompletion, OptionId.COMPLETION_CLASS_NAME);
reset();
}
@@ -121,7 +119,6 @@ public class CodeCompletionPanel {
myCbOnCodeCompletion.setSelected(codeInsightSettings.AUTOCOMPLETE_ON_CODE_COMPLETION);
myCbOnSmartTypeCompletion.setSelected(codeInsightSettings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION);
- myCbOnClassNameCompletion.setSelected(codeInsightSettings.AUTOCOMPLETE_ON_CLASS_NAME_COMPLETION);
myCbAutocompleteCommonPrefix.setSelected(codeInsightSettings.AUTOCOMPLETE_COMMON_PREFIX);
myCbShowStaticAfterInstance.setSelected(codeInsightSettings.SHOW_STATIC_AFTER_INSTANCE);
@@ -147,11 +144,11 @@ public class CodeCompletionPanel {
CodeInsightSettings codeInsightSettings = CodeInsightSettings.getInstance();
codeInsightSettings.COMPLETION_CASE_SENSITIVE = getCaseSensitiveValue();
+ //noinspection MagicConstant
codeInsightSettings.AUTOPOPUP_FOCUS_POLICY = getFocusLookupValue();
codeInsightSettings.AUTOCOMPLETE_ON_CODE_COMPLETION = myCbOnCodeCompletion.isSelected();
codeInsightSettings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = myCbOnSmartTypeCompletion.isSelected();
- codeInsightSettings.AUTOCOMPLETE_ON_CLASS_NAME_COMPLETION = myCbOnClassNameCompletion.isSelected();
codeInsightSettings.AUTOCOMPLETE_COMMON_PREFIX = myCbAutocompleteCommonPrefix.isSelected();
codeInsightSettings.SHOW_STATIC_AFTER_INSTANCE = myCbShowStaticAfterInstance.isSelected();
codeInsightSettings.SHOW_FULL_SIGNATURES_IN_PARAMETER_INFO = myCbShowFullParameterSignatures.isSelected();
@@ -176,12 +173,13 @@ public class CodeCompletionPanel {
CodeInsightSettings codeInsightSettings = CodeInsightSettings.getInstance();
boolean isModified = false;
+ //noinspection ConstantConditions
isModified |= getCaseSensitiveValue() != codeInsightSettings.COMPLETION_CASE_SENSITIVE;
+ //noinspection MagicConstant
isModified |= getFocusLookupValue() != codeInsightSettings.AUTOPOPUP_FOCUS_POLICY;
isModified |= isModified(myCbOnCodeCompletion, codeInsightSettings.AUTOCOMPLETE_ON_CODE_COMPLETION);
isModified |= isModified(myCbOnSmartTypeCompletion, codeInsightSettings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION);
- isModified |= isModified(myCbOnClassNameCompletion, codeInsightSettings.AUTOCOMPLETE_ON_CLASS_NAME_COMPLETION);
isModified |= isModified(myCbAutocompleteCommonPrefix, codeInsightSettings.AUTOCOMPLETE_COMMON_PREFIX);
isModified |= isModified(myCbShowStaticAfterInstance, codeInsightSettings.SHOW_STATIC_AFTER_INSTANCE);
isModified |= isModified(myCbShowFullParameterSignatures, codeInsightSettings.SHOW_FULL_SIGNATURES_IN_PARAMETER_INFO);
@@ -213,7 +211,7 @@ public class CodeCompletionPanel {
return defaultValue;
}
}
- catch (NumberFormatException e) {
+ catch (NumberFormatException ignored) {
}
return value;
}
@@ -232,7 +230,6 @@ public class CodeCompletionPanel {
}
}
- @MagicConstant(intValues = {CodeInsightSettings.NEVER, CodeInsightSettings.SMART, CodeInsightSettings.ALWAYS})
private int getFocusLookupValue() {
return myFocusLookup.getSelectedIndex() + 1;
}
diff --git a/platform/lang-impl/src/com/intellij/application/options/OptionId.java b/platform/lang-impl/src/com/intellij/application/options/OptionId.java
index 4941b8472924..2c2f6bcd146c 100644
--- a/platform/lang-impl/src/com/intellij/application/options/OptionId.java
+++ b/platform/lang-impl/src/com/intellij/application/options/OptionId.java
@@ -26,6 +26,6 @@ public class OptionId {
public static final OptionId RENAME_IN_PLACE = new OptionId();
public static final OptionId COMPLETION_SHOW_STATIC_AFTER_IMPORT = new OptionId();
public static final OptionId COMPLETION_SMART_TYPE = new OptionId();
- public static final OptionId COMPLETION_CLASS_NAME = new OptionId();
+ @Deprecated public static final OptionId COMPLETION_CLASS_NAME = new OptionId();
public static final OptionId ICONS_IN_GUTTER = new OptionId();
}
diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
index c8f43e12f7c8..4d9711b009a7 100644
--- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties
+++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
@@ -30,14 +30,12 @@ label.complete.autopopup=Autopopup:
label.autocomplete.when.only.one.choice=Autocomplete when only one choice:
checkbox.show.static.members.after.instance.qualifier=Show static members after instance qualifier
checkbox.autocomplete.common.prefix=Autocomplete common prefix
-checkbox.autocomplete.class.name=Class Name
checkbox.autocomplete.smart.type=Smart Type
checkbox.autocomplete.basic=Basic
combobox.case.sensitive.completion=Case sensitive completion:
-combobox.autocomplete.casesensitive.all=All
-combobox.autocomplete.casesensitive.none=None
-combobox.autocomplete.casesensitive.first.letter=First letter
-combobox.autocomplete.casesensitive.all.uppercase=First letter and all uppercase letters
+combobox.autocomplete.case.sensitive.all=All
+combobox.autocomplete.case.sensitive.none=None
+combobox.autocomplete.case.sensitive.first.letter=First letter
editbox.blanklines.before.package.statement=Before package statement:
editbox.blanklines.after.package.statement=After package statement:
editbox.blanklines.before.imports=Before imports: