Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import com.intellij.openapi.ui.TextComponentAccessor;
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
import com.intellij.openapi.ui.ValidationInfo;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
Expand All @@ -17,6 +16,7 @@
import com.jetbrains.lang.dart.DartBundle;
import com.jetbrains.lang.dart.pubServer.DartWebdev;
import com.jetbrains.lang.dart.sdk.DartSdk;
import com.jetbrains.lang.dart.util.PathUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -79,7 +79,7 @@ public DartPubBuildDialog(final @NotNull Project project, final @NotNull Virtual
@Override
public String getText(JTextField component) {
final String path = component.getText();
if (SystemInfo.isWindows && FileUtil.isWindowsAbsolutePath(path) || !SystemInfo.isWindows && FileUtil.isUnixAbsolutePath(path)) {
if (PathUtil.isAbsolutePlatformIndependent(path)) {
return path;
}
return packagePathSlash + path;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.jetbrains.lang.dart.util;

import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.OSAgnosticPathUtil;
import org.jetbrains.annotations.NotNull;

public class PathUtil {
private PathUtil() {
}

public static boolean isAbsolutePlatformIndependent(@NotNull String path) {
return (SystemInfo.isWindows && PathUtil.isWindowsAbsolutePath(path))
|| (!SystemInfo.isWindows && PathUtil.isUnixAbsolutePath(path));
}

/**
* See documentation in Community's FileUtil.java, this method intentionally matches the deprecated version from the
* platform.
*/
public static boolean isUnixAbsolutePath(@NotNull String path) {
return path.startsWith("/");

}

/**
* See documentation in Community's FileUtil.java, this method intentionally matches the deprecated version from the
* platform.
*/
public static boolean isWindowsAbsolutePath(@NotNull String path) {
return path.length() <= 2 && OSAgnosticPathUtil.startsWithWindowsDrive(path)
|| OSAgnosticPathUtil.isAbsoluteDosPath(path);

}
}