From d8ed48d6c56bfc8864d379d956499c96cd92831b Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Sat, 20 Jun 2020 20:09:32 +0200 Subject: [PATCH] IDEA-CR-63906 prefer findFileByNioFile, remove not applicable @SystemDependent annotation GitOrigin-RevId: e7891758bd35a5733099500c3371f04a92b4f986 --- .../jsonSchema/extension/JsonSchemaInfo.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaInfo.java b/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaInfo.java index b52261ea2881..ed6982710298 100644 --- a/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaInfo.java +++ b/json/src/com/jetbrains/jsonSchema/extension/JsonSchemaInfo.java @@ -145,18 +145,18 @@ public class JsonSchemaInfo { return text; } - Path ioFile = Paths.get(text); - if (!ioFile.isAbsolute()) { + Path file = Paths.get(text); + if (!file.isAbsolute()) { return text; } - String relativePath = FileUtil.getRelativePath(FileUtil.toSystemIndependentName(ioFile.toString()), project.getBasePath(), '/'); + String relativePath = FileUtil.getRelativePath(FileUtil.toSystemIndependentName(file.toString()), project.getBasePath(), '/'); if (relativePath != null) { return relativePath; } - VirtualFile file = LocalFileSystem.getInstance().findFileByNioFile(ioFile); - if (file == null) { + VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByNioFile(file); + if (virtualFile == null) { return text; } @@ -165,8 +165,8 @@ public class JsonSchemaInfo { return text; } - if (isMeaningfulAncestor(VfsUtilCore.getCommonAncestor(file, projectBaseDir))) { - String path = VfsUtilCore.findRelativePath(projectBaseDir, file, File.separatorChar); + if (isMeaningfulAncestor(VfsUtilCore.getCommonAncestor(virtualFile, projectBaseDir))) { + String path = VfsUtilCore.findRelativePath(projectBaseDir, virtualFile, File.separatorChar); if (path != null) { return path; }