Update to 132.1071
This commit is contained in:
Natalia Ukhorskaya
committed by
Nikolay Krasko
Nikolay Krasko
parent
5c6cfce8ab
commit
bacf8b58f3
@@ -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<K2JSRunConf
|
||||
for (BrowsersConfiguration.BrowserFamily family : BrowsersConfiguration.getInstance().getActiveBrowsers()) {
|
||||
browserComboBox.addItem(family);
|
||||
}
|
||||
browserComboBox.setRenderer(new ListCellRendererWrapper<BrowsersConfiguration.BrowserFamily>(browserComboBox) {
|
||||
browserComboBox.setRenderer(new ListCellRendererWrapper<BrowsersConfiguration.BrowserFamily>() {
|
||||
@Override
|
||||
public void customize(JList list, BrowsersConfiguration.BrowserFamily family, int index, boolean selected, boolean hasFocus) {
|
||||
if (family != null) {
|
||||
|
||||
+2
-2
@@ -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<TemplateImpl> listApplicableTemplates(PsiFile file, int offset) {
|
||||
Set<TemplateContextType> contextTypes = TemplateManagerImpl.getApplicableContextTypes(file, offset);
|
||||
|
||||
ArrayList<TemplateImpl> result = CollectionFactory.arrayList();
|
||||
ArrayList<TemplateImpl> result = ContainerUtil.newArrayList();
|
||||
for (TemplateImpl template : TemplateSettings.getInstance().getTemplates()) {
|
||||
if (!template.isDeactivated() && !template.isSelectionTemplate() && TemplateManagerImpl.isApplicable(template, contextTypes)) {
|
||||
result.add(template);
|
||||
|
||||
@@ -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.
|
||||
Class A has 1 usage that is not safe to delete.
|
||||
@@ -0,0 +1,14 @@
|
||||
package test
|
||||
|
||||
import test.A
|
||||
|
||||
class <caret>A {
|
||||
|
||||
}
|
||||
|
||||
class B: A {
|
||||
|
||||
}
|
||||
|
||||
// A
|
||||
val a = "A"
|
||||
@@ -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.
|
||||
@@ -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.
|
||||
Class C has 1 usage that is not safe to delete.
|
||||
@@ -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.
|
||||
Trait A has 1 usage that is not safe to delete.
|
||||
@@ -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.
|
||||
Class A has 1 usage that is not safe to delete.
|
||||
@@ -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.
|
||||
Function foo has 1 usage that is not safe to delete.
|
||||
@@ -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.
|
||||
Object O has 1 usage that is not safe to delete.
|
||||
@@ -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.
|
||||
Object A has 1 usage that is not safe to delete.
|
||||
@@ -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.
|
||||
Object A has 1 usage that is not safe to delete.
|
||||
@@ -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.
|
||||
Property foo has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
Type parameter X has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
Type parameter Y has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
Type parameter X has 2 usages that are not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
Type parameter X has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
Type parameter X has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
Type parameter X has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
Type parameter Y has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
Type parameter X has 2 usages that are not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
Type parameter X has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
Type parameter X has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
+1
-2
@@ -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.
|
||||
parameter a has 1 usage that is not safe to delete.
|
||||
@@ -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();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user