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

merge CodeStyleCustomizationsConsumer into LanguageCodeStyleSettingsProvider

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-05-20 19:11:17 +04:00
parent 992736c2f0
commit bbe1515a2d
8 changed files with 23 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/application/options/JavaCodeStyleOptionsCustomizer.java
-34
View File
@@ -1,34 +0,0 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.application.options;
import com.intellij.psi.codeStyle.CodeStyleCustomizationsConsumer;
import com.intellij.psi.codeStyle.CodeStyleOptionsCustomizer;
/**
* @author yole
*/
public class JavaCodeStyleOptionsCustomizer extends CodeStyleOptionsCustomizer {
@Override
public void customizeSpacingOptions(CodeStyleCustomizationsConsumer consumer) {
consumer.showAllStandardOptions();
}
@Override
public void customizeBlankLinesOptions(CodeStyleCustomizationsConsumer consumer) {
consumer.showAllStandardOptions();
}
}
java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
+12
View File
@@ -18,6 +18,7 @@ package com.intellij.ide;
import com.intellij.application.options.codeStyle.LanguageCodeStyleSettingsProvider;
import com.intellij.lang.Language;
import com.intellij.lang.StdLanguages;
import com.intellij.psi.codeStyle.CodeStyleCustomizationsConsumer;
import org.jetbrains.annotations.NotNull;
/**
@@ -44,6 +45,17 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett
return GENERAL_CODE_SAMPLE;
}
@Override
public void customizeSpacingOptions(CodeStyleCustomizationsConsumer consumer) {
consumer.showAllStandardOptions();
}
@Override
public void customizeBlankLinesOptions(CodeStyleCustomizationsConsumer consumer) {
consumer.showAllStandardOptions();
}
private static final String GENERAL_CODE_SAMPLE = "public class Foo {\n" +
" public int[] X = new int[]{1, 3, 5 7, 9, 11};\n" +
"\n" +
platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleOptionsCustomizer.java
-31
View File
@@ -1,31 +0,0 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.psi.codeStyle;
import com.intellij.openapi.extensions.ExtensionPointName;
/**
* @author yole
*/
public abstract class CodeStyleOptionsCustomizer {
public static final ExtensionPointName<CodeStyleOptionsCustomizer> EP_NAME = ExtensionPointName.create("com.intellij.codeStyleOptionsCustomizer");
public void customizeSpacingOptions(CodeStyleCustomizationsConsumer consumer) {
}
public void customizeBlankLinesOptions(CodeStyleCustomizationsConsumer consumer) {
}
}
platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java
+2 -3
View File
@@ -20,7 +20,6 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.psi.PsiFile;
import com.intellij.psi.codeStyle.CodeStyleCustomizationsConsumer;
import com.intellij.psi.codeStyle.CodeStyleOptionsCustomizer;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
import com.intellij.ui.OptionGroup;
@@ -43,8 +42,8 @@ public class CodeStyleBlankLinesPanel extends MultilanguageCodeStyleAbstractPane
public CodeStyleBlankLinesPanel(CodeStyleSettings settings) {
super(settings);
for(CodeStyleOptionsCustomizer customizer: Extensions.getExtensions(CodeStyleOptionsCustomizer.EP_NAME)) {
customizer.customizeBlankLinesOptions(this);
for(LanguageCodeStyleSettingsProvider provider: Extensions.getExtensions(LanguageCodeStyleSettingsProvider.EP_NAME)) {
provider.customizeBlankLinesOptions(this);
}
myPanel
platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java
+2 -3
View File
@@ -18,7 +18,6 @@ package com.intellij.application.options.codeStyle;
import com.intellij.openapi.application.ApplicationBundle;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.util.Trinity;
import com.intellij.psi.codeStyle.CodeStyleOptionsCustomizer;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleCustomizationsConsumer;
@@ -47,8 +46,8 @@ public class CodeStyleSpacesPanel extends OptionTreeWithPreviewPanel implements
protected void initTables() {
myAllowedOptions = new HashSet<String>();
myCustomOptions = new MultiMap<String, Trinity<Class<? extends CustomCodeStyleSettings>, String, String>>();
for(CodeStyleOptionsCustomizer contributor: Extensions.getExtensions(CodeStyleOptionsCustomizer.EP_NAME)) {
contributor.customizeSpacingOptions(this);
for(LanguageCodeStyleSettingsProvider provider: Extensions.getExtensions(LanguageCodeStyleSettingsProvider.EP_NAME)) {
provider.customizeSpacingOptions(this);
}
initBooleanField("SPACE_BEFORE_METHOD_CALL_PARENTHESES", ApplicationBundle.message("checkbox.spaces.method.call.parentheses"), BEFORE_PARENTHESES);
platform/lang-impl/src/com/intellij/application/options/codeStyle/LanguageCodeStyleSettingsProvider.java
+7
View File
@@ -18,6 +18,7 @@ package com.intellij.application.options.codeStyle;
import com.intellij.lang.Language;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.psi.codeStyle.CodeStyleCustomizationsConsumer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -41,6 +42,12 @@ public abstract class LanguageCodeStyleSettingsProvider {
public abstract String getCodeSample(@NotNull SettingsType settingsType);
public void customizeSpacingOptions(CodeStyleCustomizationsConsumer consumer) {
}
public void customizeBlankLinesOptions(CodeStyleCustomizationsConsumer consumer) {
}
public static Language[] getLanguagesWithCodeStyleSettings() {
ArrayList<Language> langs = new ArrayList<Language>();
for (LanguageCodeStyleSettingsProvider provider : Extensions.getExtensions(EP_NAME)) {
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
-2
View File
@@ -59,8 +59,6 @@
<extensionPoint name="codeStyleSettingsProvider"
interface="com.intellij.psi.codeStyle.CodeStyleSettingsProvider"/>
<extensionPoint name="codeStyleOptionsCustomizer"
interface="com.intellij.psi.codeStyle.CodeStyleOptionsCustomizer"/>
<extensionPoint name="daemon.highlightInfoFilter"
interface="com.intellij.codeInsight.daemon.impl.HighlightInfoFilter"/>
resources/src/META-INF/IdeaPlugin.xml
-2
View File
@@ -720,8 +720,6 @@
<langCodeStyleSettingsProvider implementation="com.intellij.ide.JavaLanguageCodeStyleSettingsProvider"/>
<codeStyleOptionsCustomizer implementation="com.intellij.application.options.JavaCodeStyleOptionsCustomizer"/>
<!-- new project wizard -->
<wizardMode implementation="com.intellij.ide.util.newProjectWizard.modes.CreateFromScratchMode"/>
<wizardMode implementation="com.intellij.ide.util.newProjectWizard.modes.CreateFromSourcesMode"/>