Skip to content

Commit dcbbbad

Browse files
author
dmitry.naydanov
committed
Workaround for getLibraryTable returning null #SCL-11839 fixed
1 parent 9a7db7d commit dcbbbad

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/org/jetbrains/plugins/scala/components/libinjection/LibraryInjectorLoader.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import com.intellij.openapi.module._
1414
import com.intellij.openapi.progress.ProgressManager
1515
import com.intellij.openapi.progress.util.ProgressIndicatorBase
1616
import com.intellij.openapi.project.{DumbService, Project}
17-
import com.intellij.openapi.roots.libraries.{Library, LibraryTable, LibraryTablesRegistrar}
17+
import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable
18+
import com.intellij.openapi.roots.libraries.{Library, LibraryTable}
1819
import com.intellij.openapi.util.io.FileUtil
1920
import com.intellij.openapi.vfs.{JarFileSystem, VirtualFile, VirtualFileManager}
2021
import com.intellij.psi.search.{FilenameIndex, GlobalSearchScope}
@@ -154,11 +155,11 @@ class LibraryInjectorLoader(val project: Project) extends ProjectComponent {
154155

155156
override def initComponent(): Unit = {
156157
myInjectorCacheDir.mkdirs()
157-
LibraryTablesRegistrar.getInstance().getLibraryTable(project).addListener(myLibraryTableListener)
158+
Option(ProjectLibraryTable.getInstance(project)).foreach(_.addListener(myLibraryTableListener))
158159
}
159160

160161
override def disposeComponent(): Unit = {
161-
LibraryTablesRegistrar.getInstance().getLibraryTable(project).removeListener(myLibraryTableListener)
162+
Option(ProjectLibraryTable.getInstance(project)).foreach(_.removeListener(myLibraryTableListener))
162163
}
163164

164165
override def getComponentName: String = "ScalaLibraryInjectorLoader"

0 commit comments

Comments
 (0)