From 7e832e50acb5c3656a6d5e366000bd4e9bc0575b Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Thu, 20 Feb 2020 13:19:16 +0100 Subject: [PATCH] Move copy/paste resource bundles to Kotlin #KT-36877 #EA-224686 Fixed --- .../org/jetbrains/kotlin/idea/KotlinBundle.properties | 3 +++ .../kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties b/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties index 0aa61c8c975..04197a1f6b6 100644 --- a/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties +++ b/idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties @@ -282,3 +282,6 @@ scratch.side.panel.output.mode.description=Side panel output mode scratch.side.panel.output.mode=Side panel output mode\n\nThe output is shown in the separate panel. Useful if the output is long or multi-line. scratch.inlay.output.mode.description=Inlay output mode +# Code insight +dialog.import.on.paste.title3=Select Import to Remove +copy.paste.reference.notification={0} {0, choice, 1#import was|2#imports were} added

Review Added Imports... diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt index e35c9f5e14a..3f246fbdc20 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.idea.codeInsight -import com.intellij.codeInsight.CodeInsightBundle import com.intellij.codeInsight.CodeInsightSettings import com.intellij.codeInsight.hint.HintManager import com.intellij.codeInsight.hint.HintManagerImpl @@ -18,6 +17,7 @@ import com.intellij.openapi.project.Project import com.intellij.ui.LightweightHint import com.intellij.util.ArrayUtil import org.jetbrains.annotations.TestOnly +import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtFile @@ -47,8 +47,7 @@ object ReviewAddedImports { removeImports(project, file, importsToBeDeleted) return } - val notificationText = CodeInsightBundle - .message("copy.paste.reference.notification", imported.size) + val notificationText = KotlinBundle.message("copy.paste.reference.notification", imported.size) ApplicationManager.getApplication().invokeLater( Runnable { showHint( @@ -82,7 +81,7 @@ object ReviewAddedImports { importedClasses: Set ) { val dialog = RestoreReferencesDialog(project, ArrayUtil.toObjectArray(importedClasses)) - dialog.title = CodeInsightBundle.message("dialog.import.on.paste.title3") + dialog.title = KotlinBundle.message("dialog.import.on.paste.title3") if (dialog.showAndGet()) { removeImports(project, file, dialog.selectedElements.map { it as String }.toSortedSet()) }