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

Quick-fix for header without implementation + a set of tests #KT-14908 Fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2016-12-23 13:43:45 +03:00
parent 07de819377
commit 4774d19890
45 changed files with 890 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiFactory.kt
+4
View File
@@ -176,6 +176,10 @@ class KtPsiFactory(private val project: Project) {
return createDeclaration(text)
}
fun createObject(text: String): KtObjectDeclaration {
return createDeclaration(text)
}
fun createCompanionObject(): KtObjectDeclaration {
return createClass("class A {\n companion object{\n}\n}").getCompanionObjects().first()
}
compiler/frontend/src/org/jetbrains/kotlin/psi/addRemoveModifier.kt
+3 -1
View File
@@ -115,7 +115,9 @@ private val MODIFIERS_TO_REPLACE = mapOf(
PUBLIC_KEYWORD to listOf(PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD),
PROTECTED_KEYWORD to listOf(PUBLIC_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD),
PRIVATE_KEYWORD to listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, INTERNAL_KEYWORD),
INTERNAL_KEYWORD to listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD)
INTERNAL_KEYWORD to listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD),
HEADER_KEYWORD to listOf(IMPL_KEYWORD),
IMPL_KEYWORD to listOf(HEADER_KEYWORD)
)
private val MODIFIERS_ORDER = listOf(PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, INTERNAL_KEYWORD,