mirror of
https://github.com/jlengrand/kotlin.git
synced 2026-04-04 15:51:54 +00:00
Rename: Support rename of packages with non-standard quoted names
#KT-13488 Fixed (cherry picked from commit 0fc28fe)
This commit is contained in:
@@ -193,6 +193,7 @@ Using 'this' as function argument in constructor of non-final class
|
||||
- [`KT-13463`](https://youtrack.jetbrains.com/issue/KT-13463) Rename: Quote parameter name when necessary
|
||||
- [`KT-13476`](https://youtrack.jetbrains.com/issue/KT-13476) Rename: Fix parameter rename when new name matches call selector
|
||||
- [`KT-9381`](https://youtrack.jetbrains.com/issue/KT-9381) Rename: Do not search for component convention usages
|
||||
- [`KT-13488`](https://youtrack.jetbrains.com/issue/KT-13488) Rename: Support rename of packages with non-standard quoted names
|
||||
|
||||
##### New features
|
||||
|
||||
|
||||
@@ -437,6 +437,7 @@
|
||||
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameJavaSyntheticPropertyHandler"/>
|
||||
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.JavaMemberByKotlinReferenceInplaceRenameHandler"/>
|
||||
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.RenameJvmNameHandler"/>
|
||||
<renameHandler implementation="org.jetbrains.kotlin.idea.refactoring.rename.KotlinDirectoryAsPackageRenameHandler"/>
|
||||
<automaticRenamerFactory implementation="org.jetbrains.kotlin.idea.refactoring.rename.AutomaticVariableRenamerFactory"/>
|
||||
<automaticRenamerFactory implementation="org.jetbrains.kotlin.idea.refactoring.rename.AutomaticVariableRenamerFactoryForJavaClass"/>
|
||||
<automaticRenamerFactory implementation="org.jetbrains.kotlin.idea.refactoring.rename.AutomaticVariableInJavaRenamerFactory"/>
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
/*
|
||||
* Copyright 2010-2016 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.idea.refactoring.rename
|
||||
|
||||
import com.intellij.openapi.project.Project
|
||||
import com.intellij.refactoring.rename.DirectoryAsPackageRenameHandler
|
||||
import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
|
||||
import org.jetbrains.kotlin.idea.core.quoteIfNeeded
|
||||
|
||||
class KotlinDirectoryAsPackageRenameHandler : DirectoryAsPackageRenameHandler() {
|
||||
override fun isIdentifier(name: String, project: Project) = KotlinNameSuggester.isIdentifier(name.quoteIfNeeded())
|
||||
}
|
||||
3
idea/testData/refactoring/rename/renamePackageWithQuotation/after/test/break/test.kt
vendored
Normal file
3
idea/testData/refactoring/rename/renamePackageWithQuotation/after/test/break/test.kt
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
package test.`for`
|
||||
|
||||
class Test
|
||||
3
idea/testData/refactoring/rename/renamePackageWithQuotation/before/test/break/test.kt
vendored
Normal file
3
idea/testData/refactoring/rename/renamePackageWithQuotation/before/test/break/test.kt
vendored
Normal file
@@ -0,0 +1,3 @@
|
||||
package test./*rename*/`for`
|
||||
|
||||
class Test
|
||||
7
idea/testData/refactoring/rename/renamePackageWithQuotation/renamePackageWithQuotation.test
vendored
Normal file
7
idea/testData/refactoring/rename/renamePackageWithQuotation/renamePackageWithQuotation.test
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"type": "MARKED_ELEMENT",
|
||||
"mainFile": "test/break/test.kt",
|
||||
"newName": "for",
|
||||
"withRuntime": "true",
|
||||
"byRef": "true"
|
||||
}
|
||||
@@ -995,6 +995,12 @@ public class RenameTestGenerated extends AbstractRenameTest {
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("renamePackageWithQuotation/renamePackageWithQuotation.test")
|
||||
public void testRenamePackageWithQuotation_RenamePackageWithQuotation() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renamePackageWithQuotation/renamePackageWithQuotation.test");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("renamePlus/plus.test")
|
||||
public void testRenamePlus_Plus() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/rename/renamePlus/plus.test");
|
||||
|
||||
Reference in New Issue
Block a user