Replace deprecated code style API usages

This commit is contained in:
Rustam Vishnyakov
2018-09-13 13:31:28 +03:00
parent 22f7e6eede
commit 3e47ab268a
2 changed files with 4 additions and 2 deletions

View File

@@ -2,6 +2,7 @@
package com.intellij.ide.customize
import com.intellij.application.options.CodeStyle
import com.intellij.codeInsight.CodeInsightSettings
import com.intellij.ide.WelcomeWizardUtil
import com.intellij.ide.projectView.impl.ProjectViewSharedSettings
@@ -34,7 +35,7 @@ class WelcomeWizardHelper : BaseComponent {
//Code style settings
WelcomeWizardUtil.getContinuationIndent()?.let {
Language.getRegisteredLanguages()
.map { CodeStyleSettingsManager.getInstance().currentSettings.getIndentOptions(it.associatedFileType) }
.map { CodeStyle.getDefaultSettings().getIndentOptions(it.associatedFileType) }
.filter { it.CONTINUATION_INDENT_SIZE > WelcomeWizardUtil.getContinuationIndent() }
.forEach { it.CONTINUATION_INDENT_SIZE = WelcomeWizardUtil.getContinuationIndent() }
}

View File

@@ -15,6 +15,7 @@
*/
package com.jetbrains.python;
import com.intellij.application.options.CodeStyle;
import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.ide.AppLifecycleListener;
import com.intellij.ide.ui.UISettings;
@@ -47,7 +48,7 @@ public class PyCharmInitialConfigurator {
}
if (!propertiesComponent.getBoolean("PyCharm.InitialConfiguration.V2")) {
propertiesComponent.setValue("PyCharm.InitialConfiguration.V2", true);
final CodeStyleSettings settings = CodeStyleSettingsManager.getInstance().getCurrentSettings();
final CodeStyleSettings settings = CodeStyle.getDefaultSettings();
settings.getCommonSettings(PythonLanguage.getInstance()).ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true;
UISettings.getInstance().setShowDirectoryForNonUniqueFilenames(true);
}