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

Methods in KotlinBuiltIns made static where already possible

Browse Source
This commit is contained in:
Andrey Breslav
2014-12-02 15:50:16 +03:00
parent 75c887048e
commit ea4f0ab214
25 changed files with 68 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java
+2 -3
View File
@@ -103,15 +103,14 @@ public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisit
return false;
}
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
JetType defaultType = ((ClassDescriptor) parent).getDefaultType();
if (builtIns.isFunctionOrExtensionFunctionType(defaultType)) {
if (KotlinBuiltIns.isFunctionOrExtensionFunctionType(defaultType)) {
return true;
}
for (JetType supertype : TypeUtils.getAllSupertypes(defaultType)) {
if (builtIns.isFunctionOrExtensionFunctionType(supertype)) {
if (KotlinBuiltIns.isFunctionOrExtensionFunctionType(supertype)) {
return true;
}
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt
+1 -1
View File
@@ -135,7 +135,7 @@ public class KotlinSuppressIntentionAction(
val context = annotated.analyze()
for (entry in annotated.getAnnotationEntries()) {
val annotationDescriptor = context.get(BindingContext.ANNOTATION, entry)
if (annotationDescriptor != null && KotlinBuiltIns.getInstance().isSuppressAnnotation(annotationDescriptor)) {
if (annotationDescriptor != null && KotlinBuiltIns.isSuppressAnnotation(annotationDescriptor)) {
return entry
}
}