diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java index c636aa609c9..99599f7e5de 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java +++ b/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java @@ -17,7 +17,6 @@ package org.jetbrains.jet.plugin.k2jsrun; import com.intellij.ide.browsers.BrowsersConfiguration; -import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.fileTypes.StdFileTypes; @@ -26,6 +25,7 @@ import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.ui.TextFieldWithBrowseButton; +import com.intellij.ui.ListCellRendererWrapper; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -140,7 +140,7 @@ public final class K2JSRunConfigurationEditor extends SettingsEditor(browserComboBox) { + browserComboBox.setRenderer(new ListCellRendererWrapper() { @Override public void customize(JList list, BrowsersConfiguration.BrowserFamily family, int index, boolean selected, boolean hasFocus) { if (family != null) { diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java index b7e50013525..25c18d9f277 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java @@ -28,7 +28,7 @@ import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.PsiFile; import com.intellij.util.Consumer; import com.intellij.util.ProcessingContext; -import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -75,7 +75,7 @@ public class JetLiveTemplateCompletionContributor extends CompletionContributor private static List listApplicableTemplates(PsiFile file, int offset) { Set contextTypes = TemplateManagerImpl.getApplicableContextTypes(file, offset); - ArrayList result = CollectionFactory.arrayList(); + ArrayList result = ContainerUtil.newArrayList(); for (TemplateImpl template : TemplateSettings.getInstance().getTemplates()) { if (!template.isDeactivated() && !template.isSelectionTemplate() && TemplateManagerImpl.isApplicable(template, contextTypes)) { result.add(template); diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt.messages b/idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt.messages index 3b47612540c..5e786576e15 100644 --- a/idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt.messages +++ b/idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt.messages @@ -1,2 +1 @@ -Class A has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Class A has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt b/idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt new file mode 100644 index 00000000000..795f0f4e280 --- /dev/null +++ b/idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt @@ -0,0 +1,14 @@ +package test + +import test.A + +class A { + +} + +class B: A { + +} + +// A +val a = "A" \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt.messages b/idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt.messages new file mode 100644 index 00000000000..7066f20651e --- /dev/null +++ b/idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt.messages @@ -0,0 +1 @@ +Class A has 3 usages that are not safe to delete.Of those 2 usages are in strings, comments, non-code files or generated code. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt.messages b/idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt.messages index de7b986cf61..8b316a4338c 100644 --- a/idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt.messages +++ b/idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt.messages @@ -1,2 +1 @@ -Class C has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Class C has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt.messages b/idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt.messages index 599dc5b1810..753836123a2 100644 --- a/idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt.messages +++ b/idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt.messages @@ -1,2 +1 @@ -Trait A has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Trait A has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt.messages b/idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt.messages index 3b47612540c..5e786576e15 100644 --- a/idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt.messages +++ b/idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt.messages @@ -1,2 +1 @@ -Class A has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Class A has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt.messages b/idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt.messages index 7d36bd30109..01056c0edde 100644 --- a/idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt.messages +++ b/idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt.messages @@ -1,2 +1 @@ -Function foo has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Function foo has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt.messages b/idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt.messages index aed29791f35..28c17364a1b 100644 --- a/idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt.messages +++ b/idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt.messages @@ -1,2 +1 @@ -Object O has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Object O has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt.messages b/idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt.messages index 464daffdd24..6b06de6618e 100644 --- a/idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt.messages +++ b/idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt.messages @@ -1,2 +1 @@ -Object A has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Object A has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt.messages b/idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt.messages index 464daffdd24..6b06de6618e 100644 --- a/idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt.messages +++ b/idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt.messages @@ -1,2 +1 @@ -Object A has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Object A has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt.messages b/idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt.messages index d2f766d3650..7710de6276e 100644 --- a/idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt.messages +++ b/idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt.messages @@ -1,2 +1 @@ -Property foo has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Property foo has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt.messages b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt.messages index bcf6aabf222..c2d9bff37b6 100644 --- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt.messages +++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt.messages @@ -1,2 +1 @@ -Type parameter X has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Type parameter X has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt.messages b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt.messages index b233b26adb2..83bd08b49ea 100644 --- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt.messages +++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt.messages @@ -1,2 +1 @@ -Type parameter Y has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Type parameter Y has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt.messages b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt.messages index 6301504f002..e303a690e92 100644 --- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt.messages +++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt.messages @@ -1,2 +1 @@ -Type parameter X has 2 usages that are not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Type parameter X has 2 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt.messages b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt.messages index bcf6aabf222..c2d9bff37b6 100644 --- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt.messages +++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt.messages @@ -1,2 +1 @@ -Type parameter X has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Type parameter X has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt.messages b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt.messages index bcf6aabf222..c2d9bff37b6 100644 --- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt.messages +++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt.messages @@ -1,2 +1 @@ -Type parameter X has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Type parameter X has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt.messages b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt.messages index bcf6aabf222..c2d9bff37b6 100644 --- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt.messages +++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt.messages @@ -1,2 +1 @@ -Type parameter X has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Type parameter X has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt.messages b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt.messages index b233b26adb2..83bd08b49ea 100644 --- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt.messages +++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt.messages @@ -1,2 +1 @@ -Type parameter Y has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Type parameter Y has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt.messages b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt.messages index 6301504f002..e303a690e92 100644 --- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt.messages +++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt.messages @@ -1,2 +1 @@ -Type parameter X has 2 usages that are not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Type parameter X has 2 usages that are not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt.messages b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt.messages index bcf6aabf222..c2d9bff37b6 100644 --- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt.messages +++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt.messages @@ -1,2 +1 @@ -Type parameter X has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Type parameter X has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt.messages b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt.messages index bcf6aabf222..c2d9bff37b6 100644 --- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt.messages +++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt.messages @@ -1,2 +1 @@ -Type parameter X has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +Type parameter X has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt.messages b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt.messages index 423d0873447..d8b15026998 100644 --- a/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt.messages +++ b/idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt.messages @@ -1,2 +1 @@ -parameter a has 1 usage that is not safe to delete. -Of those 0 usages are in strings, comments, or non-code files. \ No newline at end of file +parameter a has 1 usage that is not safe to delete. \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java index 3b1b40ae831..47b8933a465 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameInKotlinTest.java @@ -120,7 +120,7 @@ public class RenameInKotlinTest extends MultiFileTestCase { new RenameProcessor(myProject, psiElement, newName, true, true).run(); PsiDocumentManager.getInstance(myProject).commitAllDocuments(); FileDocumentManager.getInstance().saveAllDocuments(); - VirtualFileManager.getInstance().refresh(false); + VirtualFileManager.getInstance().syncRefresh(); } }); } diff --git a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java b/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java index 3045892f2c8..5d5f9faecea 100644 --- a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java @@ -48,6 +48,11 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt"); } + @TestMetadata("classInString.kt") + public void testClassInString() throws Exception { + doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt"); + } + @TestMetadata("nestedClass1.kt") public void testNestedClass1() throws Exception { doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt");