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] move to more appropriate bundle

Browse Source 
GitOrigin-RevId: 95ad0451aaf13935d1296f4039ccdecb8ab9126e
This commit is contained in:
Anna Kozlova
2023-01-24 17:13:55 +00:00
committed by intellij-monorepo-bot
parent d8f3fbc958
commit 6aa468aabd
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
+1 -2
View File
@@ -629,5 +629,4 @@ intention.name.remove.repeating.call=Remove repeating call ''{0}()''
intention.family.name.replace.with.expression=Replace with expression
intention.name.make.variable.effectively.final=Make variable effectively final
uast.language.display.name=JVM languages
dialog.progress.collect.members.to.generate=Collect Members...
uast.language.display.name=JVM languages
plugins/kotlin/base/resources/resources-en/messages/KotlinBundle.properties
+2 -1
View File
@@ -2571,4 +2571,5 @@ notification.text.kotlin.js.compiler.learn.more=Learn more
notification.text.kotlin.js.compiler.link=https://kotl.in/jsirstable
find.usages.prepare.dialog.progress=Prepare dialog
replace.overloaded.operator.with.function.call=Replace overloaded operator with function call
replace.overloaded.operator.with.function.call=Replace overloaded operator with function call
dialog.progress.collect.members.to.generate=Collect Members...
plugins/kotlin/code-insight/override-implement-shared/kotlin.code-insight.override-implement-shared.iml
+1
View File
@@ -14,5 +14,6 @@
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.java.impl" />
<orderEntry type="module" module-name="kotlin.base.resources" />
</component>
</module>
plugins/kotlin/code-insight/override-implement-shared/src/org/jetbrains/kotlin/idea/core/overrideImplement/AbstractGenerateMembersHandler.kt
+4 -2
View File
@@ -6,7 +6,6 @@ import com.intellij.codeInsight.FileModificationService
import com.intellij.codeInsight.generation.ClassMember
import com.intellij.codeInsight.hint.HintManager
import com.intellij.ide.util.MemberChooser
import com.intellij.java.analysis.JavaAnalysisBundle
import com.intellij.lang.LanguageCodeInsightActionHandler
import com.intellij.openapi.application.runReadAction
import com.intellij.openapi.editor.Editor
@@ -16,7 +15,9 @@ import com.intellij.openapi.ui.DialogWrapper
import com.intellij.openapi.util.NlsContexts
import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.PsiFile
import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
import org.jetbrains.kotlin.idea.util.application.isUnitTestMode
import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtFile
@@ -29,10 +30,11 @@ abstract class AbstractGenerateMembersHandler<T : ClassMember> : LanguageCodeIns
fun collectMembersToGenerateUnderProgress(classOrObject: KtClassOrObject): Collection<T> {
return ProgressManager.getInstance().runProcessWithProgressSynchronously<Collection<T>, RuntimeException>(
{ runReadAction { collectMembersToGenerate(classOrObject) } },
JavaAnalysisBundle.message("dialog.progress.collect.members.to.generate"), true, classOrObject.project
KotlinBundle.message("dialog.progress.collect.members.to.generate"), true, classOrObject.project
)
}
@RequiresBackgroundThread(generateAssertion = false)
abstract fun collectMembersToGenerate(classOrObject: KtClassOrObject): Collection<T>
abstract fun generateMembers(editor: Editor, classOrObject: KtClassOrObject, selectedElements: Collection<T>, copyDoc: Boolean)