azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace CodeStyleSettingsManager.getSettings with CodeStyle.getSettings

Browse Source
This commit is contained in:
Dmitry Gridin
2019-04-17 18:05:50 +07:00
parent bdb97ed46a
commit 2a85bece80
15 changed files with 47 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt
+5 -4
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.idea.maven
import com.intellij.application.options.CodeStyle
import com.intellij.openapi.application.Result
import com.intellij.openapi.application.WriteAction
import com.intellij.openapi.projectRoots.JavaSdk
@@ -276,7 +277,7 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
}
fun testImportObsoleteCodeStyle() {
Assert.assertNull(CodeStyleSettingsManager.getSettings(myProject).kotlinCodeStyleDefaults())
Assert.assertNull(CodeStyle.getSettings(myProject).kotlinCodeStyleDefaults())
importProject(
"""
@@ -292,12 +293,12 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
Assert.assertEquals(
KotlinObsoleteCodeStyle.CODE_STYLE_ID,
CodeStyleSettingsManager.getSettings(myProject).kotlinCodeStyleDefaults()
CodeStyle.getSettings(myProject).kotlinCodeStyleDefaults()
)
}
fun testImportOfficialCodeStyle() {
Assert.assertNull(CodeStyleSettingsManager.getSettings(myProject).kotlinCodeStyleDefaults())
Assert.assertNull(CodeStyle.getSettings(myProject).kotlinCodeStyleDefaults())
importProject(
"""
@@ -313,7 +314,7 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
Assert.assertEquals(
KotlinStyleGuideCodeStyle.CODE_STYLE_ID,
CodeStyleSettingsManager.getSettings(myProject).kotlinCodeStyleDefaults()
CodeStyle.getSettings(myProject).kotlinCodeStyleDefaults()
)
}