azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix testHighlightingWithDependentLibraries

Browse Source
This commit is contained in:
Nikolay Krasko
2019-12-23 15:40:35 +03:00
parent 03bd80b1ba
commit 3210e1d44c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt
+5 -4
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.idea.caches.resolve package org.jetbrains.kotlin.idea.caches.resolve
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.ModifiableRootModel
import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.roots.OrderRootType
import com.intellij.openapi.roots.libraries.Library import com.intellij.openapi.roots.libraries.Library
@@ -27,12 +28,12 @@ class HighlightingWithDependentLibrariesTest : KotlinLightCodeInsightFixtureTest
val compiledJar2 = val compiledJar2 =
MockLibraryUtil.compileJvmLibraryToJar("$TEST_DATA_PATH/lib2", "lib2", extraClasspath = listOf(compiledJar1.canonicalPath)) MockLibraryUtil.compileJvmLibraryToJar("$TEST_DATA_PATH/lib2", "lib2", extraClasspath = listOf(compiledJar1.canonicalPath))
model.addLibraryEntry(createLibrary(compiledJar1, "baseLibrary")) model.addLibraryEntry(createLibrary(module.project, compiledJar1, "baseLibrary"))
model.addLibraryEntry(createLibrary(compiledJar2, "dependentLibrary")) model.addLibraryEntry(createLibrary(module.project, compiledJar2, "dependentLibrary"))
} }
private fun createLibrary(jarFile: File, name: String): Library { private fun createLibrary(project: Project, jarFile: File, name: String): Library {
val library = LibraryTablesRegistrar.getInstance()!!.getLibraryTable(project).createLibrary(name)!! val library = LibraryTablesRegistrar.getInstance()!!.getLibraryTable(project).createLibrary(name)
val model = library.modifiableModel val model = library.modifiableModel
model.addRoot(VfsUtil.getUrlForLibraryRoot(jarFile), OrderRootType.CLASSES) model.addRoot(VfsUtil.getUrlForLibraryRoot(jarFile), OrderRootType.CLASSES)
model.commit() model.commit()