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

Updated to IDEA 132.106 EAP.

Browse Source
This commit is contained in:
Zalim Bashorov
2013-09-06 19:10:12 +04:00
parent fca6182288
commit 63941c4e86
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java
+9 -6
View File
@@ -40,14 +40,17 @@ public class MockParameterInfoUIContext implements ParameterInfoUIContext {
} }
@Override @Override
public void setupUIComponentPresentation(String text, int highlightStartOffset, int highlightEndOffset, public String setupUIComponentPresentation(String text, int highlightStartOffset, int highlightEndOffset,
boolean isDisabled, boolean strikeout, boolean isDisabled, boolean strikeout,
boolean isDisabledBeforeHighlight, Color background) { boolean isDisabledBeforeHighlight, Color background) {
StringBuilder stringBuilder = new StringBuilder(); String resultText = "Text: (" + text + "), " +
stringBuilder.append("Text: (").append(text).append("), Disabled: ").append(isDisabled). "Disabled: " + isDisabled + ", " +
append(", Strikeout: ").append(strikeout).append(", Green: "). "Strikeout: " + strikeout + ", " +
append(background.equals(JetFunctionParameterInfoHandler.GREEN_BACKGROUND)); "Green: " + background.equals(JetFunctionParameterInfoHandler.GREEN_BACKGROUND);
result.add(stringBuilder.toString()); result.add(resultText);
// return value not used, just return something
return resultText;
} }
@Override @Override
jdk-annotations/java/lang/annotations.xml
+3
View File
@@ -508,6 +508,9 @@
<item name="java.lang.Enum T valueOf(java.lang.Class&lt;T&gt;, java.lang.String) 0"> <item name="java.lang.Enum T valueOf(java.lang.Class&lt;T&gt;, java.lang.String) 0">
<annotation name="org.jetbrains.annotations.NotNull"/> <annotation name="org.jetbrains.annotations.NotNull"/>
</item> </item>
<item name='java.lang.Enum T valueOf(java.lang.Class&lt;T&gt;, java.lang.String) 1'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name="java.lang.Enum int compareTo(E) 0"> <item name="java.lang.Enum int compareTo(E) 0">
<annotation name="org.jetbrains.annotations.NotNull"/> <annotation name="org.jetbrains.annotations.NotNull"/>
</item> </item>
jdk-annotations/java/lang/reflect/annotations.xml
+3
View File
@@ -143,6 +143,9 @@
<item name="java.lang.reflect.Array void setShort(java.lang.Object, int, short) 0"> <item name="java.lang.reflect.Array void setShort(java.lang.Object, int, short) 0">
<annotation name="org.jetbrains.annotations.NotNull"/> <annotation name="org.jetbrains.annotations.NotNull"/>
</item> </item>
<item name='java.lang.reflect.Constructor T newInstance(java.lang.Object...)'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
<item name="java.lang.reflect.Constructor T getAnnotation(java.lang.Class&lt;T&gt;) 0"> <item name="java.lang.reflect.Constructor T getAnnotation(java.lang.Class&lt;T&gt;) 0">
<annotation name="org.jetbrains.annotations.NotNull"/> <annotation name="org.jetbrains.annotations.NotNull"/>
</item> </item>
update_dependencies.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<project name="Update Dependencies" default="update"> <project name="Update Dependencies" default="update">
<property name="jb.buildserver.build.id" value="2051374"/> <property name="jb.buildserver.build.id" value="2066073"/>
<property name="public.buildserver.build.id" value="90345"/> <property name="public.buildserver.build.id" value="91714"/>
<property name="idea.archive.name" value="ideaIC-132.SNAPSHOT.win.zip"/> <property name="idea.archive.name" value="ideaIC-132.SNAPSHOT.win.zip"/>
<property name="idea.sdk.fetch.needed" value="true"/> <property name="idea.sdk.fetch.needed" value="true"/>