Skip to content

Commit 870aef2

Browse files
sestinjsestinj
committed
temporarily remove deprecated API usages
1 parent afe6204 commit 870aef2

File tree

3 files changed

+37
-45
lines changed

3 files changed

+37
-45
lines changed

‎extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/continue/IdeProtocolClient.kt

+36-38
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,13 @@ import com.github.continuedev.continueintellijextension.services.ContinuePluginS
1010
import com.google.gson.Gson
1111
import com.google.gson.GsonBuilder
1212
import com.google.gson.reflect.TypeToken
13-
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
14-
import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl
15-
import com.intellij.codeInsight.daemon.impl.HighlightInfo
1613
import com.intellij.execution.configurations.GeneralCommandLine
1714
import com.intellij.execution.util.ExecUtil
1815
import com.intellij.ide.plugins.PluginManager
1916
import com.intellij.ide.plugins.PluginManagerCore
20-
import com.intellij.lang.annotation.HighlightSeverity
2117
import com.intellij.openapi.Disposable
2218
import com.intellij.openapi.application.ApplicationInfo
2319
import com.intellij.openapi.application.ApplicationManager
24-
import com.intellij.openapi.application.ReadAction
2520
import com.intellij.openapi.command.WriteCommandAction
2621
import com.intellij.openapi.components.ServiceManager
2722
import com.intellij.openapi.components.service
@@ -32,7 +27,6 @@ import com.intellij.openapi.extensions.PluginId
3227
import com.intellij.openapi.fileEditor.FileDocumentManager
3328
import com.intellij.openapi.fileEditor.FileEditorManager
3429
import com.intellij.openapi.fileEditor.TextEditor
35-
import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl
3630
import com.intellij.openapi.project.DumbAware
3731
import com.intellij.openapi.project.Project
3832
import com.intellij.openapi.ui.MessageType
@@ -42,7 +36,6 @@ import com.intellij.openapi.vfs.*
4236
import com.intellij.openapi.vfs.newvfs.events.VFileEvent
4337
import com.intellij.openapi.wm.WindowManager
4438
import com.intellij.psi.PsiDocumentManager
45-
import com.intellij.terminal.TerminalUtils
4639
import com.intellij.testFramework.LightVirtualFile
4740
import com.intellij.ui.awt.RelativePoint
4841
import com.intellij.util.concurrency.annotations.RequiresEdt
@@ -543,35 +536,38 @@ class IdeProtocolClient (
543536
val document: Document = editor!!.document
544537
val psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document) ?: return@launch
545538

546-
val analyzer = DaemonCodeAnalyzer.getInstance(project) as DaemonCodeAnalyzerImpl
547-
val highlightInfos = ReadAction.compute<MutableList<HighlightInfo>, Throwable> {
548-
analyzer.getFileLevelHighlights(project, psiFile)
549-
}
550-
551539
val problems = ArrayList<Map<String, Any?>>()
552-
for (highlightInfo in highlightInfos) {
553-
if (highlightInfo.severity === HighlightSeverity.ERROR ||
554-
highlightInfo.severity === HighlightSeverity.WARNING) {
555-
val startOffset = highlightInfo.getStartOffset()
556-
val endOffset = highlightInfo.getEndOffset()
557-
val description = highlightInfo.description
558-
problems.add(mapOf(
559-
"filepath" to psiFile.virtualFile?.path,
560-
"range" to mapOf(
561-
"start" to mapOf(
562-
"line" to document.getLineNumber(startOffset),
563-
"character" to startOffset - document.getLineStartOffset(document.getLineNumber(startOffset))
564-
),
565-
"end" to mapOf(
566-
"line" to document.getLineNumber(endOffset),
567-
"character" to endOffset - document.getLineStartOffset(document.getLineNumber(endOffset))
568-
)
569-
),
570-
"message" to description
571-
))
572-
}
573-
}
574540
respond(problems)
541+
542+
// DaemonCodeAnalyzerImpl has been made internal, which means we cannot access this
543+
// val analyzer = DaemonCodeAnalyzer.getInstance(project) as DaemonCodeAnalyzerImpl
544+
// val highlightInfos = ReadAction.compute<MutableList<HighlightInfo>, Throwable> {
545+
// analyzer.getFileLevelHighlights(project, psiFile)
546+
// }
547+
//
548+
// for (highlightInfo in highlightInfos) {
549+
// if (highlightInfo.severity === HighlightSeverity.ERROR ||
550+
// highlightInfo.severity === HighlightSeverity.WARNING) {
551+
// val startOffset = highlightInfo.getStartOffset()
552+
// val endOffset = highlightInfo.getEndOffset()
553+
// val description = highlightInfo.description
554+
// problems.add(mapOf(
555+
// "filepath" to psiFile.virtualFile?.path,
556+
// "range" to mapOf(
557+
// "start" to mapOf(
558+
// "line" to document.getLineNumber(startOffset),
559+
// "character" to startOffset - document.getLineStartOffset(document.getLineNumber(startOffset))
560+
// ),
561+
// "end" to mapOf(
562+
// "line" to document.getLineNumber(endOffset),
563+
// "character" to endOffset - document.getLineStartOffset(document.getLineNumber(endOffset))
564+
// )
565+
// ),
566+
// "message" to description
567+
// ))
568+
// }
569+
// }
570+
// respond(problems)
575571
}
576572
"getConfigJsUrl" -> {
577573
// Calculate a data URL for the config.js file
@@ -975,10 +971,12 @@ class IdeProtocolClient (
975971

976972
@RequiresEdt
977973
private fun pinnedFiles(): List<String> {
978-
val fileEditorManager = FileEditorManager.getInstance(project) as? FileEditorManagerImpl ?: return listOf()
979-
val openFiles = fileEditorManager.openFiles.map { it.path }.toList()
980-
val pinnedFiles = fileEditorManager.windows.flatMap { window -> window.files.filter { window.isFilePinned(it) } }.map { it.path }.toSet()
981-
return openFiles.intersect(pinnedFiles).toList()
974+
// Caused incompatibility issue with JetBrains new release
975+
return visibleFiles()
976+
// val fileEditorManager = FileEditorManager.getInstance(project) as? FileEditorManagerImpl ?: return listOf() // FileEditorManagerImpl should be the type, but this was marked as internal
977+
// val openFiles = fileEditorManager.openFiles.map { it.path }.toList()
978+
// val pinnedFiles = fileEditorManager.windows.flatMap { window -> window.files.filter { window.isFilePinned(it) } }.map { it.path }.toSet()
979+
// return openFiles.intersect(pinnedFiles).toList()
982980
}
983981

984982
private fun currentFile(): String? {

‎extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/utils/Utils.kt

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.github.continuedev.continueintellijextension.utils
22

3-
import org.jetbrains.plugins.terminal.TerminalView
4-
53
enum class Os {
64
MAC, WINDOWS, LINUX
75
}
@@ -31,7 +29,4 @@ fun getAltKeyLabel(): String {
3129
Os.WINDOWS -> "Alt"
3230
Os.LINUX -> "Alt"
3331
}
34-
}
35-
36-
fun TerminalView.isNotAvailable(): Boolean =
37-
toolWindow == null || !toolWindow.isVisible || !toolWindow.isAvailable || toolWindow.isDisposed
32+
}

‎extensions/intellij/src/main/resources/META-INF/plugin.xml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<name>Continue</name>
55
<vendor>continue-dev</vendor>
66
<depends>com.intellij.modules.platform</depends>
7-
<depends>org.jetbrains.plugins.terminal</depends>
87
<depends>com.intellij.modules.json</depends>
98
<idea-version since-build="223.0"/>
109

0 commit comments

Comments
 (0)