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

exclude as part of sort

Browse Source 
GitOrigin-RevId: 14f3c71a15e06c7aba59080fbac1e8298278f1f7
This commit is contained in:
Vladimir Krivosheev
2019-05-26 11:04:16 +03:00
committed by intellij-monorepo-bot
parent 32e1c6d46f
commit 3930a4a656
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/src/com/intellij/util/io/FileTreePrinter.kt
+7 -5
View File
@@ -4,7 +4,6 @@ package com.intellij.util.io
import com.intellij.util.containers.nullize
import java.nio.charset.MalformedInputException
import java.nio.file.Path
import java.util.*
@JvmOverloads
fun Path.getDirectoryTree(excluded: Set<String> = emptySet(), printContent: Boolean = true): String {
@@ -14,7 +13,7 @@ fun Path.getDirectoryTree(excluded: Set<String> = emptySet(), printContent: Bool
}
private fun getDirectoryTree(dir: Path, indent: Int, sb: StringBuilder, excluded: Set<String>, printContent: Boolean) {
val fileList = sortedFileList(dir)?.filter { !excluded.contains(it.fileName.toString()) }.nullize() ?: return
val fileList = sortedFileList(dir, excluded).nullize() ?: return
getIndentString(indent, sb)
if (printContent) {
@@ -33,10 +32,13 @@ private fun getDirectoryTree(dir: Path, indent: Int, sb: StringBuilder, excluded
}
}
private fun sortedFileList(dir: Path): List<Path>? {
private fun sortedFileList(dir: Path, excluded: Set<String>?): List<Path>? {
return dir.directoryStreamIfExists { stream ->
val list = ArrayList<Path>()
stream.asSequence().mapTo(list) { it }.sorted()
var sequence = stream.asSequence()
if (!excluded.isNullOrEmpty()) {
sequence = sequence.filter { excluded.contains(it.fileName.toString()) }
}
val list = sequence.toMutableList()
list.sort()
list
}