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

Move copy/paste resource bundles to Kotlin

Browse Source 
#KT-36877 #EA-224686 Fixed
This commit is contained in:
Vladimir Dolzhenko
2020-02-20 13:19:16 +01:00
parent bc7c8e4819
commit 7e832e50ac
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/resources/org/jetbrains/kotlin/idea/KotlinBundle.properties
+3
View File
@@ -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.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 scratch.inlay.output.mode.description=Inlay output mode
# Code insight
dialog.import.on.paste.title3=Select Import to Remove
copy.paste.reference.notification=<html>{0} {0, choice, 1#import was|2#imports were} added<p><span><a href='show'>Review Added Imports...</a></span></html>
idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteUtil.kt
+3 -4
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.idea.codeInsight package org.jetbrains.kotlin.idea.codeInsight
import com.intellij.codeInsight.CodeInsightBundle
import com.intellij.codeInsight.CodeInsightSettings import com.intellij.codeInsight.CodeInsightSettings
import com.intellij.codeInsight.hint.HintManager import com.intellij.codeInsight.hint.HintManager
import com.intellij.codeInsight.hint.HintManagerImpl import com.intellij.codeInsight.hint.HintManagerImpl
@@ -18,6 +17,7 @@ import com.intellij.openapi.project.Project
import com.intellij.ui.LightweightHint import com.intellij.ui.LightweightHint
import com.intellij.util.ArrayUtil import com.intellij.util.ArrayUtil
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer import org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
@@ -47,8 +47,7 @@ object ReviewAddedImports {
removeImports(project, file, importsToBeDeleted) removeImports(project, file, importsToBeDeleted)
return return
} }
val notificationText = CodeInsightBundle val notificationText = KotlinBundle.message("copy.paste.reference.notification", imported.size)
.message("copy.paste.reference.notification", imported.size)
ApplicationManager.getApplication().invokeLater( ApplicationManager.getApplication().invokeLater(
Runnable { Runnable {
showHint( showHint(
@@ -82,7 +81,7 @@ object ReviewAddedImports {
importedClasses: Set<String> importedClasses: Set<String>
) { ) {
val dialog = RestoreReferencesDialog(project, ArrayUtil.toObjectArray(importedClasses)) 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()) { if (dialog.showAndGet()) {
removeImports(project, file, dialog.selectedElements.map { it as String }.toSortedSet()) removeImports(project, file, dialog.selectedElements.map { it as String }.toSortedSet())
} }