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

Changed parsing of object and enum entries to drop "KtObjectDeclarationName"

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-10-30 21:14:03 +03:00
parent 03cda7f4d1
commit 52dc23012f
61 changed files with 180 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/testData/basic/common/TopLevelClassName6.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
object <caret>
// EXIST: { lookupString: "TopLevelClassName6", itemText: "TopLevelClassName6" }
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
+6
View File
@@ -745,6 +745,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
doTest(fileName);
}
@TestMetadata("TopLevelClassName6.kt")
public void testTopLevelClassName6() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName6.kt");
doTest(fileName);
}
@TestMetadata("TopLevelClassName-3.kt")
public void testTopLevelClassName_3() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName-3.kt");
idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
+6
View File
@@ -745,6 +745,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
doTest(fileName);
}
@TestMetadata("TopLevelClassName6.kt")
public void testTopLevelClassName6() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName6.kt");
doTest(fileName);
}
@TestMetadata("TopLevelClassName-3.kt")
public void testTopLevelClassName_3() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/TopLevelClassName-3.kt");
idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+1 -1
View File
@@ -135,7 +135,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
after(MODIFIER_LIST).spaces(1)
beforeInside(IDENTIFIER, CLASS).spaces(1)
beforeInside(OBJECT_DECLARATION_NAME, OBJECT_DECLARATION).spaces(1)
beforeInside(IDENTIFIER, OBJECT_DECLARATION).spaces(1)
betweenInside(VAL_KEYWORD, IDENTIFIER, PROPERTY).spaces(1)
betweenInside(VAR_KEYWORD, IDENTIFIER, PROPERTY).spaces(1)
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetEnumEntryWithoutSuperCallUsage.kt
+5 -2
View File
@@ -18,7 +18,10 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages
import com.intellij.usageView.UsageInfo
import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.KtDelegatorToSuperCall
import org.jetbrains.kotlin.psi.KtEnumEntry
import org.jetbrains.kotlin.psi.KtInitializerList
import org.jetbrains.kotlin.psi.KtPsiFactory
public class JetEnumEntryWithoutSuperCallUsage(enumEntry: KtEnumEntry) : JetUsageInfo<KtEnumEntry>(enumEntry) {
override fun processUsage(changeInfo: JetChangeInfo, element: KtEnumEntry, allUsages: Array<out UsageInfo>): Boolean {
@@ -27,7 +30,7 @@ public class JetEnumEntryWithoutSuperCallUsage(enumEntry: KtEnumEntry) : JetUsag
val delegatorToSuperCall = (element.addAfter(
psiFactory.createEnumEntryInitializerList(),
element.getNameAsDeclaration()
element.nameIdentifier
) as KtInitializerList).initializers[0] as KtDelegatorToSuperCall
return JetFunctionCallUsage(delegatorToSuperCall, changeInfo.methodDescriptor.originalPrimaryCallable)
idea/testData/checker/recovery/namelessToplevelDeclarations.kt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ interface<error> </error>{
}
object <error>{</error>
object<error> </error>{
}