Skip to content

Commit e2271ae

Browse files
Petr Surkovintellij-monorepo-bot
Petr Surkov
authored andcommitted
Revert "[ai-completion] LLM-14916 Disable completion for 3party provider if editor type is not main"
This reverts commit 10ada20b974002975fdb58cc116305dcc770ee97. GitOrigin-RevId: 28aa79ccb24326a5ad5202049252087a8c50f782
1 parent 92df927 commit e2271ae

File tree

3 files changed

+1
-34
lines changed

3 files changed

+1
-34
lines changed

platform/platform-impl/codeinsight-inline/src/com/intellij/codeInsight/inline/completion/InlineCompletionHandler.kt

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
22
package com.intellij.codeInsight.inline.completion
33

4-
import com.intellij.codeInsight.inline.completion.editor.InlineCompletionEditorType
54
import com.intellij.codeInsight.inline.completion.elements.InlineCompletionElement
65
import com.intellij.codeInsight.inline.completion.listeners.InlineSessionWiseCaretListener
76
import com.intellij.codeInsight.inline.completion.listeners.typing.InlineCompletionDocumentChangesTrackerImpl
@@ -39,20 +38,10 @@ import com.intellij.util.application
3938
import com.intellij.util.concurrency.ThreadingAssertions
4039
import com.intellij.util.concurrency.annotations.RequiresEdt
4140
import com.intellij.util.concurrency.annotations.RequiresWriteLock
42-
import kotlinx.coroutines.CancellationException
43-
import kotlinx.coroutines.CoroutineScope
44-
import kotlinx.coroutines.Dispatchers
45-
import kotlinx.coroutines.NonCancellable
46-
import kotlinx.coroutines.coroutineScope
47-
import kotlinx.coroutines.currentCoroutineContext
48-
import kotlinx.coroutines.ensureActive
41+
import kotlinx.coroutines.*
4942
import kotlinx.coroutines.flow.flowOn
5043
import kotlinx.coroutines.flow.onEmpty
5144
import kotlinx.coroutines.flow.withIndex
52-
import kotlinx.coroutines.isActive
53-
import kotlinx.coroutines.launch
54-
import kotlinx.coroutines.suspendCancellableCoroutine
55-
import kotlinx.coroutines.withContext
5645
import org.jetbrains.annotations.ApiStatus
5746
import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval
5847
import org.jetbrains.annotations.TestOnly
@@ -419,10 +408,6 @@ abstract class InlineCompletionHandler @ApiStatus.Internal constructor(
419408
return false
420409
}
421410
}
422-
val editorType = InlineCompletionEditorType.get(editor)
423-
if (!isEditorTypeSupported(editorType)) {
424-
return false
425-
}
426411
return isEnabled(event)
427412
}
428413

platform/platform-impl/codeinsight-inline/src/com/intellij/codeInsight/inline/completion/InlineCompletionProvider.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
22
package com.intellij.codeInsight.inline.completion
33

4-
import com.intellij.codeInsight.inline.completion.editor.InlineCompletionEditorType
54
import com.intellij.codeInsight.inline.completion.elements.InlineCompletionElement
65
import com.intellij.codeInsight.inline.completion.session.InlineCompletionContext
76
import com.intellij.codeInsight.inline.completion.session.InlineCompletionSession
@@ -11,7 +10,6 @@ import com.intellij.openapi.extensions.ExtensionPointName
1110
import com.intellij.util.concurrency.annotations.RequiresEdt
1211
import kotlinx.coroutines.flow.Flow
1312
import kotlinx.coroutines.flow.debounce
14-
import org.jetbrains.annotations.ApiStatus
1513

1614
/**
1715
* Proposals provider for inline completion.
@@ -59,16 +57,6 @@ interface InlineCompletionProvider {
5957
val providerPresentation: InlineCompletionProviderPresentation
6058
get() = InlineCompletionProviderPresentation.dummy(this)
6159

62-
/**
63-
* Determines whether the provider supports the given editor type.
64-
* By default, only the main editor is supported.
65-
*
66-
* @param editorType The type of the editor to check
67-
* @return True if the provider supports the given editor type, false otherwise
68-
*/
69-
@ApiStatus.Internal
70-
fun isEditorTypeSupported(editorType: InlineCompletionEditorType): Boolean = editorType == InlineCompletionEditorType.MAIN_EDITOR
71-
7260
/**
7361
* Retrieves an inline completion suggestion based on the provided request.
7462
*

platform/platform-impl/codeinsight-inline/src/com/intellij/codeInsight/inline/completion/editor/InlineCompletionEditorType.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
22
package com.intellij.codeInsight.inline.completion.editor
33

4-
import com.intellij.openapi.application.ApplicationManager
54
import com.intellij.openapi.editor.Editor
65
import com.intellij.openapi.editor.ex.util.EditorUtil
76
import com.intellij.openapi.extensions.ExtensionPointName
@@ -27,11 +26,6 @@ enum class InlineCompletionEditorType {
2726
@ApiStatus.Internal
2827
fun get(editor: Editor): InlineCompletionEditorType {
2928
editor.getUserData(forcedInlineCompletionEditorType)?.let { return it }
30-
// Determining the editor type in unit tests is not possible.
31-
// Therefore, MAIN_EDITOR is used if no other editor type is explicitly forced.
32-
if (ApplicationManager.getApplication().isUnitTestMode) {
33-
return MAIN_EDITOR
34-
}
3529
if (EditorUtil.isRealFileEditor(editor)) {
3630
return MAIN_EDITOR
3731
}

0 commit comments

Comments
 (0)