IDEA-127145 "Go to declaration" does not work for string file name in method with more than two arguments.

2026-09-27 10:03:11 +07:00 · 2014-07-23 11:39:46 +04:00
parent bf9e4e1d05
commit ff2e0ed9e4
2 changed files with 60 additions and 1 deletions
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.folding;
+
+import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.ex.FoldingModelEx;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
+
+public class JavaFoldingGotoTest extends JavaCodeInsightFixtureTestCase {
+
+  public void testIDEA127145() {
+    PsiFile file = myFixture.addFileToProject("Program.java",
+                                              "import java.io.InputStream;\n" +
+                                              "import java.util.HashMap;\n" +
+                                              "import java.util.Map;\n" +
+                                              "\n" +
+                                              "class Program {\n" +
+                                              "  private static InputStream getFile(String name, Map<String, Object> args) {\n" +
+                                              "    return Program.class.getResourceAsStream(name);\n" +
+                                              "  }\n" +
+                                              "\n" +
+                                              "  public static void main(String[] args) {\n" +
+                                              "    // Ctrl + B or Ctrl + Left Mouse Button work correctly for following string:\n" +
+                                              "    final String name = \"file.sql\";\n" +
+                                              "    // But it jumps only to folder in following case:\n" +
+                                              "    final InputStream inputStream = getFile(\"dir/fil<caret>e.sql\", new HashMap<String, Object>());\n" +
+                                              "  }\n" +
+                                              "}");
+
+    PsiFile fileSql = myFixture.addFileToProject("dir/file.sql", "select 1;");
+    myFixture.configureFromExistingVirtualFile(file.getVirtualFile());
+
+    Editor editor = myFixture.getEditor();
+    CodeFoldingManager.getInstance(getProject()).buildInitialFoldings(editor);
+    FoldingModelEx foldingModel = (FoldingModelEx)editor.getFoldingModel();
+    foldingModel.rebuild();
+    myFixture.doHighlighting();
+
+    PsiElement element = GotoDeclarationAction.findTargetElement(getProject(), editor, editor.getCaretModel().getOffset());
+    assertTrue("Should navigate to: file.sql instead of " + element, element != null && element.equals(fileSql));
+  }
+
+}
@@ -39,7 +39,7 @@ public class I18nMessageGotoDeclarationHandler extends GotoDeclarationHandlerBas
    int i = 4; //some street magic
    while (element != null && i > 0) {
      final ASTNode node = element.getNode();
-      if (node != null && node.getUserData(KEY) != null) {
+      if (node != null && node.getUserData(KEY) instanceof PropertyFoldingBuilder) {
        break;
      }
      else {