azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to IDEA 13.1 (134.1007)

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-02-13 16:11:39 +04:00
parent 4c57aa9f23
commit 9f3b73986a
29 changed files with 133 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<version>@snapshot@</version>
<vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
<idea-version since-build="133.0" until-build="134.0"/>
<idea-version since-build="134.0" until-build="134.1010"/>
<depends optional="true" config-file="junit.xml">JUnit</depends>
<depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java
+2 -1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.plugin.k2jsrun;
import com.intellij.ide.browsers.BrowsersConfiguration;
import com.intellij.ide.browsers.WebBrowserManager;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
@@ -31,7 +32,7 @@ public final class K2JSConfigurationSettings {
private boolean shouldOpenInBrowserAfterTranslation = false;
@NotNull
private BrowsersConfiguration.BrowserFamily browserFamily = BrowsersConfiguration.getInstance().getActiveBrowsers().get(0);
private BrowsersConfiguration.BrowserFamily browserFamily = WebBrowserManager.getInstance().getActiveBrowsers().get(0).getFamily();
public K2JSConfigurationSettings(@NotNull Project project) {
String basePath = project.getBasePath();
idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java
+4 -2
View File
@@ -17,6 +17,8 @@
package org.jetbrains.jet.plugin.k2jsrun;
import com.intellij.ide.browsers.BrowsersConfiguration;
import com.intellij.ide.browsers.WebBrowser;
import com.intellij.ide.browsers.WebBrowserManager;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.openapi.fileTypes.StdFileTypes;
@@ -137,8 +139,8 @@ public final class K2JSRunConfigurationEditor extends SettingsEditor<K2JSRunConf
}
private void setUpBrowserCombobox() {
for (BrowsersConfiguration.BrowserFamily family : BrowsersConfiguration.getInstance().getActiveBrowsers()) {
browserComboBox.addItem(family);
for (WebBrowser browser : WebBrowserManager.getInstance().getActiveBrowsers()) {
browserComboBox.addItem(browser.getFamily());
}
browserComboBox.setRenderer(new ListCellRendererWrapper<BrowsersConfiguration.BrowserFamily>() {
@Override
idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java
+2 -5
View File
@@ -19,10 +19,7 @@ package org.jetbrains.jet.plugin.liveTemplates;
import com.intellij.codeInsight.completion.*;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.template.TemplateContextType;
import com.intellij.codeInsight.template.impl.LiveTemplateLookupElement;
import com.intellij.codeInsight.template.impl.TemplateImpl;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.codeInsight.template.impl.TemplateSettings;
import com.intellij.codeInsight.template.impl.*;
import com.intellij.openapi.util.Ref;
import com.intellij.patterns.ElementPattern;
import com.intellij.patterns.PlatformPatterns;
@@ -86,7 +83,7 @@ public class JetLiveTemplateCompletionContributor extends CompletionContributor
if (!templatesShown.get()) {
templatesShown.set(true);
for (TemplateImpl possible : templates) {
result.addElement(new LiveTemplateLookupElement(possible, false));
result.addElement(new LiveTemplateLookupElementImpl(possible, false));
}
}
}
idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java
-4
View File
@@ -120,10 +120,6 @@ public class JetInplaceVariableIntroducer extends InplaceVariableIntroducer<JetE
}
SpecifyTypeExplicitlyAction.addTypeAnnotation(myProject, myEditor, myProperty, myExprType);
PsiDocumentManager.getInstance(myProject).commitDocument(myEditor.getDocument());
TemplateState templateState = TemplateManagerImpl.getTemplateState(myEditor);
if (templateState != null) {
templateState.doReformat(myProperty.getTextRange());
}
}
else {
SpecifyTypeExplicitlyAction.removeTypeAnnotation(myProperty);
idea/testData/completion/basic/java/PropertyMetadata.kt
+2 -1
View File
@@ -8,4 +8,5 @@ fun firstFun() {
// INVOCATION_COUNT: 1
// EXIST: { lookupString:"PropertyMetadata", itemText:"PropertyMetadata", tailText:" (jet)" }
// EXIST: { lookupString:"PropertyMetadataImpl", itemText:"PropertyMetadataImpl", tailText:" (jet)" }
// NUMBER: 2
// EXIST: {"lookupString":"PropertyMetadata$$TImpl","tailText":" (jet)","typeText":"","itemText":"PropertyMetadata$$TImpl"}
// NUMBER: 3
idea/testData/completion/injava/ClassesFromNamespace.java
+1 -2
View File
@@ -10,5 +10,4 @@ public class Testing {
// EXIST: LibTrait
// EXIST: LibEnum
// EXIST: LibObject
// EXIST: FooPackage
// NUMBER: 5
// EXIST: FooPackage
idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
+1 -2
View File
@@ -1,5 +1,4 @@
Unclassified usage (1: 19) public open class X: A()
Unclassified usage (3: 14) public trait T: A
Unclassified usage (5: 19) public open class Y: X()
Unclassified usage (7: 14) public class Z: Y(), T
Unclassified usage (7: 14) public class Z: Y(), T
Unclassified usage (7: 14) public class Z: Y(), T
idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt
+1 -2
View File
@@ -1,5 +1,4 @@
Unclassified usage (2: 23) public open class X: A()
Unclassified usage (4: 18) public trait T: A
Unclassified usage (7: 27) public open class Y: X()
Unclassified usage (9: 22) public class Z: Y(), T
Unclassified usage (9: 22) public class Z: Y(), T
Unclassified usage (9: 22) public class Z: Y(), T
idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt
+1 -2
View File
@@ -1,5 +1,4 @@
Unclassified usage (2: 23) public open class X: A()
Unclassified usage (4: 18) public trait T: A
Unclassified usage (7: 27) public open class Y: X()
Unclassified usage (9: 22) public class Z: Y(), T
Unclassified usage (9: 22) public class Z: Y(), T
Unclassified usage (9: 22) public class Z: Y(), T
idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
+1 -2
View File
@@ -1,4 +1,3 @@
Unclassified usage (1: 19) public open class X: A
Unclassified usage (5: 19) public open class Y: X()
Unclassified usage (7: 14) public class Z: Y(), T
Unclassified usage (7: 14) public class Z: Y(), T
Unclassified usage (7: 14) public class Z: Y(), T
idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt
+1 -2
View File
@@ -1,4 +1,3 @@
Unclassified usage (2: 23) public open class X: A
Unclassified usage (7: 27) public open class Y: X()
Unclassified usage (9: 22) public class Z: Y(), T
Unclassified usage (9: 22) public class Z: Y(), T
Unclassified usage (9: 22) public class Z: Y(), T
idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTestBase.kt
+2 -2
View File
@@ -130,8 +130,8 @@ public abstract class CompletionHandlerTestBase() : JetLightCodeInsightFixtureTe
val lookup = (fixture.getLookup() as LookupImpl)
lookup.setCurrentItem(item)
if (LookupEvent.isSpecialCompletionChar(completionChar)) {
(object : WriteCommandAction.Simple(getProject()) {
protected override fun run(result: Result<Any?>?) {
(object : WriteCommandAction.Simple<Any>(getProject()) {
protected override fun run(result: Result<Any>) {
run()
}
protected override fun run() {
idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java
+1 -1
View File
@@ -186,7 +186,7 @@ public abstract class AbstractOverrideImplementTest extends LightCodeInsightFixt
}
private void generateImplementation(@NotNull final PsiMethod method) {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
WriteCommandAction.runWriteCommandAction(getProject(), new Runnable() {
@Override
public void run() {
PsiClass aClass = ((PsiClassOwner) myFixture.getFile()).getClasses()[0];
idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
+9 -9
View File
@@ -267,6 +267,14 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
private void typeAndNextTab(String s) {
type(s);
nextTab();
}
private void type(String s) {
myFixture.type(s);
}
private void nextTab() {
UIUtil.invokeAndWaitIfNeeded(new Runnable() {
@Override
public void run() {
@@ -276,7 +284,7 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
nextTab();
getTemplateState().nextTab();
}
});
}
@@ -285,14 +293,6 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
});
}
private void type(String s) {
myFixture.type(s);
}
private void nextTab() {
getTemplateState().nextTab();
}
private void nextTab(int times) {
for (int i = 0; i < times; i++) {
nextTab();
idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java
+1 -1
View File
@@ -33,7 +33,7 @@ import java.util.List;
public class JUnitMembersSearcherTest extends AbstractSearcherTest {
private static final LightProjectDescriptor junitProjectDescriptor =
new JetJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.10.jar"));
new JetJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.11.jar"));
public void testJunit3() throws IOException {
doJUnit3test();