Skip to content

Commit 4155f09

Browse files
GH-133: Fix deprecation warnings
``` /home/kshchepanovskyi/IdeaProjects/protobuf-jetbrains-plugin/src/main/java/io/protostuff/jetbrains/plugin/formatter/ProtoLanguageCodeStyleSettingsProvider.java:47: warning: [deprecation] getDefaultCommonSettings() in LanguageCodeStyleSettingsProvider has been deprecated public CommonCodeStyleSettings getDefaultCommonSettings() { ^ /home/kshchepanovskyi/IdeaProjects/protobuf-jetbrains-plugin/src/main/java/io/protostuff/jetbrains/plugin/formatter/ProtoCodeStyleSettingsProvider.java:34: warning: [deprecation] createSettingsPage(CodeStyleSettings,CodeStyleSettings) in CodeStyleSettingsProvider has been deprecated public Configurable createSettingsPage(CodeStyleSettings settings, CodeStyleSettings originalSettings) { ^ 2 warnings ```
1 parent cc764c7 commit 4155f09

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed

src/main/java/io/protostuff/jetbrains/plugin/formatter/ProtoCodeStyleSettingsProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.intellij.application.options.CodeStyleAbstractConfigurable;
44
import com.intellij.application.options.CodeStyleAbstractPanel;
55
import com.intellij.application.options.TabbedLanguageCodeStylePanel;
6-
import com.intellij.openapi.options.Configurable;
6+
import com.intellij.psi.codeStyle.CodeStyleConfigurable;
77
import com.intellij.psi.codeStyle.CodeStyleSettings;
88
import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
99
import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
@@ -31,7 +31,8 @@ public String getConfigurableDisplayName() {
3131

3232
@NotNull
3333
@Override
34-
public Configurable createSettingsPage(CodeStyleSettings settings, CodeStyleSettings originalSettings) {
34+
public CodeStyleConfigurable createConfigurable(@NotNull CodeStyleSettings settings,
35+
@NotNull CodeStyleSettings originalSettings) {
3536
return new CodeStyleAbstractConfigurable(settings, originalSettings, "Protobuf") {
3637
@Override
3738
protected CodeStyleAbstractPanel createPanel(CodeStyleSettings settings) {

src/main/java/io/protostuff/jetbrains/plugin/formatter/ProtoLanguageCodeStyleSettingsProvider.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ public Language getLanguage() {
2929

3030
@Override
3131
public void customizeSettings(@NotNull CodeStyleSettingsCustomizable consumer, @NotNull SettingsType settingsType) {
32-
switch (settingsType) {
33-
default:
34-
break;
35-
}
32+
3633
}
3734

3835
@Nullable
@@ -41,19 +38,14 @@ public IndentOptionsEditor getIndentOptionsEditor() {
4138
return new SmartIndentOptionsEditor();
4239
}
4340

44-
45-
@Nullable
4641
@Override
47-
public CommonCodeStyleSettings getDefaultCommonSettings() {
48-
CommonCodeStyleSettings settings = new CommonCodeStyleSettings(ProtoLanguage.INSTANCE);
49-
settings.initIndentOptions();
50-
// TODO: we should define our own settings
51-
settings.SPACE_AROUND_ASSIGNMENT_OPERATORS = true;
52-
settings.SPACE_BEFORE_SEMICOLON = false;
53-
settings.BRACE_STYLE = END_OF_LINE;
54-
settings.KEEP_BLANK_LINES_IN_CODE = 2;
55-
settings.KEEP_LINE_BREAKS = false;
56-
return settings;
42+
protected void customizeDefaults(@NotNull CommonCodeStyleSettings commonSettings,
43+
@NotNull CommonCodeStyleSettings.IndentOptions indentOptions) {
44+
commonSettings.SPACE_AROUND_ASSIGNMENT_OPERATORS = true;
45+
commonSettings.SPACE_BEFORE_SEMICOLON = false;
46+
commonSettings.BRACE_STYLE = END_OF_LINE;
47+
commonSettings.KEEP_BLANK_LINES_IN_CODE = 2;
48+
commonSettings.KEEP_LINE_BREAKS = false;
5749
}
5850

5951
@Override

0 commit comments

Comments
 (0)