Clean up of plugin-common.xml and convert components to services

2020-03-27 07:54:14 +00:00
parent 87006036be
commit 674f1d129f
41 changed files with 2027 additions and 4151 deletions
@@ -126,7 +126,7 @@ class BasicCompletionSession(

        if (parameters.isAutoPopup) {
            collector.addLookupElementPostProcessor { lookupElement ->
-                lookupElement.putUserData(LookupCancelWatcher.AUTO_POPUP_AT, position.startOffset)
+                lookupElement.putUserData(LookupCancelService.AUTO_POPUP_AT, position.startOffset)
                lookupElement
            }

@@ -533,7 +533,7 @@ class BasicCompletionSession(
    }

    private fun wasAutopopupRecentlyCancelled(parameters: CompletionParameters) =
-        LookupCancelWatcher.getInstance(project).wasAutoPopupRecentlyCancelled(parameters.editor, position.startOffset)
+        LookupCancelService.getInstance(project).wasAutoPopupRecentlyCancelled(parameters.editor, position.startOffset)

    private val KEYWORDS_ONLY = object : CompletionKind {
        override val descriptorKindFilter: DescriptorKindFilter?
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.idea.analysis.analyzeInContext
 import org.jetbrains.kotlin.idea.caches.trackers.KotlinCodeBlockModificationListener
 import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
+import org.jetbrains.kotlin.idea.util.application.getServiceSafe
 import org.jetbrains.kotlin.idea.util.getResolutionScope
 import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtElement
@@ -46,7 +47,7 @@ class CompletionBindingContextProvider(project: Project) {

    companion object {
        fun getInstance(project: Project): CompletionBindingContextProvider =
-            project.getComponent(CompletionBindingContextProvider::class.java)
+            project.getServiceSafe(CompletionBindingContextProvider::class.java)

        var ENABLED = true
    }
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.completion
+
+import com.intellij.codeInsight.lookup.LookupEvent
+import com.intellij.codeInsight.lookup.LookupListener
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.RangeMarker
+import com.intellij.openapi.editor.event.CaretEvent
+import com.intellij.openapi.editor.event.CaretListener
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Key
+import org.jetbrains.kotlin.idea.util.application.getServiceSafe
+
+class LookupCancelService {
+    internal class Reminiscence(editor: Editor, offset: Int) {
+        var editor: Editor? = editor
+        private var marker: RangeMarker? = editor.document.createRangeMarker(offset, offset)
+
+        // forget about auto-popup cancellation when the caret is moved to the start or before it
+        private var editorListener: CaretListener? = object : CaretListener {
+            override fun caretPositionChanged(e: CaretEvent) {
+                if (!marker!!.isValid || editor.logicalPositionToOffset(e.newPosition) <= offset) {
+                    dispose()
+                }
+            }
+        }
+
+        init {
+            ApplicationManager.getApplication()!!.assertIsDispatchThread()
+            editor.caretModel.addCaretListener(editorListener!!)
+        }
+
+        fun matches(editor: Editor, offset: Int): Boolean {
+            return editor == this.editor && marker?.startOffset == offset
+        }
+
+        fun dispose() {
+            ApplicationManager.getApplication()!!.assertIsDispatchThread()
+            if (marker != null) {
+                editor!!.caretModel.removeCaretListener(editorListener!!)
+                marker = null
+                editor = null
+                editorListener = null
+            }
+        }
+    }
+
+    internal val lookupCancelListener = object : LookupListener {
+        override fun lookupCanceled(event: LookupEvent) {
+            val lookup = event.lookup
+            if (event.isCanceledExplicitly && lookup.isCompletion) {
+                val offset = lookup.currentItem?.getUserData(LookupCancelService.AUTO_POPUP_AT)
+                if (offset != null) {
+                    lastReminiscence?.dispose()
+                    if (offset <= lookup.editor.document.textLength) {
+                        lastReminiscence = Reminiscence(lookup.editor, offset)
+                    }
+                }
+            }
+        }
+    }
+
+    internal fun disposeLastReminiscence(editor: Editor) {
+        if (lastReminiscence?.editor == editor) {
+            lastReminiscence!!.dispose()
+            lastReminiscence = null
+        }
+    }
+
+    private var lastReminiscence: Reminiscence? = null
+
+    companion object {
+        fun getInstance(project: Project): LookupCancelService = project.getServiceSafe(LookupCancelService::class.java)
+
+        fun getServiceIfCreated(project: Project): LookupCancelService? = project.getServiceIfCreated(LookupCancelService::class.java)
+
+        val AUTO_POPUP_AT = Key<Int>("LookupCancelService.AUTO_POPUP_AT")
+    }
+
+    fun wasAutoPopupRecentlyCancelled(editor: Editor, offset: Int): Boolean {
+        return lastReminiscence?.matches(editor, offset) ?: false
+    }
+
+}
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.completion
+
+typealias LookupCancelService = LookupCancelWatcher
@@ -22,83 +22,18 @@ import com.intellij.codeInsight.lookup.Lookup
 import com.intellij.codeInsight.lookup.LookupEvent
 import com.intellij.codeInsight.lookup.LookupListener
 import com.intellij.codeInsight.lookup.LookupManager
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.components.ProjectComponent
-import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.EditorFactory
-import com.intellij.openapi.editor.RangeMarker
-import com.intellij.openapi.editor.event.CaretEvent
-import com.intellij.openapi.editor.event.CaretListener
 import com.intellij.openapi.editor.event.EditorFactoryEvent
 import com.intellij.openapi.editor.event.EditorFactoryListener
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.Key
+import com.intellij.openapi.startup.StartupActivity
 import org.jetbrains.kotlin.idea.statistics.CompletionFUSCollector
 import org.jetbrains.kotlin.idea.statistics.CompletionFUSCollector.completionStatsData
 import org.jetbrains.kotlin.idea.statistics.FinishReasonStats

-class LookupCancelWatcher(val project: Project) : ProjectComponent {
-    private class Reminiscence(editor: Editor, offset: Int) {
-        var editor: Editor? = editor
-        private var marker: RangeMarker? = editor.document.createRangeMarker(offset, offset)
+class LookupCancelWatcher : StartupActivity {

-        // forget about auto-popup cancellation when the caret is moved to the start or before it
-        private var editorListener: CaretListener? = object : CaretListener {
-            override fun caretPositionChanged(e: CaretEvent) {
-                if (!marker!!.isValid || editor.logicalPositionToOffset(e.newPosition) <= offset) {
-                    dispose()
-                }
-            }
-        }
-
-        init {
-            ApplicationManager.getApplication()!!.assertIsDispatchThread()
-            editor.caretModel.addCaretListener(editorListener!!)
-        }
-
-        fun matches(editor: Editor, offset: Int): Boolean {
-            return editor == this.editor && marker?.startOffset == offset
-        }
-
-        fun dispose() {
-            ApplicationManager.getApplication()!!.assertIsDispatchThread()
-            if (marker != null) {
-                editor!!.caretModel.removeCaretListener(editorListener!!)
-                marker = null
-                editor = null
-                editorListener = null
-            }
-        }
-    }
-
-    private var lastReminiscence: Reminiscence? = null
-
-    companion object {
-        fun getInstance(project: Project): LookupCancelWatcher = project.getComponent(LookupCancelWatcher::class.java)!!
-
-        val AUTO_POPUP_AT = Key<Int>("LookupCancelWatcher.AUTO_POPUP_AT")
-    }
-
-    fun wasAutoPopupRecentlyCancelled(editor: Editor, offset: Int): Boolean {
-        return lastReminiscence?.matches(editor, offset) ?: false
-    }
-
-    private val lookupCancelListener = object : LookupListener {
-        override fun lookupCanceled(event: LookupEvent) {
-            val lookup = event.lookup
-            if (event.isCanceledExplicitly && lookup.isCompletion) {
-                val offset = lookup.currentItem?.getUserData(AUTO_POPUP_AT)
-                if (offset != null) {
-                    lastReminiscence?.dispose()
-                    if (offset <= lookup.editor.document.textLength) {
-                        lastReminiscence = Reminiscence(lookup.editor, offset)
-                    }
-                }
-            }
-        }
-    }
-
-    override fun initComponent() {
+    override fun runActivity(project: Project) {
        CompletionPhaseListener.TOPIC.subscribe(project, CompletionPhaseListener { isCompletionRunning ->
            if (isCompletionRunning) {
                if (completionStatsData != null) {
@@ -117,9 +52,7 @@ class LookupCancelWatcher(val project: Project) : ProjectComponent {
        EditorFactory.getInstance().addEditorFactoryListener(
            object : EditorFactoryListener {
                override fun editorReleased(event: EditorFactoryEvent) {
-                    if (lastReminiscence?.editor == event.editor) {
-                        lastReminiscence!!.dispose()
-                    }
+                    LookupCancelService.getServiceIfCreated(project)?.disposeLastReminiscence(event.editor)
                }
            },
            project
@@ -128,7 +61,7 @@ class LookupCancelWatcher(val project: Project) : ProjectComponent {
        LookupManager.getInstance(project).addPropertyChangeListener { event ->
            if (event.propertyName == LookupManager.PROP_ACTIVE_LOOKUP) {
                val lookup = event.newValue as Lookup?
-                lookup?.addLookupListener(lookupCancelListener)
+                lookup?.addLookupListener(LookupCancelService.getInstance(project).lookupCancelListener)
                lookup?.addLookupListener(object : LookupListener {
                    override fun lookupShown(event: LookupEvent) {
                        completionStatsData = completionStatsData?.copy(shownTime = System.currentTimeMillis())
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.completion
+
+import com.intellij.application.subscribe
+import com.intellij.codeInsight.completion.CompletionPhaseListener
+import com.intellij.codeInsight.lookup.Lookup
+import com.intellij.codeInsight.lookup.LookupEvent
+import com.intellij.codeInsight.lookup.LookupListener
+import com.intellij.codeInsight.lookup.LookupManager
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.components.ProjectComponent
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.EditorFactory
+import com.intellij.openapi.editor.RangeMarker
+import com.intellij.openapi.editor.event.CaretEvent
+import com.intellij.openapi.editor.event.CaretListener
+import com.intellij.openapi.editor.event.EditorFactoryEvent
+import com.intellij.openapi.editor.event.EditorFactoryListener
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Key
+import org.jetbrains.kotlin.idea.statistics.CompletionFUSCollector
+import org.jetbrains.kotlin.idea.statistics.CompletionFUSCollector.completionStatsData
+import org.jetbrains.kotlin.idea.statistics.FinishReasonStats
+
+class LookupCancelWatcher(val project: Project) : ProjectComponent {
+    private class Reminiscence(editor: Editor, offset: Int) {
+        var editor: Editor? = editor
+        private var marker: RangeMarker? = editor.document.createRangeMarker(offset, offset)
+
+        // forget about auto-popup cancellation when the caret is moved to the start or before it
+        private var editorListener: CaretListener? = object : CaretListener {
+            override fun caretPositionChanged(e: CaretEvent) {
+                if (!marker!!.isValid || editor.logicalPositionToOffset(e.newPosition) <= offset) {
+                    dispose()
+                }
+            }
+        }
+
+        init {
+            ApplicationManager.getApplication()!!.assertIsDispatchThread()
+            editor.caretModel.addCaretListener(editorListener!!)
+        }
+
+        fun matches(editor: Editor, offset: Int): Boolean {
+            return editor == this.editor && marker?.startOffset == offset
+        }
+
+        fun dispose() {
+            ApplicationManager.getApplication()!!.assertIsDispatchThread()
+            if (marker != null) {
+                editor!!.caretModel.removeCaretListener(editorListener!!)
+                marker = null
+                editor = null
+                editorListener = null
+            }
+        }
+    }
+
+    private var lastReminiscence: Reminiscence? = null
+
+    companion object {
+        fun getInstance(project: Project): LookupCancelWatcher = project.getComponent(LookupCancelWatcher::class.java)!!
+
+        val AUTO_POPUP_AT = Key<Int>("LookupCancelWatcher.AUTO_POPUP_AT")
+    }
+
+    fun wasAutoPopupRecentlyCancelled(editor: Editor, offset: Int): Boolean {
+        return lastReminiscence?.matches(editor, offset) ?: false
+    }
+
+    private val lookupCancelListener = object : LookupListener {
+        override fun lookupCanceled(event: LookupEvent) {
+            val lookup = event.lookup
+            if (event.isCanceledExplicitly && lookup.isCompletion) {
+                val offset = lookup.currentItem?.getUserData(AUTO_POPUP_AT)
+                if (offset != null) {
+                    lastReminiscence?.dispose()
+                    if (offset <= lookup.editor.document.textLength) {
+                        lastReminiscence = Reminiscence(lookup.editor, offset)
+                    }
+                }
+            }
+        }
+    }
+
+    override fun initComponent() {
+        CompletionPhaseListener.TOPIC.subscribe(project, CompletionPhaseListener { isCompletionRunning ->
+            if (isCompletionRunning) {
+                if (completionStatsData != null) {
+                    completionStatsData = completionStatsData?.copy(finishReason = FinishReasonStats.INTERRUPTED)
+                    CompletionFUSCollector.log(completionStatsData)
+                    completionStatsData = null
+                }
+                completionStatsData = CompletionFUSCollector.CompletionStatsData(System.currentTimeMillis())
+            }
+
+            if (!isCompletionRunning) {
+                completionStatsData = completionStatsData?.copy(finishTime = System.currentTimeMillis())
+            }
+        })
+
+        EditorFactory.getInstance().addEditorFactoryListener(
+            object : EditorFactoryListener {
+                override fun editorReleased(event: EditorFactoryEvent) {
+                    if (lastReminiscence?.editor == event.editor) {
+                        lastReminiscence!!.dispose()
+                    }
+                }
+            },
+            project
+        )
+
+        LookupManager.getInstance(project).addPropertyChangeListener { event ->
+            if (event.propertyName == LookupManager.PROP_ACTIVE_LOOKUP) {
+                val lookup = event.newValue as Lookup?
+                lookup?.addLookupListener(lookupCancelListener)
+                lookup?.addLookupListener(object : LookupListener {
+                    override fun lookupShown(event: LookupEvent) {
+                        completionStatsData = completionStatsData?.copy(shownTime = System.currentTimeMillis())
+                    }
+
+                    override fun lookupCanceled(event: LookupEvent) {
+                        completionStatsData = completionStatsData?.copy(
+                            finishReason = if (event.isCanceledExplicitly) FinishReasonStats.CANCELLED else FinishReasonStats.HIDDEN
+                        )
+                        CompletionFUSCollector.log(completionStatsData)
+                        completionStatsData = null
+                    }
+
+                    override fun itemSelected(event: LookupEvent) {
+                        val eventLookup = event.lookup
+                        val lookupIndex = eventLookup.items.indexOf(eventLookup.currentItem)
+                        if (lookupIndex >= 0) completionStatsData = completionStatsData?.copy(selectedItem = lookupIndex)
+
+                        completionStatsData = completionStatsData?.copy(finishReason = FinishReasonStats.DONE)
+                        CompletionFUSCollector.log(completionStatsData)
+                        completionStatsData = null
+                    }
+                })
+            }
+        }
+    }
+}