fix(intellij): resolve issue with initialization getting stuck due to…

… an editor with null virtualFile. (#2658)
TabbyML · Jul 16, 2024 · 269844e · 269844e
1 parent f761e85
commit 269844e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/clients/intellij/build.gradle.kts b/clients/intellij/build.gradle.kts
@@ -35,7 +35,7 @@ tasks {
   }
 
   patchPluginXml {
-    sinceBuild.set("231.*")
+    sinceBuild.set("231")
     untilBuild.set("241.*")
     changeNotes.set(provider {
       changelog.renderItem(

diff --git a/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/lsp/TextDocumentSync.kt b/clients/intellij/src/main/kotlin/com/tabbyml/intellijtabby/lsp/TextDocumentSync.kt
@@ -48,11 +48,12 @@ class TextDocumentSync(private val project: Project) : Disposable {
 
   companion object {
     fun buildDidOpenTextDocumentParams(editor: Editor): DidOpenTextDocumentParams? {
+      val virtualFile = editor.virtualFile ?: return null
       val psiManager = editor.project?.let { PsiManager.getInstance(it) } ?: return null
       return DidOpenTextDocumentParams(
         TextDocumentItem(
-          editor.virtualFile.url,
-          editor.virtualFile.let { psiManager.findFileWithReadLock(it) }?.getLanguageId() ?: "plaintext",
+          virtualFile.url,
+          virtualFile.let { psiManager.findFileWithReadLock(it) }?.getLanguageId() ?: "plaintext",
           editor.document.modificationStamp.toInt(),
           editor.document.text,
         )