diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/CopyReferenceTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/CopyReferenceTest.groovy index d2cc160b61f9..116b0f211ad3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/CopyReferenceTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/CopyReferenceTest.groovy @@ -1,4 +1,4 @@ -package com.intellij.codeInsight; +package com.intellij.codeInsight import com.intellij.JavaTestUtil; import com.intellij.ide.actions.CopyReferenceAction; @@ -7,7 +7,6 @@ import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.psi.PsiFile; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NonNls -import com.intellij.openapi.util.io.FileUtil; public class CopyReferenceTest extends LightCodeInsightFixtureTestCase { @NonNls private static final String BASE_PATH = "/codeInsight/copyReference"; @@ -53,11 +52,10 @@ public class CopyReferenceTest extends LightCodeInsightFixtureTestCase { myFixture.configureByText 'a.java', ''' class Foo { }''' - def path = FileUtil.toSystemDependentName(myFixture.file.virtualFile.path) performCopy() myFixture.configureByText 'a.txt', '' performPaste() - myFixture.checkResult "$path:2" + myFixture.checkResult "/a.java:2" } private void doTest() throws Exception { diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CopyReferenceAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CopyReferenceAction.java index 14689d0bdc4d..31501fd4c818 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CopyReferenceAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/CopyReferenceAction.java @@ -36,6 +36,7 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.WindowManager; import com.intellij.openapi.wm.ex.StatusBarEx; +import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiReference; @@ -141,9 +142,9 @@ public class CopyReferenceAction extends AnAction { if (!doCopy(element, project, editor) && editor != null) { Document document = editor.getDocument(); - VirtualFile file = FileDocumentManager.getInstance().getFile(document); + PsiFile file = PsiDocumentManager.getInstance(project).getCachedPsiFile(document); if (file != null) { - String toCopy = FileUtil.toSystemDependentName(file.getPath()) + ":" + (editor.getCaretModel().getLogicalPosition().line + 1); + String toCopy = getFileFqn(file) + ":" + (editor.getCaretModel().getLogicalPosition().line + 1); CopyPasteManager.getInstance().setContents(new StringSelection(toCopy)); setStatusBarText(project, toCopy + " has been copied"); }