Fixed module path separator in Windows #116
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Module path separator in Windows is currently "/" ie: dw/util/Math, which is incorrect. It should be "::" (ie: dw::util::Math). This is because Intellij's virtual file uses "/" separator, but Dataweave parser SDK expects the native file separator, which is "\" in Windows. Pre-correcting the file separator before sending the path to the parser SDK fixes this issue. This bug caused modules and some functions as being not resolvable in the editor. Also, the auto suggest gives the wrong path (ie: suggesting dw/util/Math instead of dw::util::Math).
machaval
reviewed
Jun 1, 2024
| @@ -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); | |||
There was a problem hiding this comment.
Suggested change
| return NameIdentifierHelper.fromWeaveFilePath(FileSystems.getDefault().getSeparator().equals("\\") ? relPath.replace("/", "\\") : relPath); | |
| return NameIdentifierHelper.fromWeaveFilePath(relPath, FileSystems.getDefault().getSeparator()); |
There was a problem hiding this comment.
This is much simpler and should have the same outcome
There was a problem hiding this comment.
Indeed, a new fix pushed. Thanks
|
Thanks for the contribution! Unfortunately we can't verify the commit author(s): Abi Harbani <a***@g***.com>. One possible solution is to add that email to your GitHub account. Alternatively you can change your commits to another email and force push the change. After getting your commits associated with your GitHub account, sign the Salesforce Inc. Contributor License Agreement and this Pull Request will be revalidated. |
abiharbani
force-pushed
the
ah_fixModulesLookupForWindows
branch
from
4c199f2 to
9c1bf1a
Compare
machaval
approved these changes
Jun 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Module path separator in Windows is currently "/" ie: dw/util/Math, which is incorrect. It should be "::" (ie: dw::util::Math). This is because Intellij's virtual file uses "/" separator, but Dataweave parser SDK expects the native file separator, which is "" in Windows.
Pre-correcting the file separator before sending the path to the parser SDK fixes this issue.
This bug caused modules and some functions as being not resolvable in the editor. Also, the auto suggest gives the wrong path (ie: suggesting dw/util/Math instead of dw::util::Math).