Replace IoPackage legacy facade with corresponding package parts.
This commit is contained in:
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.cli.common.messages;
|
package org.jetbrains.kotlin.cli.common.messages;
|
||||||
|
|
||||||
import kotlin.io.IoPackage;
|
import kotlin.io.FilesKt;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ public interface MessageRenderer {
|
|||||||
@Override
|
@Override
|
||||||
protected String getPath(@NotNull CompilerMessageLocation location) {
|
protected String getPath(@NotNull CompilerMessageLocation location) {
|
||||||
String path = location.getPath();
|
String path = location.getPath();
|
||||||
return cwd == null || path == null ? path : IoPackage.relativePath(cwd, new File(path));
|
return cwd == null || path == null ? path : FilesKt.relativePath(cwd, new File(path));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ import com.intellij.openapi.vfs.VirtualFileSystem;
|
|||||||
import com.intellij.psi.PsiFile;
|
import com.intellij.psi.PsiFile;
|
||||||
import com.intellij.psi.PsiManager;
|
import com.intellij.psi.PsiManager;
|
||||||
import kotlin.Unit;
|
import kotlin.Unit;
|
||||||
import kotlin.io.IoPackage;
|
import kotlin.io.FilesKt;
|
||||||
import kotlin.jvm.functions.Function1;
|
import kotlin.jvm.functions.Function1;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
@@ -162,7 +162,7 @@ public class CompileEnvironmentUtil {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
IoPackage.recurse(new File(sourceRootPath), new Function1<File, Unit>() {
|
FilesKt.recurse(new File(sourceRootPath), new Function1<File, Unit>() {
|
||||||
@Override
|
@Override
|
||||||
public Unit invoke(File file) {
|
public Unit invoke(File file) {
|
||||||
if (file.isFile()) {
|
if (file.isFile()) {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import com.intellij.util.ArrayUtil;
|
|||||||
import com.intellij.util.Function;
|
import com.intellij.util.Function;
|
||||||
import com.intellij.util.containers.ContainerUtil;
|
import com.intellij.util.containers.ContainerUtil;
|
||||||
import kotlin.Charsets;
|
import kotlin.Charsets;
|
||||||
import kotlin.io.IoPackage;
|
import kotlin.io.FilesKt;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.kotlin.cli.common.CLICompiler;
|
import org.jetbrains.kotlin.cli.common.CLICompiler;
|
||||||
import org.jetbrains.kotlin.cli.common.ExitCode;
|
import org.jetbrains.kotlin.cli.common.ExitCode;
|
||||||
@@ -104,7 +104,7 @@ public class CliBaseTest {
|
|||||||
@NotNull final String testDataDir,
|
@NotNull final String testDataDir,
|
||||||
@NotNull final String tempDir
|
@NotNull final String tempDir
|
||||||
) throws IOException {
|
) throws IOException {
|
||||||
List<String> lines = IoPackage.readLines(new File(argsFilePath), Charsets.UTF_8);
|
List<String> lines = FilesKt.readLines(new File(argsFilePath), Charsets.UTF_8);
|
||||||
|
|
||||||
return ContainerUtil.mapNotNull(lines, new Function<String, String>() {
|
return ContainerUtil.mapNotNull(lines, new Function<String, String>() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+3
-3
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil;
|
|||||||
import com.intellij.util.ArrayUtil;
|
import com.intellij.util.ArrayUtil;
|
||||||
import com.intellij.util.Processor;
|
import com.intellij.util.Processor;
|
||||||
import kotlin.Charsets;
|
import kotlin.Charsets;
|
||||||
import kotlin.io.IoPackage;
|
import kotlin.io.FilesKt;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage;
|
import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage;
|
||||||
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
|
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
|
||||||
@@ -68,7 +68,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
|
|||||||
|
|
||||||
public void doTestWithStdlib(@NotNull String filename) {
|
public void doTestWithStdlib(@NotNull String filename) {
|
||||||
configurationKind = InTextDirectivesUtils.isDirectiveDefined(
|
configurationKind = InTextDirectivesUtils.isDirectiveDefined(
|
||||||
IoPackage.readText(new File(filename), Charsets.UTF_8), "NO_KOTLIN_REFLECT"
|
FilesKt.readText(new File(filename), Charsets.UTF_8), "NO_KOTLIN_REFLECT"
|
||||||
) ? ConfigurationKind.NO_KOTLIN_REFLECT : ConfigurationKind.ALL;
|
) ? ConfigurationKind.NO_KOTLIN_REFLECT : ConfigurationKind.ALL;
|
||||||
|
|
||||||
myEnvironment = JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(
|
myEnvironment = JetTestUtils.createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(
|
||||||
@@ -108,7 +108,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return InTextDirectivesUtils.isDirectiveDefined(
|
return InTextDirectivesUtils.isDirectiveDefined(
|
||||||
IoPackage.readText(new File(sourcePath), Charsets.UTF_8), "FULL_JDK"
|
FilesKt.readText(new File(sourcePath), Charsets.UTF_8), "FULL_JDK"
|
||||||
) ? TestJdkKind.FULL_JDK : TestJdkKind.MOCK_JDK;
|
) ? TestJdkKind.FULL_JDK : TestJdkKind.MOCK_JDK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -22,7 +22,7 @@ import com.intellij.openapi.util.text.StringUtil;
|
|||||||
import com.intellij.util.containers.ContainerUtil;
|
import com.intellij.util.containers.ContainerUtil;
|
||||||
import com.intellij.util.containers.MultiMap;
|
import com.intellij.util.containers.MultiMap;
|
||||||
import kotlin.CollectionsKt;
|
import kotlin.CollectionsKt;
|
||||||
import kotlin.io.IoPackage;
|
import kotlin.io.FilesKt;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.jetbrains.jps.ModuleChunk;
|
import org.jetbrains.jps.ModuleChunk;
|
||||||
@@ -123,7 +123,7 @@ public class KotlinBuilderModuleScriptGenerator {
|
|||||||
@Override
|
@Override
|
||||||
public boolean value(File file) {
|
public boolean value(File file) {
|
||||||
if (!file.exists()) {
|
if (!file.exists()) {
|
||||||
String extension = IoPackage.getExtension(file);
|
String extension = FilesKt.getExtension(file);
|
||||||
|
|
||||||
// Don't filter out files, we want to report warnings about absence through the common place
|
// Don't filter out files, we want to report warnings about absence through the common place
|
||||||
if (!(extension.equals("class") || extension.equals("jar"))) {
|
if (!(extension.equals("class") || extension.equals("jar"))) {
|
||||||
|
|||||||
Reference in New Issue
Block a user