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

Reverting wrong changes

Browse Source
This commit is contained in:
pTalanov
2012-02-27 19:15:28 +04:00
parent 953c33a846
commit 3fc7e849de
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/inspectionProfiles/idea_default.xml
Generated
+4
View File
@@ -228,6 +228,10 @@
<scope name="idea openapi" level="WARNING" enabled="true" /> <scope name="idea openapi" level="WARNING" enabled="true" />
<scope name="runtime.classes" level="ERROR" enabled="true" /> <scope name="runtime.classes" level="ERROR" enabled="true" />
</inspection_tool> </inspection_tool>
<inspection_tool class="MethodMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true">
<option name="m_onlyPrivateOrFinal" value="false" />
<option name="m_ignoreEmptyMethods" value="true" />
</inspection_tool>
<inspection_tool class="MethodNamesDifferOnlyByCase" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="MethodNamesDifferOnlyByCase" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MethodOverloadsParentMethod" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="MethodOverloadsParentMethod" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MethodOverridesPrivateMethod" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="MethodOverridesPrivateMethod" enabled="true" level="WARNING" enabled_by_default="true" />
.idea/modules.xml
Generated
-1
View File
@@ -17,7 +17,6 @@
<module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" /> <module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" />
<module fileurl="file://$PROJECT_DIR$/j2k/tests/j2k-tests.iml" filepath="$PROJECT_DIR$/j2k/tests/j2k-tests.iml" /> <module fileurl="file://$PROJECT_DIR$/j2k/tests/j2k-tests.iml" filepath="$PROJECT_DIR$/j2k/tests/j2k-tests.iml" />
<module fileurl="file://$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" filepath="$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" /> <module fileurl="file://$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" filepath="$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" />
<module fileurl="file://$PROJECT_DIR$/js/js.examples/js.examples.iml" filepath="$PROJECT_DIR$/js/js.examples/js.examples.iml" />
<module fileurl="file://$PROJECT_DIR$/js/js.libraries/js.libraries.iml" filepath="$PROJECT_DIR$/js/js.libraries/js.libraries.iml" /> <module fileurl="file://$PROJECT_DIR$/js/js.libraries/js.libraries.iml" filepath="$PROJECT_DIR$/js/js.libraries/js.libraries.iml" />
<module fileurl="file://$PROJECT_DIR$/js/js.tests/js.tests.iml" filepath="$PROJECT_DIR$/js/js.tests/js.tests.iml" /> <module fileurl="file://$PROJECT_DIR$/js/js.tests/js.tests.iml" filepath="$PROJECT_DIR$/js/js.tests/js.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/js/js.translator/js.translator.iml" filepath="$PROJECT_DIR$/js/js.translator/js.translator.iml" /> <module fileurl="file://$PROJECT_DIR$/js/js.translator/js.translator.iml" filepath="$PROJECT_DIR$/js/js.translator/js.translator.iml" />
compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java
+2 -2
View File
@@ -173,8 +173,8 @@ public class AnnotationResolver {
List<AnnotationDescriptor> result = Lists.newArrayList(); List<AnnotationDescriptor> result = Lists.newArrayList();
for (JetAnnotationEntry annotation : annotations) { for (JetAnnotationEntry annotation : annotations) {
AnnotationDescriptor annotationDescriptor = new AnnotationDescriptor(); AnnotationDescriptor annotationDescriptor = new AnnotationDescriptor();
// result.add(annotationDescriptor); result.add(annotationDescriptor);
// trace.record(BindingContext.ANNOTATION, annotation, annotationDescriptor); trace.record(BindingContext.ANNOTATION, annotation, annotationDescriptor);
} }
return result; return result;
} }
compiler/frontend/src/org/jetbrains/jet/lang/types/JetStandardLibrary.java
-5
View File
@@ -462,11 +462,6 @@ public class JetStandardLibrary {
return volatileType; return volatileType;
} }
@NotNull
public Collection<ClassDescriptor> getArrayClasses() {
return primitiveTypeToArrayClass.values();
}
public final boolean isVolatile(PropertyDescriptor descriptor) { public final boolean isVolatile(PropertyDescriptor descriptor) {
List<AnnotationDescriptor> annotations = descriptor.getOriginal().getAnnotations(); List<AnnotationDescriptor> annotations = descriptor.getOriginal().getAnnotations();
if(annotations != null) { if(annotations != null) {
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<idea-plugin version="2"> <idea-plugin version="2">
<name>Kotlin</name> <name>Kotlin</name>
<description>Kotlin language support</description> <description>Kotlin language support</description>
<version>1.0</version> <version>@snapshot@</version>
<vendor>JetBrains</vendor> <vendor>JetBrains</vendor>
<depends optional="true">JUnit</depends> <depends optional="true">JUnit</depends>