Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed module path separator in Windows #116

Merged
merged 2 commits into from
Jun 4, 2024
Merged

Fixed module path separator in Windows #116

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a284efc
Fixed module path separator in Windows
abiharbani Jun 1, 2024
9c1bf1a
Fixed per code review
abiharbani Jun 1, 2024
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
3 changes: 2 additions & 1 deletion data-weave-plugin/src/main/java/org/mule/tooling/lang/dw/util/VirtualFileSystemUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.mule.weave.v2.sdk.NameIdentifierHelper;

import java.io.IOException;
import java.nio.file.FileSystems;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -126,7 +127,7 @@ private static VirtualFile resolve(Project project, NameIdentifier name, GlobalS
public static NameIdentifier getNameIdentifierWithRelative(VirtualFile vfs, VirtualFile contentRootForFile) {
final String relPath = VfsUtil.getRelativePath(vfs, contentRootForFile);
if (relPath != null) {
return NameIdentifierHelper.fromWeaveFilePath(relPath);
return NameIdentifierHelper.fromWeaveFilePath(FileSystems.getDefault().getSeparator().equals("\\") ? relPath.replace("/", "\\") : relPath);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return NameIdentifierHelper.fromWeaveFilePath(FileSystems.getDefault().getSeparator().equals("\\") ? relPath.replace("/", "\\") : relPath);
return NameIdentifierHelper.fromWeaveFilePath(relPath, FileSystems.getDefault().getSeparator());

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is much simpler and should have the same outcome

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, a new fix pushed. Thanks

} else {
return NameIdentifierHelper.fromWeaveFilePath(contentRootForFile.getPath());
}
Expand Down
Loading