Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mark the file element as null before invalidating to avoid errors during already existing PSI changes #3082

Merged
merged 1 commit into from
Apr 14, 2022
Merged

Mark the file element as null before invalidating to avoid errors during already existing PSI changes #3082

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions sqldelight-idea-plugin/src/main/kotlin/app/cash/sqldelight/intellij/ProjectService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import app.cash.sqldelight.dialect.api.SqlDelightDialect
import app.cash.sqldelight.dialect.api.TypeResolver
import app.cash.sqldelight.intellij.gradle.FileIndexMap
import app.cash.sqldelight.intellij.util.GeneratedVirtualFile
import com.alecstrong.sql.psi.core.SqlFileBase
import com.alecstrong.sql.psi.core.SqlParserUtil
import com.intellij.icons.AllIcons
import com.intellij.ide.impl.ProjectUtil
Expand Down Expand Up @@ -129,22 +130,29 @@ class ProjectService(val project: Project) : SqlDelightProjectService, Disposabl
Timber.i("Setting dialect from ${this.dialect} to $dialect")
this.dialect = dialect
MigrationParserDefinition.stubVersion++
val files = mutableListOf<VirtualFile>()
ProjectRootManager.getInstance(project).fileIndex.iterateContent { vFile ->
if (vFile.fileType != SqlDelightFileType && vFile.fileType != MigrationFileType) {
return@iterateContent true
}
files += vFile
PsiManager.getInstance(project).findFile(vFile)?.subtreeChanged()
ApplicationManager.getApplication().runReadAction { invalidateAllFiles() }
}
}

private fun invalidateAllFiles() {
val files = mutableListOf<VirtualFile>()
ProjectRootManager.getInstance(project).fileIndex.iterateContent { vFile ->
if (vFile.fileType != SqlDelightFileType && vFile.fileType != MigrationFileType) {
return@iterateContent true
}
Timber.i("Invalidating ${files.size} files")
ApplicationManager.getApplication().invokeLater {
if (project.isDisposed) return@invokeLater
Timber.i("Reparsing ${files.size} files")
(PsiDocumentManager.getInstance(project) as PsiDocumentManagerImpl)
.reparseFiles(files, true)
files += vFile
(PsiManager.getInstance(project).findFile(vFile) as SqlFileBase?)?.apply {
setTreeElementPointer(null)
subtreeChanged()
}
return@iterateContent true
}
Timber.i("Invalidating ${files.size} files")
ApplicationManager.getApplication().invokeLater {
if (project.isDisposed) return@invokeLater
Timber.i("Reparsing ${files.size} files")
(PsiDocumentManager.getInstance(project) as PsiDocumentManagerImpl)
.reparseFiles(files, true)
}
}

Expand Down