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

don't mention class name completion in settings (IDEA-86517)

Browse Source
This commit is contained in:
peter
2012-06-28 22:07:15 +02:00
parent 91bfbd5047
commit aea5d28057
4 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
+10 -19
View File
@@ -18,7 +18,7 @@
<properties/>
<border type="none"/>
<children>
<grid id="7f988" layout-manager="GridLayoutManager" row-count="11" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="7f988" layout-manager="GridLayoutManager" row-count="10" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -56,18 +56,9 @@
<text resource-bundle="messages/ApplicationBundle" key="checkbox.autocomplete.smart.type"/>
</properties>
</component>
<component id="65183" class="javax.swing.JCheckBox" binding="myCbOnClassNameCompletion">
<constraints>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<margin top="2" left="15" bottom="2" right="2"/>
<text resource-bundle="messages/ApplicationBundle" key="checkbox.autocomplete.class.name"/>
</properties>
</component>
<component id="6141" class="javax.swing.JCheckBox" binding="myCbAutocompleteCommonPrefix">
<constraints>
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<margin top="2" left="2" bottom="2" right="2"/>
@@ -76,7 +67,7 @@
</component>
<component id="8063c" class="javax.swing.JCheckBox" binding="myCbSorting">
<constraints>
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<margin top="2" left="2" bottom="2" right="2"/>
@@ -85,7 +76,7 @@
</component>
<component id="beda2" class="javax.swing.JCheckBox" binding="myCbShowStaticAfterInstance">
<constraints>
<grid row="7" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
<grid row="6" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<margin top="2" left="2" bottom="12" right="2"/>
@@ -108,7 +99,7 @@
</component>
<component id="59c92" class="javax.swing.JCheckBox" binding="myCbAutocompletion">
<constraints>
<grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<margin top="2" left="2" bottom="2" right="2"/>
@@ -117,7 +108,7 @@
</component>
<component id="28a18" class="javax.swing.JTextField" binding="myAutocompletionDelayField">
<constraints>
<grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false">
<grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false">
<minimum-size width="50" height="-1"/>
<preferred-size width="144" height="28"/>
<maximum-size width="50" height="-1"/>
@@ -130,7 +121,7 @@
</component>
<component id="ae843" class="javax.swing.JLabel">
<constraints>
<grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<iconTextGap value="4"/>
@@ -140,13 +131,13 @@
</component>
<component id="6cbc" class="javax.swing.JComboBox" binding="myFocusLookup">
<constraints>
<grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
<grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="a1f3b" class="javax.swing.JTextField" binding="myAutopopupJavaDocField">
<constraints>
<grid row="10" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
<grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<columns value="4"/>
@@ -156,7 +147,7 @@
<grid id="f8961" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="0">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="10" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="9" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java
+7 -10
View File
@@ -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;
}
platform/lang-impl/src/com/intellij/application/options/OptionId.java
+1 -1
View File
@@ -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();
}
platform/platform-resources-en/src/messages/ApplicationBundle.properties
+3 -5
View File
@@ -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: