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

fixed nullability for various listeners update in 183

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-08-31 17:00:02 +03:00
committed by xiexed
parent d9473c0b6e
commit d415ca9cf6
21 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/src/org/jetbrains/kotlin/android/intention/KotlinAndroidAddStringResource.kt
+8 -3
View File
@@ -18,8 +18,13 @@ package org.jetbrains.kotlin.android.intention
import com.android.resources.ResourceType
import com.intellij.CommonBundle
import com.intellij.codeInsight.template.*
import com.intellij.codeInsight.template.impl.*
import com.intellij.codeInsight.template.Template
import com.intellij.codeInsight.template.TemplateEditingAdapter
import com.intellij.codeInsight.template.TemplateManager
import com.intellij.codeInsight.template.impl.ConstantNode
import com.intellij.codeInsight.template.impl.MacroCallNode
import com.intellij.codeInsight.template.impl.TemplateImpl
import com.intellij.codeInsight.template.impl.TemplateState
import com.intellij.codeInsight.template.macro.VariableOfTypeMacro
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.command.undo.UndoUtil
@@ -167,7 +172,7 @@ class KotlinAndroidAddStringResource : SelfTargetingIntention<KtLiteralStringTem
ShortenReferences.DEFAULT.process(file, marker.startOffset, marker.endOffset)
}
override fun beforeTemplateFinished(state: TemplateState?, template: Template?) {
override fun beforeTemplateFinished(state: TemplateState, template: Template?) {
ShortenReferences.DEFAULT.process(file, marker.startOffset, marker.endOffset)
}
})
idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt
+1 -1
View File
@@ -41,7 +41,7 @@ class KotlinSetupEnvironmentNotificationProvider(
init {
myProject.messageBus.connect(myProject).subscribe(ProjectTopics.PROJECT_ROOTS, object : ModuleRootListener {
override fun rootsChanged(event: ModuleRootEvent?) {
override fun rootsChanged(event: ModuleRootEvent) {
notifications.updateAllNotifications()
}
})
idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerComponent.kt
+1 -1
View File
@@ -49,7 +49,7 @@ class KotlinConfigurationCheckerComponent(project: Project) : AbstractProjectCom
val connection = project.messageBus.connect()
connection.subscribe(ProjectTopics.PROJECT_ROOTS, object : ModuleRootListener {
override fun rootsChanged(event: ModuleRootEvent?) {
override fun rootsChanged(event: ModuleRootEvent) {
if (!project.isInitialized) return
if (notificationPostponed && !isSyncing) {
idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt
+1 -1
View File
@@ -53,7 +53,7 @@ class UnsupportedAbiVersionNotificationPanelProvider(private val project: Projec
init {
val connection = project.messageBus.connect()
connection.subscribe(ProjectTopics.PROJECT_ROOTS, object : ModuleRootListener {
override fun rootsChanged(event: ModuleRootEvent?) {
override fun rootsChanged(event: ModuleRootEvent) {
updateNotifications()
}
})
idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt
+1 -1
View File
@@ -52,7 +52,7 @@ internal class AnonymousTemplateEditingListener(private val psiFile: PsiFile, pr
}
}
override fun templateFinished(template: Template?, brokenOff: Boolean) {
override fun templateFinished(template: Template, brokenOff: Boolean) {
editor.putUserData(LISTENER_KEY, null)
if (brokenOff) return
idea/src/org/jetbrains/kotlin/idea/editor/BatchTemplateRunner.kt
+1 -1
View File
@@ -63,7 +63,7 @@ class BatchTemplateRunner(private val project: Project) {
editor,
template,
object : TemplateEditingAdapter() {
override fun templateFinished(template: Template?, brokenOff: Boolean) {
override fun templateFinished(template: Template, brokenOff: Boolean) {
if (brokenOff) return
ApplicationManager.getApplication().invokeLater { runTemplates(iterator) }
}
idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetSettingsProviderImpl.kt
+1 -1
View File
@@ -36,7 +36,7 @@ class KotlinFacetSettingsProviderImpl(private val project: Project) : KotlinFace
project.messageBus.connect(project).subscribe(
ProjectTopics.PROJECT_ROOTS,
object : ModuleRootListener {
override fun rootsChanged(event: ModuleRootEvent?) {
override fun rootsChanged(event: ModuleRootEvent) {
ModuleManager.getInstance(project).modules.forEach { it.facetSettingsCache = null }
}
}
idea/src/org/jetbrains/kotlin/idea/framework/LibraryEffectiveKindProviderImpl.kt
+1 -1
View File
@@ -23,7 +23,7 @@ class LibraryEffectiveKindProviderImpl(project: Project) : LibraryEffectiveKindP
project.messageBus.connect(project).subscribe(
ProjectTopics.PROJECT_ROOTS,
object : ModuleRootListener {
override fun rootsChanged(event: ModuleRootEvent?) {
override fun rootsChanged(event: ModuleRootEvent) {
synchronized(effectiveKindMap) {
effectiveKindMap.clear()
}
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertCamelCaseTestFunctionToSpacedIntention.kt
+2 -2
View File
@@ -114,13 +114,13 @@ class ConvertCamelCaseTestFunctionToSpacedIntention : SelfTargetingRangeIntentio
private var chosenId: String = newId
private var range: TextRange? = null
override fun beforeTemplateFinished(state: TemplateState?, template: Template?) {
override fun beforeTemplateFinished(state: TemplateState, template: Template?) {
val varName = (template as? TemplateImpl)?.getVariableNameAt(0) ?: return
chosenId = state?.getVariableValue(varName)?.text?.quoteIfNeeded() ?: return
range = state.getVariableRange(varName)
}
override fun templateFinished(template: Template?, brokenOff: Boolean) {
override fun templateFinished(template: Template, brokenOff: Boolean) {
range?.let {
val doc = editor.document
runWriteAction { doc.replaceString(it.startOffset, it.endOffset, oldId) }
idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReceiverToParameterIntention.kt
+1 -1
View File
@@ -96,7 +96,7 @@ class ConvertReceiverToParameterIntention : SelfTargetingOffsetIndependentIntent
}
}
override fun templateFinished(template: Template?, brokenOff: Boolean) {
override fun templateFinished(template: Template, brokenOff: Boolean) {
val newName = addedParameter.name
revertChanges()
if (!brokenOff) {
idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
+1 -1
View File
@@ -201,7 +201,7 @@ class SpecifyTypeExplicitlyIntention : SelfTargetingRangeIntention<KtCallableDec
editor: Editor? = null
): TemplateEditingAdapter {
return object : TemplateEditingAdapter() {
override fun templateFinished(template: Template?, brokenOff: Boolean) {
override fun templateFinished(template: Template, brokenOff: Boolean) {
val typeRef = declaration.typeReference
if (typeRef != null && typeRef.isValid) {
runWriteAction {
idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
+1 -1
View File
@@ -80,7 +80,7 @@ class DoubleBangToIfThenIntention : SelfTargetingRangeIntention<KtPostfixExpress
editor.caretModel.moveToOffset(thrownExpression.node!!.startOffset)
TemplateManager.getInstance(project).startTemplate(editor, builder.buildInlineTemplate(), object: TemplateEditingAdapter() {
override fun templateFinished(template: Template?, brokenOff: Boolean) {
override fun templateFinished(template: Template, brokenOff: Boolean) {
if (!isStable && !isStatement) {
ifStatement.introduceValueForCondition(ifStatement.then!!, editor)
}
idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.kt
+1 -1
View File
@@ -142,7 +142,7 @@ class MapPlatformClassToKotlinFix(
}
TemplateManager.getInstance(project).startTemplate(editor, builder.buildInlineTemplate(), object : TemplateEditingAdapter() {
override fun templateFinished(template: Template?, brokenOff: Boolean) {
override fun templateFinished(template: Template, brokenOff: Boolean) {
caretModel.moveToOffset(oldOffset)
}
})
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+1 -1
View File
@@ -1013,7 +1013,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
finishTemplate(true)
}
override fun templateFinished(template: Template?, brokenOff: Boolean) {
override fun templateFinished(template: Template, brokenOff: Boolean) {
finishTemplate(brokenOff)
}
})
idea/src/org/jetbrains/kotlin/idea/refactoring/elementSelectionUtils.kt
+1 -1
View File
@@ -225,7 +225,7 @@ private fun smartSelectElement(
.setItemChoosenCallback { callback(list.selectedValue as KtElement) }
.addListener(
object : JBPopupAdapter() {
override fun onClosed(event: LightweightWindowEvent?) {
override fun onClosed(event: LightweightWindowEvent) {
highlighter.dropHighlight()
}
}
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ExtractSuperRefactoring.kt
+6 -6
View File
@@ -307,14 +307,14 @@ class ExtractSuperRefactoring(
project.executeWriteCommand(KotlinExtractSuperclassHandler.REFACTORING_NAME) {
val newClass = createClass(superClassEntry) ?: return@executeWriteCommand
val subClass = extractInfo.originalClass.toLightClass()
val superClass = newClass.toLightClass()
val subClass = extractInfo.originalClass.toLightClass() ?: return@executeWriteCommand
val superClass = newClass.toLightClass() ?: return@executeWriteCommand
PullUpProcessor(
subClass,
superClass ?: return@executeWriteCommand,
extractInfo.memberInfos.mapNotNull { it.toJavaMemberInfo() }.toTypedArray(),
extractInfo.docPolicy
subClass,
superClass,
extractInfo.memberInfos.mapNotNull { it.toJavaMemberInfo() }.toTypedArray(),
extractInfo.docPolicy
).moveMembersToBase()
performDelayedRefactoringRequests(project)
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
+1 -1
View File
@@ -450,7 +450,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
FinishMarkAction.finish(project, editor, startMarkAction)
}
override fun templateFinished(template: Template?, brokenOff: Boolean) {
override fun templateFinished(template: Template, brokenOff: Boolean) {
if (!brokenOff) {
postProcess(declaration)
}
idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
+1 -1
View File
@@ -273,7 +273,7 @@ fun <T, E : PsiElement> getPsiElementPopup(
}
}
addListener(object : JBPopupAdapter() {
override fun onClosed(event: LightweightWindowEvent?) {
override fun onClosed(event: LightweightWindowEvent) {
highlighter?.dropHighlight()
}
})
idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt
+2 -2
View File
@@ -72,13 +72,13 @@ class ChangePackageIntention: SelfTargetingOffsetIndependentIntention<KtPackageD
editor,
builder.buildInlineTemplate(),
object: TemplateEditingAdapter() {
override fun beforeTemplateFinished(state: TemplateState?, template: Template?) {
override fun beforeTemplateFinished(state: TemplateState, template: Template?) {
if (state == null) return
enteredName = state.getVariableValue(PACKAGE_NAME_VAR)!!.text
affectedRange = state.getSegmentRange(0)
}
override fun templateFinished(template: Template?, brokenOff: Boolean) {
override fun templateFinished(template: Template, brokenOff: Boolean) {
if (brokenOff || enteredName == null || affectedRange == null) return
// Restore original name and run refactoring
idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt
+5 -4
View File
@@ -162,10 +162,11 @@ class KotlinPullUpDialog(
targetClass: PsiNamedElement,
memberInfos: List<KotlinMemberInfo>): PullUpProcessor {
val targetPsiClass = targetClass as? PsiClass ?: (targetClass as KtClass).toLightClass()
return PullUpProcessor(sourceClass.toLightClass(),
targetPsiClass,
memberInfos.mapNotNull { it.toJavaMemberInfo() }.toTypedArray(),
DocCommentPolicy<PsiComment>(JavaRefactoringSettings.getInstance().PULL_UP_MEMBERS_JAVADOC))
return PullUpProcessor(
sourceClass.toLightClass() ?: error("can't build lightClass for $sourceClass"),
targetPsiClass,
memberInfos.mapNotNull { it.toJavaMemberInfo() }.toTypedArray(),
DocCommentPolicy<PsiComment>(JavaRefactoringSettings.getInstance().PULL_UP_MEMBERS_JAVADOC))
}
}
}
idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt
+1 -1
View File
@@ -35,7 +35,7 @@ class ScriptTemplatesFromDependenciesProvider(private val project: Project) : Sc
init {
val connection = project.messageBus.connect()
connection.subscribe(ProjectTopics.PROJECT_ROOTS, object : ModuleRootListener {
override fun rootsChanged(event: ModuleRootEvent?) {
override fun rootsChanged(event: ModuleRootEvent) {
if (project.isInitialized) {
var templatesChanged = false
lock.read {