MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] k2: use KotlinNamesValidator

Browse Source 
^KTIJ-28946 Fixed

GitOrigin-RevId: 44ab38ef40abc92c2a84464fdb5f5256c2f20939
This commit is contained in:
aleksandrina-streltsova
2024-04-11 11:49:31 +00:00
committed by intellij-monorepo-bot
parent 2ee9a987b5
commit da233bc77b
6 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java
+5
View File
@@ -503,6 +503,11 @@ public abstract class ExtractionTestGenerated extends AbstractExtractionTest {
runTest("testData/refactoring/introduceVariable/introduceToFile.kt");
}
@TestMetadata("invalidInplaceName.kt")
public void testInvalidInplaceName() throws Exception {
runTest("testData/refactoring/introduceVariable/invalidInplaceName.kt");
}
@TestMetadata("It.kt")
public void testIt() throws Exception {
runTest("testData/refactoring/introduceVariable/It.kt");
plugins/kotlin/idea/tests/testData/refactoring/introduceVariable/invalidInplaceName.kt
+5
View File
@@ -0,0 +1,5 @@
// INPLACE_VARIABLE_NAME: val
/* this test is required to check KTIJ-28946, but the current expected result is not correct, see KTIJ-29410 */
fun test(): Int {
return <selection>1</selection>
}
plugins/kotlin/idea/tests/testData/refactoring/introduceVariable/invalidInplaceName.kt.after
+6
View File
@@ -0,0 +1,6 @@
// INPLACE_VARIABLE_NAME: val
/* this test is required to check KTIJ-28946, but the current expected result is not correct, see KTIJ-29410 */
fun test(): Int {
val val = 1
return val
}
plugins/kotlin/plugin/common/resources/META-INF/refactorings.xml
+1
View File
@@ -16,6 +16,7 @@
<vetoRenameCondition implementation="org.jetbrains.kotlin.idea.refactoring.KotlinVetoRenameCondition"/>
<lang.namesValidator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.refactoring.KotlinNamesValidator"/>
<renameInputValidator implementation="org.jetbrains.kotlin.idea.refactoring.rename.KotlinDeclarationRenameInputValidator"/>
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.KotlinRenameDispatcherHandler"/>
plugins/kotlin/plugin/k1/resources/META-INF/refactorings-fe10.xml
-2
View File
@@ -16,8 +16,6 @@
<applicationService serviceImplementation="org.jetbrains.kotlin.idea.refactoring.K1CommonRefactoringSettings"
serviceInterface="org.jetbrains.kotlin.idea.refactoring.KotlinCommonRefactoringSettings"/>
<lang.namesValidator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.refactoring.KotlinNamesValidator"/>
<nameSuggestionProvider implementation="org.jetbrains.kotlin.idea.base.fe10.codeInsight.newDeclaration.Fe10KotlinNameSuggestionProvider"/>
<lang.refactoringSupport
plugins/kotlin/refactorings/kotlin.refactorings.introduce.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/introduce/introduceVariable/K2IntroduceVariableTestGenerated.java
+5
View File
@@ -501,6 +501,11 @@ public abstract class K2IntroduceVariableTestGenerated extends AbstractK2Introdu
runTest("../../idea/tests/testData/refactoring/introduceVariable/introduceToFile.kt");
}
@TestMetadata("invalidInplaceName.kt")
public void testInvalidInplaceName() throws Exception {
runTest("../../idea/tests/testData/refactoring/introduceVariable/invalidInplaceName.kt");
}
@TestMetadata("It.kt")
public void testIt() throws Exception {
runTest("../../idea/tests/testData/refactoring/introduceVariable/It.kt");