From 6822d9496f93fcfe4821c03fe955f37162a3c447 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 12 Sep 2012 16:51:04 +0400 Subject: [PATCH] Fix backend tests on Windows Make getMultiFileNamespaceInternalName work when given PsiFile contains mixed path separators in its name. --- .../src/org/jetbrains/jet/codegen/NamespaceCodegen.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java index 4a37aab485c..fea22cdf3cf 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java @@ -18,6 +18,7 @@ package org.jetbrains.jet.codegen; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.progress.ProcessCanceledException; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; @@ -291,7 +292,7 @@ public class NamespaceCodegen extends GenerationStateAware { @NotNull public static String getMultiFileNamespaceInternalName(String namespaceInternalName, PsiFile file) { - String name = file.getName(); + String name = FileUtil.toSystemDependentName(file.getName()); int substringFrom = name.lastIndexOf(File.separator) + 1;