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

Darwin arm64: Use NIO2 instead of legacy mediator

Browse Source 
GitOrigin-RevId: abc952a1bf9fdbd9c79e8e196eaec5762af9673b
This commit is contained in:
Florian Kistner
2020-07-18 01:19:54 +00:00
committed by intellij-monorepo-bot
parent 4229df0afd
commit 4e54b307df
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/openapi/util/SystemInfo.java
+3 -1
View File
@@ -87,7 +87,9 @@ public final class SystemInfo {
public static final boolean is32Bit = SystemInfoRt.is32Bit;
public static final boolean is64Bit = SystemInfoRt.is64Bit;
public static final boolean isMacIntel64 = isMac && "x86_64".equals(OS_ARCH);
public static final boolean isIntel64 = "x86_64".equals(OS_ARCH) || "amd64".equals(OS_ARCH);
public static final boolean isArm64 = "aarch64".equals(OS_ARCH) || "arm64".equals(OS_ARCH);
public static final boolean isMacIntel64 = isMac && isIntel64;
private static final NotNullLazyValue<Boolean> ourHasXdgOpen = new PathExecLazyValue("xdg-open");
public static boolean hasXdgOpen() {
platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java
+1 -1
View File
@@ -54,7 +54,7 @@ public final class FileSystemUtil {
if (SystemInfo.isWindows && IdeaWin32.isAvailable()) {
return check(new IdeaWin32MediatorImpl());
}
else if ((SystemInfo.isLinux || SystemInfo.isMac || SystemInfo.isSolaris || SystemInfo.isFreeBSD) && JnaLoader.isLoaded()) {
else if ((SystemInfo.isLinux || SystemInfo.isMac && !SystemInfo.isArm64 || SystemInfo.isSolaris || SystemInfo.isFreeBSD) && JnaLoader.isLoaded()) {
return check(new JnaUnixMediatorImpl());
}
}
platform/util/testSrc/com/intellij/openapi/util/io/FileAttributesReadingTest.java
+6 -1
View File
@@ -34,7 +34,12 @@ public abstract class FileAttributesReadingTest {
@BeforeClass
public static void setUpClass() {
FileSystemUtil.resetMediator();
assertEquals(SystemInfo.isWindows ? "IdeaWin32" : "JnaUnix", FileSystemUtil.getMediatorName());
assertEquals(SystemInfo.isMac && SystemInfo.isArm64
? "Nio2" // macOS arm64 only supports NIO2 mediator
: SystemInfo.isWindows
? "IdeaWin32"
: "JnaUnix",
FileSystemUtil.getMediatorName());
}
}