From d415ca9cf6332b81da97504d386775c52300aa63 Mon Sep 17 00:00:00 2001
From: Nicolay Mitropolsky <Nicolay.Mitropolsky@jetbrains.com>
Date: Fri, 31 Aug 2018 17:00:02 +0300
Subject: [PATCH] fixed nullability for various listeners update in 183

---
 .../intention/KotlinAndroidAddStringResource.kt      | 11 ++++++++---
 .../KotlinSetupEnvironmentNotificationProvider.kt    |  2 +-
 .../ui/KotlinConfigurationCheckerComponent.kt        |  2 +-
 ...UnsupportedAbiVersionNotificationPanelProvider.kt |  2 +-
 .../macro/AnonymousTemplateEditingListener.kt        |  2 +-
 .../kotlin/idea/editor/BatchTemplateRunner.kt        |  2 +-
 .../idea/facet/KotlinFacetSettingsProviderImpl.kt    |  2 +-
 .../framework/LibraryEffectiveKindProviderImpl.kt    |  2 +-
 .../ConvertCamelCaseTestFunctionToSpacedIntention.kt |  4 ++--
 .../ConvertReceiverToParameterIntention.kt           |  2 +-
 .../intentions/SpecifyTypeExplicitlyIntention.kt     |  2 +-
 .../intentions/DoubleBangToIfThenIntention.kt        |  2 +-
 .../idea/quickfix/MapPlatformClassToKotlinFix.kt     |  2 +-
 .../callableBuilder/CallableBuilder.kt               |  2 +-
 .../kotlin/idea/refactoring/elementSelectionUtils.kt |  2 +-
 .../extractClass/ExtractSuperRefactoring.kt          | 12 ++++++------
 .../KotlinIntroduceVariableHandler.kt                |  2 +-
 .../kotlin/idea/refactoring/kotlinRefactoringUtil.kt |  2 +-
 .../move/changePackage/ChangePackageIntention.kt     |  4 ++--
 .../idea/refactoring/pullUp/KotlinPullUpDialog.kt    |  9 +++++----
 .../idea/script/scriptsTemplatesFromDependencies.kt  |  2 +-
 21 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/intention/KotlinAndroidAddStringResource.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/intention/KotlinAndroidAddStringResource.kt
index 4e1fbb253c4..ee670d8fb77 100644
--- a/idea/idea-android/src/org/jetbrains/kotlin/android/intention/KotlinAndroidAddStringResource.kt
+++ b/idea/idea-android/src/org/jetbrains/kotlin/android/intention/KotlinAndroidAddStringResource.kt
@@ -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)
             }
         })
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt
index 9187c7c5199..798662822ab 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinSetupEnvironmentNotificationProvider.kt
@@ -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()
             }
         })
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerComponent.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerComponent.kt
index 30a57709f10..d3b1aa65dd2 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerComponent.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerComponent.kt
@@ -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) {
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt
index 033923ef317..a037c8c5206 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.kt
@@ -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()
             }
         })
diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt
index f971d8c4243..8d4209eba1e 100644
--- a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt
+++ b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.kt
@@ -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
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/BatchTemplateRunner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/BatchTemplateRunner.kt
index a4d91da65c1..c757cf36444 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/BatchTemplateRunner.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/BatchTemplateRunner.kt
@@ -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) }
                         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetSettingsProviderImpl.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetSettingsProviderImpl.kt
index b46b0d44ca0..61ec449f325 100644
--- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetSettingsProviderImpl.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetSettingsProviderImpl.kt
@@ -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 }
                     }
                 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/LibraryEffectiveKindProviderImpl.kt b/idea/src/org/jetbrains/kotlin/idea/framework/LibraryEffectiveKindProviderImpl.kt
index f77e9e5eb21..ead3a0c692a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/LibraryEffectiveKindProviderImpl.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/LibraryEffectiveKindProviderImpl.kt
@@ -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()
                         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertCamelCaseTestFunctionToSpacedIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertCamelCaseTestFunctionToSpacedIntention.kt
index f8ebffd95a7..288a640836e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertCamelCaseTestFunctionToSpacedIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertCamelCaseTestFunctionToSpacedIntention.kt
@@ -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) }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReceiverToParameterIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReceiverToParameterIntention.kt
index 47769a004bb..037bf0c1262 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReceiverToParameterIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReceiverToParameterIntention.kt
@@ -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) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
index 98180fc8cf3..16753dc047f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
@@ -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 {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
index 230c906872e..d809fdd0414 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
@@ -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)
                 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.kt
index 8f35c4d0a07..fecb35accdb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.kt
@@ -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)
             }
         })
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index dea2a3c33cb..27efec18dfe 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -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)
                 }
             })
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/elementSelectionUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/elementSelectionUtils.kt
index e1c5276fcc2..633eb25dd80 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/elementSelectionUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/elementSelectionUtils.kt
@@ -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()
                         }
                     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ExtractSuperRefactoring.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ExtractSuperRefactoring.kt
index 5914b622498..07df0b9ebc9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ExtractSuperRefactoring.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ExtractSuperRefactoring.kt
@@ -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)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
index 365ea849897..074d578d688 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
@@ -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)
                             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
index bd74ef1fc2a..b018cbf0bed 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
@@ -273,7 +273,7 @@ fun <T, E : PsiElement> getPsiElementPopup(
             }
         }
         addListener(object : JBPopupAdapter() {
-            override fun onClosed(event: LightweightWindowEvent?) {
+            override fun onClosed(event: LightweightWindowEvent) {
                 highlighter?.dropHighlight()
             }
         })
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt
index 40ede6c10da..3abcd30326c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt
@@ -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
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt
index e06e57d2039..a64b17a1db6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt
@@ -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))
         }
     }
 }
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt b/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt
index 72b961e66d9..7e7d2b25856 100644
--- a/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt
@@ -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 {