Skip to content

fix bug with path separator on windows #18

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix bug with path separator on windows #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/main/kotlin/com/vk/modulite/modulite/Modulite.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import com.vk.modulite.psi.extensions.yaml.moduliteNamePsi
import com.vk.modulite.psi.extensions.yaml.replaceDependencies
import com.vk.modulite.services.*
import com.vk.modulite.utils.normalizedFqn
import com.vk.modulite.utils.normalizedPath
import com.vk.modulite.utils.unquote
import org.jetbrains.yaml.YAMLUtil
import org.jetbrains.yaml.psi.YAMLFile
Expand Down Expand Up @@ -269,16 +270,16 @@ data class Modulite(
}

fun contains(file: VirtualFile): Boolean {
val moduleFolder = File(path).parent
val moduleFolder = File(path).parent.normalizedPath()

// TODO: fix this somehow
if (ApplicationManager.getApplication().isUnitTestMode) {
val path = file.path
val folder = moduleFolder.removeSuffix("/hints/Module")
return path == folder || path.startsWith("$folder${File.separator}")
return path == folder || path.startsWith("$folder/")
}

return file.path == moduleFolder || file.path.startsWith("$moduleFolder${File.separator}")
return file.path == moduleFolder || file.path.startsWith("$moduleFolder/")
}

fun contains(file: PsiFile) = contains(file.virtualFile)
Expand Down