From d84cf971c176f42114ebf45b19bec75aaeea70b0 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Tue, 2 Apr 2013 17:25:02 +0400 Subject: [PATCH] Do not fold imports if there is only one #KT-3410 Fixed --- idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java | 2 +- idea/testData/folding/oneImport.kt | 3 +++ .../jet/plugin/folding/KotlinFoldingTestGenerated.java | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 idea/testData/folding/oneImport.kt diff --git a/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java b/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java index c31ee547d3a..9e505bbccba 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java +++ b/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java @@ -45,7 +45,7 @@ public class JetFoldingBuilder extends FoldingBuilderEx implements DumbAware { JetFile file = (JetFile) root; List importList = file.getImportDirectives(); - if (importList != null && !importList.isEmpty()) { + if (importList != null && importList.size() > 1) { JetImportDirective firstImport = importList.get(0); PsiElement importKeyword = firstImport.getFirstChild(); int startOffset = importKeyword.getTextRange().getEndOffset() + 1; diff --git a/idea/testData/folding/oneImport.kt b/idea/testData/folding/oneImport.kt new file mode 100644 index 00000000000..cda00d60937 --- /dev/null +++ b/idea/testData/folding/oneImport.kt @@ -0,0 +1,3 @@ +import kotlin.* + +fun foo() {} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java index 88a4a3bc4ac..3e430d49709 100644 --- a/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java @@ -56,4 +56,9 @@ public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest { doTest("idea/testData/folding/object.kt"); } + @TestMetadata("oneImport.kt") + public void testOneImport() throws Exception { + doTest("idea/testData/folding/oneImport.kt"); + } + }