MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix use java nio Path

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-04-07 16:50:35 +02:00
parent 4417d22c43
commit 63e4eae92d
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/built-in-server/src/org/jetbrains/builtInWebServer/DefaultWebServerRootsProvider.kt
+3 -4
View File
@@ -60,10 +60,9 @@ private class DefaultWebServerRootsProvider : WebServerRootsProvider() {
runReadAction { ModuleManager.getInstance(project).modules }
.computeOrNull { module ->
if (!module.isDisposed) {
val result = findByRelativePath(path, rootProvider.getRoots(ModuleRootManager.getInstance(module)), resolver, null)
if (result != null) {
result.moduleName = getModuleNameQualifier(project, module)
return result
findByRelativePath(path, rootProvider.getRoots(ModuleRootManager.getInstance(module)), resolver, null)?.let {
it.moduleName = getModuleNameQualifier(project, module)
return it
}
}
null
platform/built-in-server/testSrc/BuiltInWebServerTest.kt
+3 -3
View File
@@ -11,9 +11,9 @@ import com.intellij.util.writeChild
import org.assertj.core.api.Assertions.assertThat
import org.junit.Test
private class BuiltInWebServerTest : BuiltInServerTestCase() {
internal class BuiltInWebServerTest : BuiltInServerTestCase() {
override val urlPathPrefix: String
get() = "/${BuiltInServerTestCase.projectRule.project.name}"
get() = "/${projectRule.project.name}"
@Test
@TestManager.TestDescriptor(filePath = "foo/index.html", doNotCreate = true, status = 200)
@@ -34,7 +34,7 @@ private class BuiltInWebServerTest : BuiltInServerTestCase() {
}
private fun testIndex(vararg paths: String) {
val project = BuiltInServerTestCase.projectRule.project
val project = projectRule.project
val newPath = tempDirManager.newPath()
newPath.writeChild(manager.filePath!!, "hello")
newPath.refreshVfs()
platform/built-in-server/testSrc/RestApiTest.kt
+1 -1
View File
@@ -8,7 +8,7 @@ import org.junit.Test
import java.net.HttpURLConnection
import java.net.URL
private class RestApiTest : BuiltInServerTestCase() {
internal class RestApiTest : BuiltInServerTestCase() {
override val urlPathPrefix = "/api/file"
@Test
platform/platform-impl/src/com/intellij/util/path.kt
+2 -2
View File
@@ -141,7 +141,7 @@ fun Path.refreshVfs() {
inline fun <R> Path.directoryStreamIfExists(task: (stream: DirectoryStream<Path>) -> R): R? {
try {
Files.newDirectoryStream(this).use(task)
return Files.newDirectoryStream(this).use(task)
}
catch (ignored: NoSuchFileException) {
}
@@ -150,7 +150,7 @@ inline fun <R> Path.directoryStreamIfExists(task: (stream: DirectoryStream<Path>
inline fun <R> Path.directoryStreamIfExists(noinline filter: ((path: Path) -> Boolean), task: (stream: DirectoryStream<Path>) -> R): R? {
try {
Files.newDirectoryStream(this, { filter.invoke(it) }).use(task)
return Files.newDirectoryStream(this, { filter.invoke(it) }).use(task)
}
catch (ignored: NoSuchFileException) {
}