MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-13 15:52:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: fix nullability of parameters in implementations of FileVisitor interface

Browse Source 
To get rid of warning and simplify code.

GitOrigin-RevId: 078482d10e9a8025d50d3758ae1ec56e03648e82
This commit is contained in:
Nikolay Chashnikov
2025-06-11 13:27:31 +02:00
committed by intellij-monorepo-bot
parent 0b38e9010e
commit 16b08c787a
8 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/mappings/generateMappings.kt
View File

@@ -5,11 +5,24 @@ import org.jetbrains.intellij.build.images.IconsClassGenerator
import org.jetbrains.intellij.build.images.IntellijIconClassGeneratorConfig
import org.jetbrains.intellij.build.images.isImage
import org.jetbrains.intellij.build.images.shutdownAppScheduledExecutorService
import org.jetbrains.intellij.build.images.sync.*
import org.jetbrains.intellij.build.images.sync.Context
import org.jetbrains.intellij.build.images.sync.GIT
import org.jetbrains.intellij.build.images.sync.Icon
import org.jetbrains.intellij.build.images.sync.commitAndPush
import org.jetbrains.intellij.build.images.sync.execute
import org.jetbrains.intellij.build.images.sync.findGitRepoRoot
import org.jetbrains.intellij.build.images.sync.isAncestorOf
import org.jetbrains.intellij.build.images.sync.jpsProject
import org.jetbrains.intellij.build.images.sync.protectStdErr
import org.jetbrains.intellij.build.images.sync.stageFiles
import org.jetbrains.jps.util.JpsPathUtil
import java.nio.file.*
import java.nio.file.FileVisitResult
import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths
import java.nio.file.SimpleFileVisitor
import java.nio.file.attribute.BasicFileAttributes
import java.util.*
import java.util.TreeMap
import kotlin.io.path.exists
import kotlin.io.path.name
@@ -148,7 +161,7 @@ private fun loadNonGeneratedIcons(): Sequence<Mapping> {
val toSkip = iconRepo.resolve("idea")
val iconsRoots = mutableSetOf<Path>()
Files.walkFileTree(iconRepo, object : SimpleFileVisitor<Path>() {
override fun preVisitDirectory(dir: Path, attrs: BasicFileAttributes): FileVisitResult? {
override fun preVisitDirectory(dir: Path, attrs: BasicFileAttributes): FileVisitResult {
return if (dir.startsWith(toSkip) || dir.name == ".git") {
FileVisitResult.SKIP_SUBTREE
}

9
platform/build-scripts/src/org/jetbrains/intellij/build/FileSet.kt
View File

@@ -7,7 +7,12 @@ import com.intellij.openapi.util.io.FileUtil
import io.opentelemetry.api.common.AttributeKey
import io.opentelemetry.api.common.Attributes
import io.opentelemetry.api.trace.Span
import java.nio.file.*
import java.nio.file.FileVisitResult
import java.nio.file.Files
import java.nio.file.LinkOption
import java.nio.file.Path
import java.nio.file.SimpleFileVisitor
import java.nio.file.StandardCopyOption
import java.nio.file.attribute.BasicFileAttributes
import kotlin.io.path.invariantSeparatorsPathString
@@ -69,7 +74,7 @@ class FileSet(private val root: Path) {
val usedExcludePatterns = HashSet<String>()
val result = ArrayList<Path>()
Files.walkFileTree(root, object : SimpleFileVisitor<Path>() {
override fun visitFile(file: Path, attrs: BasicFileAttributes?): FileVisitResult {
override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
val relative = root.relativize(file)
var included = false

2
platform/platform-impl/src/com/intellij/openapi/project/impl/shared/SharedConfigFolderNioListener.kt
View File

@@ -141,7 +141,7 @@ internal class SharedConfigFolderNioListener(private val root: Path) {
return FileVisitResult.CONTINUE
}
override fun visitFile(file: Path, attrs: BasicFileAttributes?): FileVisitResult {
override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
task(file, false)
return FileVisitResult.CONTINUE
}

2
platform/platform-impl/src/com/intellij/openapi/project/impl/shared/SharedConfigFolderStreamProvider.kt
View File

@@ -51,7 +51,7 @@ internal class SharedConfigFolderStreamProvider(private val root: Path) : Stream
if (!file.exists()) return true
Files.walkFileTree(file, object : SimpleFileVisitor<Path>() {
override fun visitFile(child: Path, attrs: BasicFileAttributes?): FileVisitResult {
override fun visitFile(child: Path, attrs: BasicFileAttributes): FileVisitResult {
if (!filter(child.name)) return FileVisitResult.CONTINUE
if (!checkFile(child)) return FileVisitResult.CONTINUE

4
platform/settings-sync-core/src/com/intellij/settingsSync/core/migration/SettingsRepositoryToSettingsSyncMigration.kt
View File

@@ -15,8 +15,6 @@ import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.extensions.PluginId
import com.intellij.openapi.util.io.FileUtil
import com.intellij.settingsSync.core.*
import com.intellij.settingsSync.core.NOTIFICATION_GROUP
import com.intellij.settingsSync.core.SettingsSyncIdeMediatorImpl
import com.intellij.settingsSync.core.plugins.PluginManagerProxy
import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics
import com.intellij.settingsSync.core.statistics.SettingsSyncEventsStatistics.SettingsRepositoryMigrationNotificationAction.INSTALL_SETTINGS_REPOSITORY
@@ -84,7 +82,7 @@ internal class SettingsRepositoryToSettingsSyncMigration {
val prefix = OS_PREFIXES.find { topLevelFile.name.startsWith(it.first) }
if (!SPECIAL_FILES.contains(topLevelFile.name)) {
Files.walkFileTree(topLevelFile, object : SimpleFileVisitor<Path>() {
override fun visitFile(file: Path, attrs: BasicFileAttributes?): FileVisitResult {
override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
if (!file.isRegularFile()) return FileVisitResult.CONTINUE
val relative = settingsRepositoryConfigPath.relativize(file).invariantSeparatorsPathString

2
platform/wsl-impl/src/com/intellij/execution/wsl/sync/WindowsFileStorage.kt
View File

@@ -38,7 +38,7 @@ private class MyFileVisitor(private val filters: WslHashFilters,
val dirLinks: Map<FilePathRelativeToDir, FilePathRelativeToDir> get() = _dirLinks
val stubs: Set<FilePathRelativeToDir> get() = _stubs
override fun postVisitDirectory(dir: Path?, exc: IOException?): FileVisitResult {
override fun postVisitDirectory(dir: Path, exc: IOException?): FileVisitResult {
return super.postVisitDirectory(dir, exc)
}

2
plugins/ide-startup/importSettings/src/com/intellij/ide/startup/importSettings/jb/JbSettingsImporter.kt
View File

@@ -559,7 +559,7 @@ class JbSettingsImporter(private val configDirPath: Path,
if (!folder.exists()) return true
Files.walkFileTree(folder, object : SimpleFileVisitor<Path>() {
override fun visitFile(file: Path, attrs: BasicFileAttributes?): FileVisitResult {
override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
if (!filter(file.name)) return FileVisitResult.CONTINUE
if (!file.isRegularFile()) return FileVisitResult.CONTINUE

2
python/build/src/org/jetbrains/intellij/build/pycharm/PythonCommunityPluginBuilder.kt
View File

@@ -37,7 +37,7 @@ internal class PythonCommunityPluginBuilder(private val home: Path) {
withContext(Dispatchers.IO) {
Files.walkFileTree(buildContext.paths.artifactDir.resolve("${buildContext.applicationInfo.productCode}-plugins"),
object : SimpleFileVisitor<Path>() {
override fun visitFile(file: Path, attrs: BasicFileAttributes?): FileVisitResult {
override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
if (file.toString().endsWith(".zip")) {
builtPlugins.add(file)
}